Skip to content

Taufik Yulianto / esipkd

Go to a project
Commit 82483bff by suri
Options

update format

1 parent 2e309835
Inline Side-by-side
Showing 2 changed files with 15 additions and 12 deletions
esipkd/views/bjb_qris.py
...@@ -276,12 +276,12 @@ class view(object): ...@@ -276,12 +276,12 @@ class view(object):
if row_invoice: if row_invoice:
pokok, denda = calculate_tagihan(dict(pokok = row_invoice.jumlah,jatuh_tempo=row_invoice.jatuh_tempo)) pokok, denda = calculate_tagihan(dict(pokok = row_invoice.jumlah,jatuh_tempo=row_invoice.jatuh_tempo))
values = {} values = {}
values['invoice_no']=row_invoice.kode, values['invoice_no']=row_invoice.kode
values['description']=row_invoice.description, values['description']=row_invoice.description
values['customer_name']=row_invoice.subjek_nama, values['customer_name']=row_invoice.subjek_nama
values['customer_email']=row_invoice.subjek_email and row_invoice.subjek_email or '-', values['customer_email']=row_invoice.subjek_email and row_invoice.subjek_email or '-'
values['customer_phone']=row_invoice.subjek_phone and row_invoice.subjek_phone or '-', values['customer_phone']=row_invoice.subjek_phone and row_invoice.subjek_phone or '-'
values['expired_date']=ymdhms(datetime.combine(date.today(),time(23,59,59))), values['expired_date']=ymdhms(datetime.combine(date.today(),time(23,59,59)))
values['amount']=(pokok + denda) values['amount']=(pokok + denda)
else: else:
alues = {} alues = {}
......
esipkd/views/bjb_va.py
...@@ -278,14 +278,17 @@ class view(object): ...@@ -278,14 +278,17 @@ class view(object):
if row_invoice: if row_invoice:
pokok, denda = calculate_tagihan(dict(pokok = row_invoice.jumlah,jatuh_tempo=row_invoice.jatuh_tempo)) pokok, denda = calculate_tagihan(dict(pokok = row_invoice.jumlah,jatuh_tempo=row_invoice.jatuh_tempo))
print ("++++++++++++++++++++++++++", str(row_invoice.description))
values = {} values = {}
values['invoice_no']=row_invoice.kode, values['invoice_no']=str(row_invoice.kode)
values['description']=row_invoice.description, values['description']=str(row_invoice.description)
values['customer_name']=row_invoice.subjek_nama, values['customer_name']=row_invoice.subjek_nama
values['customer_email']=row_invoice.subjek_email and row_invoice.subjek_email or '-', values['customer_email']=row_invoice.subjek_email and row_invoice.subjek_email or '-'
values['customer_phone']=row_invoice.subjek_phone and row_invoice.subjek_phone or '-', values['customer_phone']=row_invoice.subjek_phone and row_invoice.subjek_phone or '-'
values['expired_date']=ymdhms(datetime.combine(date.today(),time(23,59,59))), values['expired_date']=ymdhms(datetime.combine(date.today(),time(23,59,59)))
values['amount']=(pokok + denda) values['amount']=(pokok + denda)
print ('---------------------------------', values)
else: else:
values = {} values = {}
form.set_appstruct(values) form.set_appstruct(values)
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!