Commit 1ca6f999 by Owo Sugiana

Tambah Kabupaten Sukabumi

1 parent 52a8ee93
0.4.8 2023-01-06
----------------
- Tambah Kabupaten Sukabumi
0.4.7 2022-12-19 0.4.7 2022-12-19
---------------- ----------------
- Tambah Cimahi - Tambah Cimahi
......
...@@ -197,7 +197,7 @@ class BaseInquiry: ...@@ -197,7 +197,7 @@ class BaseInquiry:
self.alamat2 = alamat[1] self.alamat2 = alamat[1]
else: else:
self.alamat1 = upper(self.wajib_pajak.alamat) self.alamat1 = upper(self.wajib_pajak.alamat)
self.alamat2 = alamat[0] self.alamat2 = alamat and alamat[0] or ''
else: else:
alamat = wrap(upper(self.wajib_pajak.alamat), 40) alamat = wrap(upper(self.wajib_pajak.alamat), 40)
self.alamat1 = alamat[0] self.alamat1 = alamat[0]
...@@ -217,7 +217,8 @@ class BaseInquiry: ...@@ -217,7 +217,8 @@ class BaseInquiry:
nama = self.invoice.r_nama or self.wajib_pajak.customernm nama = self.invoice.r_nama or self.wajib_pajak.customernm
if nama: if nama:
lengkap.append(nama) lengkap.append(nama)
return ','.join(lengkap) s = ','.join(lengkap)
return s.strip()
def get_alamat_wp(self): def get_alamat_wp(self):
return upper(self.wajib_pajak.alamat) return upper(self.wajib_pajak.alamat)
...@@ -244,7 +245,7 @@ class BaseInquiry: ...@@ -244,7 +245,7 @@ class BaseInquiry:
return self.rekening.rekeningkd.upper() return self.rekening.rekeningkd.upper()
def get_nama_rekening(self): def get_nama_rekening(self):
return self.rekening.rekeningnm.upper() return self.rekening.rekeningnm.strip().upper()
def get_masa_1(self, fmt='%d%m%Y'): def get_masa_1(self, fmt='%d%m%Y'):
return self.invoice.masadari.strftime(fmt) return self.invoice.masadari.strftime(fmt)
...@@ -481,6 +482,9 @@ class AvailableInvoice: ...@@ -481,6 +482,9 @@ 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() Rekening = self.get_rekening_model()
if self.option.rekening.lower() == 'opd':
q = q.filter(Rekening.rekeningnm.ilike('% opd'))
else:
q = q.filter(Rekening.rekeningkd == self.option.rekening) q = q.filter(Rekening.rekeningkd == self.option.rekening)
return q return q
......
from opensipkd.hitung import (
hitung_denda,
round_up,
)
from .banjar import (
Inquiry as BaseInquiry,
Reversal,
AvailableInvoice,
)
class Inquiry(BaseInquiry):
def hitung_denda(self): # Override
self.bln_tunggakan = None
self.denda = 0
if self.invoice.jatuhtempotgl:
if self.invoice.status_pembayaran == 0:
self.bln_tunggakan, self.denda_waktu = hitung_denda(
self.tagihan, self.invoice.jatuhtempotgl,
self.conf['persen_denda'],
self.tgl_bayar.date())
# Bulan Tunggakan maksimal 15 bulan
# Pak Yuyus - Eko 28 Agustus 2017
if self.bln_tunggakan > 15:
denda_per_bulan = self.denda_waktu / self.bln_tunggakan
self.bln_tunggakan = 15
self.denda_waktu = denda_per_bulan * self.bln_tunggakan
else:
self.bln_tunggakan = self.denda_waktu = 0
self.denda = self.denda_waktu + self.invoice.bunga
self.denda = round_up(self.denda)
self.discount_denda = self.get_discount_denda()
self.denda -= self.discount_denda
def get_discount_denda(self): # Override
nama_rek = self.get_nama_rekening()
if nama_rek[-4:] == ' OPD':
return self.denda
return 0
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!