yumoqing/accounting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
yumoqing 2024-09-26 15:00:49 +08:00
parent 231403885d
commit 7c77aa7bd6
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
accounting/accounting_config.py
View File

@ -130,9 +130,9 @@ where a.id = b.protocolid
rev = self.action.endswith('_REVERSE') rev = self.action.endswith('_REVERSE')
for l in self.accounting_legs: for l in self.accounting_legs:
if rev: if rev:
l['acc_dir'] = '0' if l['accounting_dir'] == CREDIT else '1' l['acc_dir'] = DEBT if l['accounting_dir'] == CREDIT else CREDIT
else: else:
l['acc_dir'] = '0' if l['accounting_dir'] == DEBT else '1' l['acc_dir'] = l['accounting_dir']
ac = ArgsConvert('${', '}$') ac = ArgsConvert('${', '}$')
print(f'{l["id"]},{l["amt_pattern"]=}') print(f'{l["id"]},{l["amt_pattern"]=}')
try: try:
@ -239,11 +239,25 @@ where a.id = b.protocolid
print(f'{name} not found') print(f'{name} not found')
def check_accounting_balance(self, legs):
debt_balance = 0.0
credit_balance = 0.0
for l in legs:
if l['acc_dir'] == DEBT:
debt_balance += legs['amount']
else:
credit_balance += legs['amount']
if abs(credit_balance - debt_balance) >= 0.01:
e = Exception('accounting legs not balance')
exception(f'{legs=}, {e=}')
raise e
async def do_accounting(self, sor): async def do_accounting(self, sor):
self.sor = sor self.sor = sor
await self.setup_accounting_legs() await self.setup_accounting_legs()
print('do_accounting() ...', self.accounting_legs) print('do_accounting() ...', self.accounting_legs)
self.check_accounting_balance(self.accounting_legs)
for leg in self.accounting_legs: for leg in self.accounting_legs:
orgid = self.accounting_orgid orgid = self.accounting_orgid
if leg['orgtype'] == '客户': if leg['orgtype'] == '客户':
@ -312,9 +326,9 @@ where accountid=${accid}$
if acc.get('balance') is None: if acc.get('balance') is None:
acc['balance'] = 0 acc['balance'] = 0
if acc['balance_at'] == '0' and leg['acc_dir'] == '1' \ if acc['balance_at'] == DEBT and leg['acc_dir'] == CREDIT \
or acc['balance_at'] == '1' and leg['acc_dir'] == '0': or acc['balance_at'] == CREDIT and leg['acc_dir'] == DEBT:
if int(acc['balance']*100) - int(leg['amount']*100) < 0: if int(acc['balance']*10000) - int(leg['amount']*10000) < 0:
if tryAgain: if tryAgain:
await asyncio.sleep(1.5); await asyncio.sleep(1.5);
return await self.overdraw_check(sor, accid, leg, tryAgain=False) return await self.overdraw_check(sor, accid, leg, tryAgain=False)
@ -327,6 +341,8 @@ where accountid=${accid}$
async def leg_accounting(self, sor, accid, leg): async def leg_accounting(self, sor, accid, leg):
# print(f'leg_accounting(), {accid=}, {leg=}') # print(f'leg_accounting(), {accid=}, {leg=}')
if leg['amount'] < 0.0001:
return
await self.overdraw_check(sor, accid, leg) await self.overdraw_check(sor, accid, leg)
# write acc_balance # write acc_balance
sql = """select * from acc_balance sql = """select * from acc_balance

2
accounting/const.py
View File

@ -23,7 +23,7 @@ PARTY_PROVIDER = '供应商'
DEBT = '0' DEBT = '0'
CREDIT = '1' CREDIT = '1'
ACTNAME_BUY = 'sonsume' ACTNAME_BUY = 'consume'
ACTNAME_RECHARGE = 'recharge' ACTNAME_RECHARGE = 'recharge'
ACTNAME_RECHARGE_ALIPAY = 'rechange_alipay' ACTNAME_RECHARGE_ALIPAY = 'rechange_alipay'
ACTNAME_SETTLE = '结算' ACTNAME_SETTLE = '结算'

BIN
docs/平台类系统记账子系统.docx Normal file
View File

Binary file not shown.