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

esipkd/views/pap.py

@@ -15,8 +15,8 @@ from ..models import (DBSession)
 from ..models.isipkd import (Pap)
 from ..models.isipkd import (Pap)
 from ..models.informix import EngInformix
 from ..models.informix import EngInformix
 
 
-from .bjb_va import rpc_params, BJBVA
-from .bjb_qris import BJBQRIS
+from .bjb_va import rpc_params as paramsbjbva, BJBVA
+from .bjb_qris import rpc_params as paramsbjbqris, BJBQRIS
 from ..tools import ymd, dmy, ymdhms, dmyhms, dmy_to_date
 from ..tools import ymd, dmy, ymdhms, dmyhms, dmy_to_date
 from pyramid.renderers import render_to_response, render
 from pyramid.renderers import render_to_response, render
 
 
@@ -395,7 +395,7 @@ def view_edit(request):
             DBSession.add(cekpap)
             DBSession.add(cekpap)
             DBSession.flush()
             DBSession.flush()
             
             
-            row = BJBVA.create_va(val, rpc_params())
+            row = BJBVA.create_va(val, paramsbjbva())
             if row and hasattr(row,'va_number'):
             if row and hasattr(row,'va_number'):
                 request.session.flash('BJBVA No. %s sudah ditambahkan.' % row.va_number)
                 request.session.flash('BJBVA No. %s sudah ditambahkan.' % row.va_number)
                 form = get_form(request, VASchema)
                 form = get_form(request, VASchema)
@@ -429,7 +429,7 @@ def view_edit(request):
             DBSession.add(cekpap)
             DBSession.add(cekpap)
             DBSession.flush()
             DBSession.flush()
             
             
-            row = BJBQRIS.create_va(val, rpc_params())
+            row = BJBQRIS.create_va(val, paramsbjbqris())
             if row and hasattr(row,'va_number'):
             if row and hasattr(row,'va_number'):
                 request.session.flash('BJBQRIS No. %s sudah ditambahkan.' % row.va_number)
                 request.session.flash('BJBQRIS No. %s sudah ditambahkan.' % row.va_number)
                 form = get_form(request, QRISSchema)
                 form = get_form(request, QRISSchema)