NaNtic
/
trytond-account_reports
mirror of https://github.com/NaN-tic/trytond-account_reports.git
2
1
Fork 0
Code Issues Projects Releases Wiki Activity

when crete the general ledger, control the possibility to have an 

account_move with move_origin, but not origin, or BankLine as origin.

Task: #156979
This commit is contained in:
Bernat Brunet 2023-03-13 08:50:40 +01:00
parent 15a3e3737a
commit d748a20364
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
general_ledger/general_ledger.py
View File

@ -144,7 +144,9 @@ class GeneralLedgerReport(HTMLReport):
Account = pool.get('account.account')
Party = pool.get('party.party')
Line = pool.get('account.move.line')
Invoice = pool.get('account.invoice')
InvoiceLine = pool.get('account.invoice.line')
BankLine = pool.get('account.bank.statement.line')
def _get_key(currentKey):
account_code = currentKey[0].code or currentKey[0].name
@ -309,9 +311,27 @@ class GeneralLedgerReport(HTMLReport):
ref += ' [%s]' % line.origin.invoice.reference
if line.origin.invoice.party.rec_name:
ref += ' %s' % line.origin.invoice.party.rec_name
elif line.move_origin and isinstance(line.move_origin, Invoice):
# If the account have the check "party_required", try to
# get from the invoice
if line.account.party_required:
party = line.move_origin.party
if line.move_origin.number:
ref = '%s' % line.move_origin.number
if line.move_origin.reference:
ref += ' [%s]' % line.move_origin.reference
if line.move_origin.party.rec_name:
ref += ' %s' % line.move_origin.party.rec_name
elif line.origin and isinstance(line.origin, BankLine):
if line.origin.description:
ref = '%s' % line.origin.description
else:
ref = (line.origin.rec_name if line.origin
and hasattr(line.origin, 'rec_name') else None)
else:
ref = (line.origin.rec_name if line.origin and
hasattr(line.origin, 'rec_name') else None)
ref = (line.origin.rec_name if line.origin
and hasattr(line.origin, 'rec_name') else None)
# If we dont fill the party in a party_required account, try
# get the party field in the line

2
general_ledger/templates/detail_lines_macro.html
View File

@ -10,7 +10,7 @@
<tr>
<td>{{ l.line.date }}</td>
<td>{% if l.line.move.post_number %}{{ l.line.move.post_number }}{% else %}{{ l.line.move.move_number }}{{ l.line.party and l.line.party.name }}{% endif %}</td>
<td>{% if l.ref %}{{ l.ref }}{% endif %}{% if l.ref and l.line.description %} // {% endif %}{% if l.line and l.line.description %} {{ l.line.description }} {% endif %}</td>
<td>{% if l.ref %}{{ l.ref }}{% endif %}{% if l.ref and l.line and l.line.description %} // {% endif %}{% if l.line and l.line.description %} {{ l.line.description }} {% endif %}</td>
<td style="text-align: right;">{{ l.debit|render }} {% set ns.total_debit = ns.total_debit + l.debit %}</td>
<td style="text-align: right;">{{ l.credit|render }} {% set ns.total_credit = ns.total_credit + l.credit %}</td>
<td style="text-align: right;">{{ l.balance|render }}</td>