Commit b73cd66e by Owo Sugiana

Discount denda Tangerang Selatan

1 parent 8426ff03
0.4.3 2022-08-04
----------------
- Discount denda untuk Tangerang Selatan
0.4.2 2022-07-01 0.4.2 2022-07-01
---------------- ----------------
- Tambah Subang - Tambah Subang
......
...@@ -47,6 +47,7 @@ def show(inq): ...@@ -47,6 +47,7 @@ def show(inq):
show_val('Tahun Pajak', inq.get_tahun()) show_val('Tahun Pajak', inq.get_tahun())
show_val('Masa 1', inq.get_masa_1()) show_val('Masa 1', inq.get_masa_1())
show_val('Masa 2', inq.get_masa_2()) show_val('Masa 2', inq.get_masa_2())
show_val('Tanggal Kohir', inq.get_tgl_kohir())
show_val('Kode Rekening', inq.get_kode_rekening()) show_val('Kode Rekening', inq.get_kode_rekening())
show_val('Nama Rekening', inq.get_nama_rekening()) show_val('Nama Rekening', inq.get_nama_rekening())
show_val('Jenis Usaha', inq.get_nama_jenis_usaha()) show_val('Jenis Usaha', inq.get_nama_jenis_usaha())
...@@ -81,6 +82,7 @@ def show(inq): ...@@ -81,6 +82,7 @@ def show(inq):
pay = inq.get_payment() pay = inq.get_payment()
show_field(pay, 'sspdtgl') show_field(pay, 'sspdtgl')
show_field(pay, 'id') show_field(pay, 'id')
show_field(pay, 'discount_denda')
def show_pkey_values(row): def show_pkey_values(row):
......
...@@ -474,6 +474,7 @@ class AvailableInvoice: ...@@ -474,6 +474,7 @@ class AvailableInvoice:
def get_filter_rekening(self, q): def get_filter_rekening(self, q):
if self.option.rekening: if self.option.rekening:
Rekening = self.get_rekening_model()
q = q.filter(Rekening.rekeningkd == self.option.rekening) q = q.filter(Rekening.rekeningkd == self.option.rekening)
return q return q
......
...@@ -24,12 +24,37 @@ from ..models.tangsel import ( ...@@ -24,12 +24,37 @@ from ..models.tangsel import (
from .base import satu_kalimat from .base import satu_kalimat
AWAL_DISC = date(2022, 8, 1)
AKHIR_DISC = date(2022, 12, 31)
MASA_PAJAK = date(2022, 6, 30)
class Inquiry(BaseInquiry): class Inquiry(BaseInquiry):
def get_invoice_id(self, raw): # Override def get_invoice_id(self, raw): # Override
if raw.find('367602') == 0: # 3676: Tangsel, 02: PAD if raw.find('367602') == 0: # 3676: Tangsel, 02: PAD
return raw[6:] return raw[6:]
return raw return raw
def is_reklame(self):
return self.get_nama_rekening().find('REKLAME') > -1
def get_discount_denda(self): # Override
if isinstance(self.tgl_bayar, datetime):
tgl_bayar = self.tgl_bayar.date()
else:
tgl_bayar = self.tgl_bayar
if tgl_bayar < AWAL_DISC or tgl_bayar > AKHIR_DISC:
return 0
tgl_pajak = None
if self.is_reklame():
tgl_pajak = self.get_tgl_kohir()
else:
tgl_pajak = self.invoice.masasd.date()
if tgl_pajak and tgl_pajak <= MASA_PAJAK:
return self.denda
return 0
def before_save(self, pay): # Override def before_save(self, pay): # Override
pay.discount_denda = self.discount_denda pay.discount_denda = self.discount_denda
if self.notes: if self.notes:
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!