Commit f1560818 by Owo Sugiana

Bug fixed perhitungan denda saat sudah bayar sebagian

1 parent 68206f12
0.5.22 2025-09-16
-----------------
- Bug fixed perhitungan denda saat sudah bayar sebagian
0.5.21 2025-01-22 0.5.21 2025-01-22
----------------- -----------------
- Kabupaten Magelang mengenakan denda 1% mulai masa pajak Oktober 2024 tanggal - Kabupaten Magelang mengenakan denda 1% mulai masa pajak Oktober 2024 tanggal
......
...@@ -79,8 +79,9 @@ def show(inq): ...@@ -79,8 +79,9 @@ def show(inq):
show_rp('Discount Denda', inq.discount_denda) show_rp('Discount Denda', inq.discount_denda)
if inq.notes: if inq.notes:
show_val('Note', inq.notes) show_val('Note', inq.notes)
show_rp('Total Denda', inq.denda)
show_rp('Total Bayar', inq.total_bayar) show_rp('Total Bayar', inq.total_bayar)
show_rp('Sisa Tagihan', inq.sisa_tagihan)
show_rp('Total Denda', inq.denda)
show_rp('Total Tagihan', inq.total) show_rp('Total Tagihan', inq.total)
show_field(inq.invoice, 'status_pembayaran') show_field(inq.invoice, 'status_pembayaran')
show_field(inq.invoice, 'status_bayar') show_field(inq.invoice, 'status_bayar')
......
...@@ -18,7 +18,7 @@ class Inquiry(BaseInquiry): ...@@ -18,7 +18,7 @@ class Inquiry(BaseInquiry):
else: else:
persen_denda = self.conf['persen_denda'] persen_denda = self.conf['persen_denda']
self.bln_tunggakan, self.denda_waktu = hitung_denda( self.bln_tunggakan, self.denda_waktu = hitung_denda(
self.tagihan, self.invoice.jatuhtempotgl, persen_denda, self.sisa_tagihan, self.invoice.jatuhtempotgl, persen_denda,
self.tgl_bayar.date()) self.tgl_bayar.date())
def get_discount_denda(self): # Override def get_discount_denda(self): # Override
......
...@@ -327,7 +327,7 @@ class Inquiry(BaseInquiry): ...@@ -327,7 +327,7 @@ class Inquiry(BaseInquiry):
else: else:
persen_denda = self.conf['persen_denda'] persen_denda = self.conf['persen_denda']
self.bln_tunggakan, self.denda_waktu = hitung_denda( self.bln_tunggakan, self.denda_waktu = hitung_denda(
self.tagihan, self.invoice.jatuhtempotgl, persen_denda, self.sisa_tagihan, self.invoice.jatuhtempotgl, persen_denda,
self.tgl_bayar.date()) self.tgl_bayar.date())
def get_discount_denda(self): def get_discount_denda(self):
...@@ -336,11 +336,14 @@ class Inquiry(BaseInquiry): ...@@ -336,11 +336,14 @@ class Inquiry(BaseInquiry):
def hitung_bayar(self): def hitung_bayar(self):
bayar = self.get_payment_amount() bayar = self.get_payment_amount()
self.total_bayar = round_up(bayar) self.total_bayar = round_up(bayar)
self.sisa_tagihan = self.tagihan - self.total_bayar
if self.sisa_tagihan < 1:
self.sisa_tagihan = 0
def hitung(self): def hitung(self):
self.hitung_tagihan() self.hitung_tagihan()
self.hitung_denda()
self.hitung_bayar() self.hitung_bayar()
self.hitung_denda()
self.total = self.tagihan + self.denda - self.total_bayar self.total = self.tagihan + self.denda - self.total_bayar
if self.total < 0: if self.total < 0:
self.total = 0 self.total = 0
......
...@@ -3,7 +3,7 @@ requires = ['setuptools >= 64'] ...@@ -3,7 +3,7 @@ requires = ['setuptools >= 64']
[project] [project]
name = 'opensipkd-pad-models' name = 'opensipkd-pad-models'
version = '0.5.21' version = '0.5.22'
dependencies = [ dependencies = [
'sqlalchemy', 'sqlalchemy',
'zope.sqlalchemy', 'zope.sqlalchemy',
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!