update laporan skrd, dan tbp menu tbpb

esipkd/views/arinvoice_b.py

@@ -676,6 +676,7 @@ def view_act(request):
 from ..reports.rml_report import open_rml_row, open_rml_pdf, pdf_response
 from ..reports.rml_report import open_rml_row, open_rml_pdf, pdf_response
 def query_reg():
 def query_reg():
     return DBSession.query(ARInvoice.kode.label('a'), 
     return DBSession.query(ARInvoice.kode.label('a'), 
+                           ARInvoice.no_skrd.label('h'), 
                            ARInvoice.wp_nama.label('b'), 
                            ARInvoice.wp_nama.label('b'), 
                            ARInvoice.rek_kode.label('c'), 
                            ARInvoice.rek_kode.label('c'), 
                            ARInvoice.op_nama.label('d'),  
                            ARInvoice.op_nama.label('d'),  
@@ -720,7 +721,7 @@ def view_csv(request):
         row = query.filter(ARInvoice.tgl_tetap.between(awal,akhir),
         row = query.filter(ARInvoice.tgl_tetap.between(awal,akhir),
                            ARInvoice.status_grid==0)#.first()
                            ARInvoice.status_grid==0)#.first()
         #print "-- ROW -- ",row
         #print "-- ROW -- ",row
-        header = 'No. Bayar','Penyetor','Objek','Uraian','Tgl. Tetap','Jumlah','OPD' #row.keys()
+        header = 'No. Bayar','No. SKRD','Penyetor','Objek','Uraian','Tgl. Tetap','Jumlah','OPD' #row.keys()
         rows = []
         rows = []
         for item in row.all():
         for item in row.all():
             rows.append(list(item))
             rows.append(list(item))

esipkd/views/templates/artbp/list.pt

@@ -199,6 +199,8 @@
           '	<button id="btn_tambah"  class="btn btn btn-primary pull-left" type="button">Tambah</button>',
           '	<button id="btn_tambah"  class="btn btn btn-primary pull-left" type="button">Tambah</button>',
           '	<button id="btn_edit"    class="btn btn btn-primary pull-left" type="button">Edit</button>',
           '	<button id="btn_edit"    class="btn btn btn-primary pull-left" type="button">Edit</button>',
           '	<button id="btn_delete"  class="btn btn btn-danger  pull-left" type="button">Hapus</button>',
           '	<button id="btn_delete"  class="btn btn btn-danger  pull-left" type="button">Hapus</button>',
+          '	<button id="btn_skrd" class="btn btn btn-success pull-left" type="button">SKRD</button>',
+          '	<button id="btn_tbp" class="btn btn btn-success pull-left" type="button">TBP</button>',
           '	<button id="btn_print"   class="btn btn btn-info    pull-left" type="button">Kwitansi</button>',
           '	<button id="btn_print"   class="btn btn btn-info    pull-left" type="button">Kwitansi</button>',
           '	<button id="btn_posting" class="btn btn btn-success pull-left" type="button">Posting</button>',
           '	<button id="btn_posting" class="btn btn btn-success pull-left" type="button">Posting</button>',
           '	<button id="btn_close"   class="btn btn btn-warning" type="button">Tutup</button>',
           '	<button id="btn_close"   class="btn btn btn-warning" type="button">Tutup</button>',
@@ -306,6 +308,24 @@
           window.open(url);
           window.open(url);
       });
       });
 
 
+      $('#btn_skrd').click(function () {
+          if (mID) {
+              url = oFormUrl+'skrd/pdf?id='+mID;
+              window.open(url);
+          } else {
+              alert('Silahkan pilih data yang akan dicetak skrdnya.');
+          }
+      });
+
+      $('#btn_tbp').click(function () {
+          if (mID) {
+              url = oFormUrl+'tbp/pdf?id='+mID;
+              window.open(url);
+          } else {
+              alert('Silahkan pilih data yang akan dicetak tbpnya.');
+          }
+      });
+      
       $('#btn_print').click(function () {
       $('#btn_print').click(function () {
           if (mID) {
           if (mID) {
               url = oFormUrl+'cetak/pdf?awal='+$('#awal').val()+"&akhir="+$('#akhir').val()+"&id1="+mID;
               url = oFormUrl+'cetak/pdf?awal='+$('#awal').val()+"&akhir="+$('#akhir').val()+"&id1="+mID;