Commit b58a94fd by Owo Sugiana

Bug fixed filter tanggal pada BPHTB

1 parent 4d0d628c
import sys import sys
import pdb import pdb
from datetime import datetime, timedelta from datetime import datetime, timedelta, date
from sqlalchemy import ( from sqlalchemy import (
Column, Column,
Integer, Integer,
...@@ -175,7 +175,6 @@ class App(BaseApp): ...@@ -175,7 +175,6 @@ class App(BaseApp):
try: try:
self.set_default_models() self.set_default_models()
except (ProgrammingError, OperationalError, DatabaseError) as e: except (ProgrammingError, OperationalError, DatabaseError) as e:
print('ERROR set_default_models', e)
self.prod_session.rollback() self.prod_session.rollback()
try: try:
self.set_alternative_models() self.set_alternative_models()
...@@ -311,7 +310,7 @@ class App(BaseApp): ...@@ -311,7 +310,7 @@ class App(BaseApp):
return q.filter( return q.filter(
or_( or_(
and_( and_(
self.Payment.tanggal >= self.tgl_awal.date(), self.Payment.tanggal == self.tgl_awal.date(),
self.Payment.jam >= self.tgl_awal.time()), self.Payment.jam >= self.tgl_awal.time()),
and_( and_(
self.Payment.tanggal > self.tgl_awal.date(), self.Payment.tanggal > self.tgl_awal.date(),
...@@ -517,6 +516,9 @@ class App(BaseApp): ...@@ -517,6 +516,9 @@ class App(BaseApp):
stan = ntb = None stan = ntb = None
channel_id = '0000' channel_id = '0000'
channel_nama = self.get_va_channel(pay.tanggal) or 'MANUAL' channel_nama = self.get_va_channel(pay.tanggal) or 'MANUAL'
if pay.tanggal > date.today():
print(f'DEBUG self.tgl_akhir {self.tgl_akhir}')
raise Exception(f'{pay.tanggal} adalah masa depan. Perbaiki script.')
return dict( return dict(
id=pay.id, stan=stan, ntb=ntb, tgl=pay.tanggal, jam=pay.jam, id=pay.id, stan=stan, ntb=ntb, tgl=pay.tanggal, jam=pay.jam,
invoice_id=self.invoice_id, nop=pay.nop, wp_nama=pay.wp_nama, invoice_id=self.invoice_id, nop=pay.nop, wp_nama=pay.wp_nama,
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!