Bug fixed set_faktor_pengurangan_sppt()

sismiop/services/base.py

@@ -123,6 +123,13 @@ class Query:
     def is_available(self):
     def is_available(self):
         return self.invoice.status_pembayaran_sppt == '0'
         return self.invoice.status_pembayaran_sppt == '0'
 
 
+    def set_faktor_pengurang_sppt(self, penambah):
+        not_null(self.invoice)
+        self.invoice.faktor_pengurang_sppt += penambah 
+        self.invoice.pbb_yg_harus_dibayar_sppt = \
+            self.invoice.pbb_terhutang_sppt - \
+            self.invoice.faktor_pengurang_sppt
+
 
 
 class Inquiry(Query):
 class Inquiry(Query):
     def __init__(
     def __init__(
@@ -273,19 +280,14 @@ class Inquiry(Query):
         DBSession.add(self.invoice)
         DBSession.add(self.invoice)
         return bayar
         return bayar
 
 
-    def set_faktor_pengurang_sppt(self):
-        if not self.discount_pokok:
-            return
-        not_null(self.invoice)
-        self.invoice.pbb_yg_harus_dibayar_sppt = \
-            self.invoice.pbb_terhutang_sppt - \
-            self.invoice.faktor_pengurang_sppt - \
-            self.discount_pokok
-        self.invoice.faktor_pengurang_sppt += self.discount_pokok
-
     def before_save(self, bayar):
     def before_save(self, bayar):
         pass
         pass
 
 
+    def set_faktor_pengurang_sppt(self, payment):
+        if not payment.discount_pokok:
+            return
+        Query.set_faktor_pengurang_sppt(self, payment.discount_pokok)
+
 
 
 class Reversal(Query):
 class Reversal(Query):
     def __init__(self, invoice_id):
     def __init__(self, invoice_id):
@@ -308,12 +310,7 @@ class Reversal(Query):
     def set_faktor_pengurang_sppt(self):
     def set_faktor_pengurang_sppt(self):
         if not self.payment.discount_pokok:
         if not self.payment.discount_pokok:
             return
             return
-        not_null(self.invoice)
-        self.invoice.pbb_yg_harus_dibayar_sppt = \
-            self.invoice.pbb_terhutang_sppt - \
-            self.invoice.faktor_pengurang_sppt + \
-            self.payment.discount_pokok
-        self.invoice.faktor_pengurang_sppt -= self.payment.discount_pokok
+        Query.set_faktor_pengurang_sppt(self, - self.payment.discount_pokok)
 
 
 
 
 def not_null(invoice):
 def not_null(invoice):

sismiop/services/tangkota/__init__.py

@@ -54,9 +54,6 @@ class Inquiry(BaseInquiry):
         return self.denda
         return self.denda
 
 
     def hitung_discount_pokok(self):
     def hitung_discount_pokok(self):
-        faktor_pengurang = self.invoice.faktor_pengurang_sppt or 0
-        if faktor_pengurang > 0:
-            return 0
         if self.invoice.thn_pajak_sppt not in TAHUN_PAJAK_DISC_POKOK:
         if self.invoice.thn_pajak_sppt not in TAHUN_PAJAK_DISC_POKOK:
             return 0
             return 0
         if self.tgl_bayar.year not in PERIODE_DISC_POKOK:
         if self.tgl_bayar.year not in PERIODE_DISC_POKOK:
@@ -76,7 +73,7 @@ class Inquiry(BaseInquiry):
     def before_save(self, payment):  # Override
     def before_save(self, payment):  # Override
         payment.denda_sblm_diskon = self.denda_sblm_diskon
         payment.denda_sblm_diskon = self.denda_sblm_diskon
         payment.discount_pokok = self.discount_pokok
         payment.discount_pokok = self.discount_pokok
-        self.set_faktor_pengurang_sppt()
+        self.set_faktor_pengurang_sppt(payment)
 
 
 
 
 class AvailableInvoice(BaseAvailableInvoice):
 class AvailableInvoice(BaseAvailableInvoice):

sismiop/services/tangsel/__init__.py

@@ -110,7 +110,7 @@ class Inquiry(BaseInquiry):
         payment.jml_sppt_yg_dibayar = tagihan_netto + denda_netto
         payment.jml_sppt_yg_dibayar = tagihan_netto + denda_netto
         payment.denda_sppt = denda_netto
         payment.denda_sppt = denda_netto
 
 
-        self.set_faktor_pengurang_sppt()
+        self.set_faktor_pengurang_sppt(payment)
 
 
 
 
 class Reversal(BaseReversal):
 class Reversal(BaseReversal):