Commit f622dda9 by Owo Sugiana

Bug fixed Kabupaten Bekasi

1 parent 19648caa
...@@ -68,15 +68,16 @@ INVOICE_ID = [ ...@@ -68,15 +68,16 @@ INVOICE_ID = [
] ]
AWAL_MASA = date(2020, 3, 1) AWAL_MASA = date(2020, 3, 1)
AKHIR_MASA = date(2020, 12, 31) AKHIR_MASA = date(2021, 12, 31)
AWAL_TERIMA = date(2020, 4, 1) AWAL_TERIMA = date(2020, 4, 1)
AKHIR_TGL_BAYAR = date(2021, 3, 31) AKHIR_TERIMA = date(2021, 12, 31)
AKHIR_TGL_BAYAR = date(2022, 4, 30)
NOTE_REK = 'Rekening {rek} tidak dikenai denda' NOTE_REK = 'Rekening {rek} tidak dikenai denda'
NOTE_TGL_BAYAR = 'Tanggal bayar {tgl} <= ' + dmy(AKHIR_TGL_BAYAR) NOTE_TGL_BAYAR = 'Tanggal bayar {tgl} <= ' + dmy(AKHIR_TGL_BAYAR)
NOTE_AWAL_MASA = 'field masadari {tgl} >= ' + dmy(AWAL_MASA) NOTE_AWAL_MASA = 'field masadari {tgl} >= ' + dmy(AWAL_MASA)
NOTE_AKHIR_MASA = 'field masadari {tgl} <= ' + dmy(AKHIR_MASA) NOTE_AKHIR_MASA = 'field masadari {tgl} <= ' + dmy(AKHIR_MASA)
NOTE_TGL_TERIMA = 'field terimatgl {tgl} >= ' + dmy(AWAL_TERIMA) NOTE_TGL_TERIMA = 'field terimatgl {tgl} >= ' + dmy(AKHIR_TERIMA)
class Inquiry(BaseInquiry): class Inquiry(BaseInquiry):
...@@ -113,23 +114,20 @@ class Inquiry(BaseInquiry): ...@@ -113,23 +114,20 @@ class Inquiry(BaseInquiry):
notes = [ notes = [
NOTE_TGL_BAYAR.format(tgl=dmy(tgl_bayar)), NOTE_TGL_BAYAR.format(tgl=dmy(tgl_bayar)),
NOTE_AKHIR_MASA.format(tgl=dmy(tgl_masa))] NOTE_AKHIR_MASA.format(tgl=dmy(tgl_masa))]
if tgl_masa >= AWAL_MASA and \ if tgl_masa <= AKHIR_MASA:
rek in self.conf.get( notes.append(NOTE_AKHIR_MASA.format(tgl=dmy(tgl_masa)))
'rekening_tanpa_denda_mulai_maret_2020', []):
notes.append(NOTE_AWAL_MASA.format(tgl=dmy(tgl_masa)))
notes.append(NOTE_REK.format(rek=rek))
self.notes = notes self.notes = notes
return self.denda return self.denda
tgl_terima = self.invoice.terimatgl.date() tgl_terima = self.invoice.terimatgl.date()
if tgl_terima >= AWAL_TERIMA and \ if tgl_terima <= AKHIR_TERIMA:
rek in self.conf.get(
'rekening_tanpa_denda_mulai_april_2020', []):
notes.append(NOTE_TGL_TERIMA.format(tgl=tgl_terima)) notes.append(NOTE_TGL_TERIMA.format(tgl=tgl_terima))
notes.append(NOTE_REK.format(rek=rek))
self.notes = notes self.notes = notes
return self.denda return self.denda
return 0 return 0
def get_kohir(self): # Override
return
class Reversal(BaseReversal): class Reversal(BaseReversal):
invoice_id_structure = INVOICE_ID invoice_id_structure = INVOICE_ID
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!