Commit 7ef78661 by Owo Sugiana

Bug fixed karena kini self.tgl_bayar bertipe date

1 parent 417bd66d
0.1.11 2020-09-24 0.1.11 2020-09-28
----------------- -----------------
- Tambah modul bekasi_kab - Tambah modul bekasi_kab
- Field tgl_pembayaran_sppt tidak lagi memuat jam. Jam tetap ada di field - Field tgl_pembayaran_sppt tidak lagi memuat jam. Jam tetap ada di field
......
...@@ -12,8 +12,7 @@ AKHIR_DISC = date(2020, 10, 30) ...@@ -12,8 +12,7 @@ AKHIR_DISC = date(2020, 10, 30)
class Inquiry(BaseInquiry): class Inquiry(BaseInquiry):
def hitung_discount_denda(self): # Override def hitung_discount_denda(self): # Override
tgl_bayar = self.tgl_bayar.date() if self.denda < 1 or self.tgl_bayar < AWAL_DISC or \
if self.denda < 1 or tgl_bayar < AWAL_DISC or \ self.tgl_bayar > AKHIR_DISC or self.invoice.thn_pajak_sppt > '2020':
tgl_bayar > AKHIR_DISC or self.invoice.thn_pajak_sppt > '2020':
return 0 return 0
return self.denda return self.denda
...@@ -15,8 +15,7 @@ AKHIR_DISC = date(2020, 11, 30) ...@@ -15,8 +15,7 @@ AKHIR_DISC = date(2020, 11, 30)
class Inquiry(BaseInquiry): class Inquiry(BaseInquiry):
def hitung_discount_denda(self): def hitung_discount_denda(self):
tgl_bayar = self.tgl_bayar.date() if self.tgl_bayar < AWAL_DISC or self.tgl_bayar > AKHIR_DISC or \
if tgl_bayar < AWAL_DISC or tgl_bayar > AKHIR_DISC or \
self.invoice.thn_pajak_sppt < '1990' or \ self.invoice.thn_pajak_sppt < '1990' or \
self.invoice.thn_pajak_sppt > '2020': self.invoice.thn_pajak_sppt > '2020':
return 0 return 0
......
...@@ -49,7 +49,7 @@ class Inquiry(BaseInquiry): ...@@ -49,7 +49,7 @@ class Inquiry(BaseInquiry):
def hitung_discount_denda(self): def hitung_discount_denda(self):
self.denda_sblm_diskon = self.denda self.denda_sblm_diskon = self.denda
if self.tgl_bayar.date() > AKHIR_DISC_DENDA: if self.tgl_bayar > AKHIR_DISC_DENDA:
return 0 return 0
return self.denda return self.denda
......
...@@ -84,9 +84,9 @@ class Inquiry(BaseInquiry): ...@@ -84,9 +84,9 @@ class Inquiry(BaseInquiry):
def hitung_discount_denda(self): def hitung_discount_denda(self):
self.denda_sblm_diskon = self.denda self.denda_sblm_diskon = self.denda
if self.tgl_bayar.date() > AKHIR_DISC_DENDA: if self.tgl_bayar > AKHIR_DISC_DENDA:
return 0 return 0
if self.tgl_bayar.date() < SATU_SEPTEMBER: if self.tgl_bayar < SATU_SEPTEMBER:
return self.hitung_discount_denda_sebelum_september() return self.hitung_discount_denda_sebelum_september()
return self.hitung_discount_denda_sk_34_2020() return self.hitung_discount_denda_sk_34_2020()
...@@ -111,7 +111,7 @@ class Inquiry(BaseInquiry): ...@@ -111,7 +111,7 @@ class Inquiry(BaseInquiry):
faktor_pengurang = self.invoice.faktor_pengurang_sppt or 0 faktor_pengurang = self.invoice.faktor_pengurang_sppt or 0
if faktor_pengurang > 0: if faktor_pengurang > 0:
return 0 return 0
if self.tgl_bayar.date() < SATU_SEPTEMBER: if self.tgl_bayar < SATU_SEPTEMBER:
return self.hitung_discount_pokok_sebelum_september() return self.hitung_discount_pokok_sebelum_september()
return self.hitung_discount_pokok_sk_34_2020() return self.hitung_discount_pokok_sk_34_2020()
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!