Skip to content

Owo Sugiana / sismiop-models

Go to a project
Commit a70c2520 by Owo Sugiana
Options

Bug fixed total bayar perlu ditambah discount

1 parent c22f4a4a
Inline Side-by-side
Showing 1 changed file with 5 additions and 2 deletions
sismiop/services/base.py
...@@ -240,13 +240,16 @@ class Inquiry(Query): ...@@ -240,13 +240,16 @@ class Inquiry(Query):
func.sum(Payment.jml_sppt_yg_dibayar). func.sum(Payment.jml_sppt_yg_dibayar).
label('jml_sppt_yg_dibayar'), label('jml_sppt_yg_dibayar'),
func.sum(Payment.denda_sppt). func.sum(Payment.denda_sppt).
label('denda_sppt')) label('denda_sppt'),
func.sum(Payment.discount).
label('discount'))
q = self.get_filter(q) q = self.get_filter(q)
bayar = q.first() bayar = q.first()
self.total_bayar = bayar.jml_sppt_yg_dibayar or 0 self.total_bayar = bayar.jml_sppt_yg_dibayar or 0
denda_lalu = bayar.denda_sppt or 0 denda_lalu = bayar.denda_sppt or 0
discount_lalu = float(bayar.discount or 0)
sisa = float(self.total_bayar - denda_lalu) sisa = float(self.total_bayar - denda_lalu)
tagihan = self.invoice.pbb_yg_harus_dibayar_sppt - sisa tagihan = self.invoice.pbb_yg_harus_dibayar_sppt - sisa - discount_lalu
if tagihan < 0: if tagihan < 0:
self.tagihan = 0 self.tagihan = 0
else: else:
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!