Merge branch 'master' of https://git.opensipkd.com/taufik/esipkd

esipkd/views/daftar.py

@@ -300,7 +300,7 @@ def daftar_objekpajak():
 @colander.deferred
 def deferred_user(node, kw):
     values = kw.get('daftar_user',[])
-    return widget.SelectWidget(values=values)
+    return widget.Selec2tWidget(values=values)
                             
 def daftar_user():
     rows = DBSession.query(User

esipkd/views/rpc.py

@@ -182,15 +182,23 @@ def get_payment(request, data):
     
     rdata = []
     for k in row_payment:
+        if not k.ntp:
+            k.ntp = ''
+        else:
+            k.ntb = k.ntp.strip()
+        if not k.ntb:
+            k.ntb = ''
+        else:
+            k.ntb = k.ntb.strip()
         d = dict(
             kd_bayar = data['kd_bayar'],
-            ntp = k.ntp and k.ntp.strip() or '',
+            ntp = k.ntp,
             pembayaran_ke = k.pembayaran_ke,
             bunga = k.bunga,
             bayar = k.bayar,
             tgl_bayar = ymd(k.tgl_bayar),
             jatuh_tempo = ymd(k.jatuh_tempo),
-            ntb = k.ntb and k.ntb.strip() or '',
+            ntb = k.ntb,
             bank_id = k.bank_id,
             channel_id = k.channel_id,
         )