mirror of
https://github.com/NaN-tic/trytond-account_reports.git
synced 2023-12-14 05:43:08 +01:00
parent
3bf8ec1c91
commit
a924f1ff29
1 changed files with 42 additions and 21 deletions
|
@ -185,6 +185,42 @@ class GeneralLedgerReport(HTMLReport):
|
||||||
cls.__rpc__['execute'] = RPC(False)
|
cls.__rpc__['execute'] = RPC(False)
|
||||||
cls.side_margin = 0.3
|
cls.side_margin = 0.3
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _ref_origin_invoice_line(cls, line):
|
||||||
|
ref = []
|
||||||
|
if line.origin.invoice.number:
|
||||||
|
ref.append('%s' % line.origin.invoice.number)
|
||||||
|
if line.origin.invoice.reference:
|
||||||
|
ref.append('[%s]' % line.origin.invoice.reference)
|
||||||
|
if line.origin.invoice.party.rec_name:
|
||||||
|
ref.append('%s' % line.origin.invoice.party.rec_name)
|
||||||
|
return ' '.join(ref)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _ref_origin_invoice(cls, line):
|
||||||
|
ref = []
|
||||||
|
if line.move_origin.number:
|
||||||
|
ref.append('%s' % line.move_origin.number)
|
||||||
|
if line.move_origin.reference:
|
||||||
|
ref.append('[%s]' % line.move_origin.reference)
|
||||||
|
if line.move_origin.party.rec_name:
|
||||||
|
ref.append('%s' % line.move_origin.party.rec_name)
|
||||||
|
return ' '.join(ref)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _ref_origin_bank_line(cls, line):
|
||||||
|
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)
|
||||||
|
return ref
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _ref_origin(cls, line):
|
||||||
|
return (line.origin.rec_name if line.origin
|
||||||
|
and hasattr(line.origin, 'rec_name') else None)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def prepare(cls, data):
|
def prepare(cls, data):
|
||||||
pool = Pool()
|
pool = Pool()
|
||||||
|
@ -373,40 +409,25 @@ class GeneralLedgerReport(HTMLReport):
|
||||||
ref = None
|
ref = None
|
||||||
|
|
||||||
if line.origin and isinstance(line.origin, InvoiceLine):
|
if line.origin and isinstance(line.origin, InvoiceLine):
|
||||||
|
ref = cls._ref_origin_invoice_line(line)
|
||||||
|
|
||||||
# If the account have the check "party_required", try to
|
# If the account have the check "party_required", try to
|
||||||
# get from the invoice
|
# get from the invoice
|
||||||
if line.account.party_required:
|
if line.account.party_required:
|
||||||
party = line.origin.invoice.party
|
party = line.origin.invoice.party
|
||||||
|
|
||||||
if line.origin.invoice.number:
|
|
||||||
ref = '%s' % line.origin.invoice.number
|
|
||||||
if line.origin.invoice.reference:
|
|
||||||
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
|
elif (line.move_origin
|
||||||
and isinstance(line.move_origin, Invoice)):
|
and isinstance(line.move_origin, Invoice)):
|
||||||
|
ref = cls._ref_origin_invoice(line)
|
||||||
|
|
||||||
# If the account have the check "party_required", try to
|
# If the account have the check "party_required", try to
|
||||||
# get from the invoice
|
# get from the invoice
|
||||||
if line.account.party_required:
|
if line.account.party_required:
|
||||||
party = line.move_origin.party
|
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 BankLine
|
elif (line.origin and BankLine
|
||||||
and isinstance(line.origin, BankLine)):
|
and isinstance(line.origin, BankLine)):
|
||||||
if line.origin.description:
|
ref = cls._ref_origin_bank_line(line)
|
||||||
ref = '%s' % line.origin.description
|
|
||||||
else:
|
|
||||||
ref = (line.origin.rec_name if line.origin
|
|
||||||
and hasattr(line.origin, 'rec_name') else None)
|
|
||||||
else:
|
else:
|
||||||
ref = (line.origin.rec_name if line.origin
|
ref = cls._ref_origin(line)
|
||||||
and hasattr(line.origin, 'rec_name') else None)
|
|
||||||
|
|
||||||
# If we dont fill the party in a party_required account, try
|
# If we dont fill the party in a party_required account, try
|
||||||
# get the party field in the line
|
# get the party field in the line
|
||||||
|
|
Loading…
Reference in a new issue