Bug fixed kuningan saat isi field jml_sppt_yg_dibayar

sismiop/models/kuningan.py

+from sqlalchemy import (
+    Column,
+    Float,
+    )
+from .default import PembayaranSppt as BasePembayaranSppt
+
+
+class PembayaranSppt(BasePembayaranSppt):
+    __table_args__ = dict(extend_existing=True)
+    denda_sblm_diskon = Column(Float)
+    discount_pokok = Column(Float)
+    discount_denda = Column(Float)

sismiop/scripts/inquiry.py

@@ -77,18 +77,12 @@ def show_inquiry(inq):
     pay = inq.invoice2payment()
     if not pay:
         return
-    show_field(pay, 'pembayaran_sppt_ke')
-    show_field(pay, 'kd_kanwil')
-    show_field(pay, 'kd_kantor')
-    show_field(pay, 'kd_kanwil_bank')
-    show_field(pay, 'kd_kppbb_bank')
-    show_field(pay, 'kd_bank_tunggal')
-    show_field(pay, 'kd_bank_persepsi')
-    show_field(pay, 'kd_tp')
-    show_field(pay, 'tgl_rekam_byr_sppt')
-    show_field(pay, 'tgl_pembayaran_sppt')
-    show_field(pay, 'discount_pokok')
-    show_field(pay, 'discount_denda')
+    show_fields(
+        pay, ['pembayaran_sppt_ke', 'kd_kanwil', 'kd_kantor',
+              'kd_kanwil_bank', 'kd_kppbb_bank', 'kd_bank_tunggal',
+              'kd_bank_persepsi', 'kd_tp', 'tgl_rekam_byr_sppt',
+              'tgl_pembayaran_sppt', 'jml_sppt_yg_dibayar', 'denda_sppt',
+              'discount_pokok', 'discount_denda', 'discount'])
 
 
 def show_fields(row, fieldnames):
@@ -110,10 +104,10 @@ def show_payment(module_name, inq, pay):
             pay.pembayaran_sppt_ke))
     print('Tabel pembayaran_sppt')
     show_fields(
-        pay, [
-            'jml_sppt_yg_dibayar', 'denda_sppt', 'discount', 'kd_kanwil',
-            'kd_bank', 'kd_kanwil_bank', 'kd_kppbb_bank', 'kd_bank_tunggal',
-            'kd_bank_persepsi', 'kd_tp', 'discount_pokok', 'discount_denda'])
+        pay, ['kd_kanwil', 'kd_bank', 'kd_kanwil_bank', 'kd_kppbb_bank',
+              'kd_bank_tunggal', 'kd_bank_persepsi', 'kd_tp',
+              'jml_sppt_yg_dibayar', 'denda_sppt', 'discount_pokok',
+              'discount_denda', 'discount'])
     try:
         row, fields = inq.get_other_payment_table(pay)
     except AttributeError:

sismiop/services/base.py

@@ -269,7 +269,7 @@ class Inquiry(Query):
         self.total = self.tagihan + self.denda
         if self.total > 0:
             self.hitung_discount()
-            self.total = self.total - self.discount
+            self.total -= self.discount
 
     def do_payment(self, bank_fields, nip_pencatat):
         Payment = self.get_payment_model()
@@ -287,9 +287,10 @@ class Inquiry(Query):
                 pembayaran_sppt_ke=ke, tgl_rekam_byr_sppt=datetime.now(),
                 tgl_pembayaran_sppt=self.tgl_bayar,
                 nip_rekam_byr_sppt=nip_pencatat,
-                jml_sppt_yg_dibayar=self.tagihan+self.denda,
-                denda_sppt=self.denda,
-                discount=self.discount)
+                jml_sppt_yg_dibayar=self.total,
+                denda_sppt=self.denda)
+        if self.discount:
+            bayar.discount = self.discount
         for key, value in bank_fields.items():
             setattr(bayar, key, value)
         self.before_save(bayar)

sismiop/services/bekasi_kab/__init__.py → sismiop/services/bekasi_kab.py

 from datetime import date
-from sismiop.services.cilegon import (
+from .cilegon import (
     Inquiry as BaseInquiry,
     Reversal,
     AvailableInvoice,

sismiop/services/bogor_kota/__init__.py → sismiop/services/bogor_kota.py

@@ -4,15 +4,15 @@ from datetime import (
     datetime,
     )
 from opensipkd.hitung import round_up
-from sismiop.models.default import (
+from ..models.default import (
     PenguranganPst,
     PenguranganCovid,
     )
-from ..base import (
+from .base import (
     get_db_session,
     Query,
     )
-from ..default import (
+from .default import (
     Inquiry as BaseInquiry,
     Reversal as BaseReversal,
     AvailableInvoice as BaseAvailableInvoice,

sismiop/services/cilegon/__init__.py → sismiop/services/cilegon.py

 # File ini berdasarkan Surat Keputusan Walikota Cilegon
 # Nomor 973/kep. -BPKAD/2020
 from datetime import date
-from ..default import (
+from .default import (
     Inquiry as BaseInquiry,
     Reversal as BaseReversal,
     AvailableInvoice,
     )
-from sismiop.models.cilegon import PembayaranSppt
+from ..models.cilegon import PembayaranSppt
 
 
 AWAL_DISC = date(2020, 9, 1)
@@ -26,14 +26,13 @@ class Inquiry(BaseInquiry):
 
     def hitung_discount(self):  # Override
         self.denda_sblm_diskon = self.denda
-        self.discount_denda = self.hitung_discount_denda()
-        self.denda -= self.discount_denda
-        self.total = self.tagihan + self.denda
+        self.discount = self.hitung_discount_denda()
 
     def before_save(self, payment):  # Override
+        payment.denda_sppt = self.denda - self.discount
         # Sekedar catatan
         payment.denda_sblm_diskon = self.denda_sblm_diskon
-        payment.discount = self.discount_denda
+        payment.discount = self.discount
 
 
 class Reversal(BaseReversal):
@@ -41,4 +40,4 @@ class Reversal(BaseReversal):
         return PembayaranSppt
 
     def before_save(self):  # Override
-        self.payment.denda_sblm_diskon = 0
+        self.payment.denda_sblm_diskon = self.payment.discount = 0

sismiop/services/default/__init__.py → sismiop/services/default.py

-from sismiop.models.default import (
+from ..models.default import (
     ObjekPajak,
     Sppt,
     PembayaranSppt,
@@ -6,7 +6,7 @@ from sismiop.models.default import (
     Kecamatan,
     Propinsi,
     )
-from ..base import (
+from .base import (
     AvailableInvoice as BaseAvailableInvoice,
     Inquiry as BaseInquiry,
     Reversal as BaseReversal,

sismiop/services/kuningan/__init__.py → sismiop/services/kuningan.py

 from datetime import date
-from sismiop.models.tangsel import PembayaranSppt
-from ..default import (
+from ..models.kuningan import PembayaranSppt
+from .cilegon import (
     Inquiry as BaseInquiry,
     Reversal as BaseReversal,
     AvailableInvoice,
@@ -14,9 +14,6 @@ class Inquiry(BaseInquiry):
     def get_payment_model(self):  # Override
         return PembayaranSppt
 
-    def hitung_discount(self):  # Override
-        self.discount = self.discount_denda = self.hitung_discount_denda()
-
     def hitung_discount_denda(self):
         if self.denda > 0 and self.tgl_bayar <= AKHIR_DISC and \
                 self.invoice.thn_pajak_sppt in ('2019', '2020'):
@@ -24,7 +21,8 @@ class Inquiry(BaseInquiry):
         return 0
 
     def before_save(self, payment):  # Override
-        payment.discount_denda = self.discount_denda
+        super().before_save(payment)
+        payment.discount_denda = self.discount
 
 
 class Reversal(BaseReversal):
@@ -32,4 +30,5 @@ class Reversal(BaseReversal):
         return PembayaranSppt
 
     def before_save(self):  # Override
+        super().before_save()
         self.payment.discount_denda = 0

sismiop/services/majalengka/__init__.py → sismiop/services/majalengka.py

 from datetime import date
-from ..cilegon import (
+from .cilegon import (
     Inquiry as BaseInquiry,
     Reversal,
     AvailableInvoice,

sismiop/services/pangandaran/__init__.py → sismiop/services/pangandaran.py

 from datetime import datetime
-from sismiop.models.pangandaran import (
+from ..models.pangandaran import (
     ObjekPajak,
     Sppt,
     PembayaranSppt,
@@ -7,7 +7,7 @@ from sismiop.models.pangandaran import (
     Kecamatan,
     Propinsi,
     )
-from ..base import (
+from .base import (
     AvailableInvoice as BaseAvailableInvoice,
     Inquiry as BaseInquiry,
     Reversal as BaseReversal,
@@ -34,33 +34,6 @@ class Inquiry(BaseInquiry):
     def get_propinsi_model(self):  # Override
         return Propinsi
 
-    def do_payment(self, bank_fields, nip_pencatat):  # Override
-        Payment = self.get_payment_model()
-        bayar = self.invoice2payment()
-        if bayar:
-            ke = bayar.pembayaran_sppt_ke + 1
-        else:
-            ke = 1
-        inv = self.invoice
-        bayar = Payment(
-                kd_propinsi=inv.kd_propinsi, kd_dati2=inv.kd_dati2,
-                kd_kecamatan=inv.kd_kecamatan, kd_kelurahan=inv.kd_kelurahan,
-                kd_blok=inv.kd_blok, no_urut=inv.no_urut,
-                kd_jns_op=inv.kd_jns_op, thn_pajak_sppt=inv.thn_pajak_sppt,
-                pembayaran_sppt_ke=ke, tgl_rekam_byr_sppt=datetime.now(),
-                tgl_pembayaran_sppt=self.tgl_bayar,
-                nip_rekam_byr_sppt=nip_pencatat,
-                jml_sppt_yg_dibayar=self.tagihan+self.denda,
-                denda_sppt=self.denda)
-        for key, value in bank_fields.items():
-            setattr(bayar, key, value)
-        self.before_save(bayar)
-        DBSession = get_db_session()
-        DBSession.add(bayar)
-        self.invoice.status_pembayaran_sppt = '1'  # Lunas
-        DBSession.add(self.invoice)
-        return bayar
-
 
 class Reversal(BaseReversal):
     def get_invoice_model(self):

sismiop/services/serang_kab/__init__.py → sismiop/services/serang_kab.py

 from datetime import datetime
 from sqlalchemy import func
 from opensipkd.hitung import round_up
-from sismiop.models.serang_kab import (
+from ..models.serang_kab import (
     ObjekPajak,
     Sppt,
     PembayaranSppt,
@@ -9,7 +9,7 @@ from sismiop.models.serang_kab import (
     Kecamatan,
     Propinsi,
     )
-from ..base import (
+from .base import (
     AvailableInvoice as BaseAvailableInvoice,
     Inquiry as BaseInquiry,
     Reversal as BaseReversal,
@@ -56,7 +56,7 @@ class Inquiry(BaseInquiry):
                 no_transaksi_byr_sppt=ntp,
                 no_transaksi_byr_sppt_bank=ntb,
                 user_bank_rekam=user_id,
-                jml_pbb_yg_dibayar=self.tagihan+self.denda,
+                jml_pbb_yg_dibayar=self.total,
                 jml_denda_sppt=self.denda,
                 kd_sumber_data='5')
         for key, value in bank_fields.items():

sismiop/services/tangkota/__init__.py → sismiop/services/tangkota.py

 from datetime import date
-from ..tangsel import (
+from .tangsel import (
     Inquiry as BaseInquiry,
     Reversal,
     AvailableInvoice as BaseAvailableInvoice,
     AvailableInvoiceTangsel as BaseAvailableInvoiceTangsel,
     )
-from sismiop.models.tangsel import PembayaranSppt
+from ..models.tangsel import PembayaranSppt
 
 
 AWAL_DISC = date(2020, 10, 1)

sismiop/services/tangsel/__init__.py → sismiop/services/tangsel.py

@@ -6,16 +6,16 @@ from sqlalchemy import (
     )
 from sqlalchemy.orm import aliased
 from opensipkd.hitung import round_up
-from ..base import (
+from .base import (
     thousand,
     get_db_session,
     )
-from ..default import (
+from .default import (
     Inquiry as BaseInquiry,
     Reversal as BaseReversal,
     AvailableInvoice as BaseAvailableInvoice,
     )
-from sismiop.models.tangsel import PembayaranSppt
+from ..models.tangsel import PembayaranSppt
 
 
 # Halaman 6 pasal 8

sismiop/services/tangsel_invisible_disc/__init__.py → sismiop/services/tangsel_invisible_disc.py

-from ..tangsel import (
+from .tangsel import (
     Inquiry as BaseInquiry,
     Reversal,
     AvailableInvoice,

sismiop/services/tasik_kab/__init__.py → sismiop/services/tasik_kab.py

@@ -2,7 +2,7 @@ from datetime import (
     datetime,
     date,
     )
-from sismiop.models.tasik_kab import (
+from ..models.tasik_kab import (
     ObjekPajak,
     Sppt,
     PembayaranSppt,
@@ -10,7 +10,7 @@ from sismiop.models.tasik_kab import (
     Kecamatan,
     Propinsi,
     )
-from ..base import (
+from .base import (
     AvailableInvoice as BaseAvailableInvoice,
     Inquiry as BaseInquiry,
     Reversal as BaseReversal,
@@ -47,33 +47,6 @@ class Inquiry(BaseInquiry):
         if self.invoice.thn_pajak_sppt in ('2018', '2019'):
             self.denda = 0
 
-    def do_payment(self, bank_fields, nip_pencatat):  # Override
-        Payment = self.get_payment_model()
-        bayar = self.invoice2payment()
-        if bayar:
-            ke = bayar.pembayaran_sppt_ke + 1
-        else:
-            ke = 1
-        inv = self.invoice
-        bayar = Payment(
-                kd_propinsi=inv.kd_propinsi, kd_dati2=inv.kd_dati2,
-                kd_kecamatan=inv.kd_kecamatan, kd_kelurahan=inv.kd_kelurahan,
-                kd_blok=inv.kd_blok, no_urut=inv.no_urut,
-                kd_jns_op=inv.kd_jns_op, thn_pajak_sppt=inv.thn_pajak_sppt,
-                pembayaran_sppt_ke=ke, tgl_rekam_byr_sppt=datetime.now(),
-                tgl_pembayaran_sppt=self.tgl_bayar,
-                nip_rekam_byr_sppt=nip_pencatat,
-                jml_sppt_yg_dibayar=self.tagihan+self.denda,
-                denda_sppt=self.denda)
-        for key, value in bank_fields.items():
-            setattr(bayar, key, value)
-        self.before_save(bayar)
-        DBSession = get_db_session()
-        DBSession.add(bayar)
-        self.invoice.status_pembayaran_sppt = '1'  # Lunas
-        DBSession.add(self.invoice)
-        return bayar
-
 
 class Reversal(BaseReversal):
     def get_invoice_model(self):