diff --git a/payroll.py b/payroll.py index e84ad17..81274d3 100644 --- a/payroll.py +++ b/payroll.py @@ -1934,27 +1934,40 @@ class PayrollExportReport(Report): """Check account code in dict account debit and party""" if not line.party: continue + line_ = { + 'date': line.move.date, + 'code': '---', + 'party': employee.party.id_number, + 'description': line.description, + 'department': employee.department.name if employee.department else '---', + 'amount': line.amount, + 'type': 'D', + } if line.debit > 0: if line.account.id in accountdb_ids: - line.party = accdb_party[line.account.id] + id_number = accdb_party[line.account.id].id_number else: - print(line.account.code, line.party.name) - id_number = line.party.id_number + id_number = None + print('------------>', line.account.code, line.party.name) if id_number in ENTITY_ACCOUNTS.keys(): - print('debit ------------->', id_number) - line.account.code = ENTITY_ACCOUNTS[id_number][1] + line_['code'] = ENTITY_ACCOUNTS[id_number][1] + else: + line_['code'] = line.account.code else: + line_['type'] = 'C' id_number = line.party.id_number if id_number in ENTITY_ACCOUNTS.keys(): - line.account.code = ENTITY_ACCOUNTS[id_number][0] + line_['code'] = ENTITY_ACCOUNTS[id_number][0] + else: + line_['code'] = line.account.code if line.account.code not in records.keys(): records[line.account.code] = { 'name': line.account.name, 'lines': [] } - records[line.account.code]['lines'].append(line) + records[line.account.code]['lines'].append(line_) report_context['records'] = records report_context['start_date'] = start_period.name