Presik
/
trytonpsk-staff_payroll_co
mirror of https://bitbucket.org/presik/trytonpsk-staff_payroll_co.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

minor fix

This commit is contained in:
wilsongomez 2022-05-12 12:04:10 -05:00
parent a3d0fde0b6
commit 0d114e0146
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
payroll.py
View File

@ -1808,13 +1808,15 @@ class Exo2276Report(Report):
pag_wage = WageType.search_read([
('type_concept', 'in', [
'unemployment', 'interest', 'holidays']),
], fields_names=['credit_account', 'type_concept'])
], fields_names=['credit_account', 'type_concept', 'debit_account'])
accounts_id = {'cesanpag': [], 'holidays': []}
for p in pag_wage:
if p['type_concept'] in ('unemployment', 'interest'):
accounts_id['cesanpag'].append(p['credit_account'])
accounts_id['cesanpag'].append(p['debit_account'])
else:
accounts_id['holidays'].append(p['debit_account'])
accounts_id['holidays'].append(p['credit_account'])
# accounts_id_c = ['cesanpagp':['credit_account'] for p in pag_wage]
@ -1887,13 +1889,13 @@ class Exo2276Report(Report):
('move.date', '<=', data['end_period']),
('account', 'in',
accounts_id['cesanpag']+accounts_id['holidays']),
('debit', '>', 0),
], fields_names=['debit', 'move', 'account'])
# ('debit', '>', 0),
], fields_names=['debit', 'credit', 'move', 'account'])
if lines_liquid:
_cesanpag = sum(
[l['debit'] for l in lines_liquid if l['account'] in accounts_id['cesanpag']])
[abs(l['debit']-l['credit']) for l in lines_liquid if l['account'] in accounts_id['cesanpag']])
_holidays = sum(
[l['debit'] for l in lines_liquid if l['account'] in accounts_id['holidays']])
[abs(l['debit']-l['credit']) for l in lines_liquid if l['account'] in accounts_id['holidays']])
new_objects[party.id]['cesanpag'] = _cesanpag
new_objects[party.id]['holidays'] = _holidays