Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[FIX] variable name that retrieve date

pull/7/merge
Nicolas Bessi 2014-03-17 10:36:14 +01:00
parent ca5bed3188
commit f2b04b80b6
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
account_financial_report_webkit/report/aged_partner_balance.py
View File

@ -193,6 +193,7 @@ class AccountAgedTrialBalanceWebkit(PartnersOpenInvoicesWebkit):
"""Compute overdue delay delta in days for line using attribute in key """Compute overdue delay delta in days for line using attribute in key
delta = end_date - date of key delta = end_date - date of key
:param line: current ledger line
:param key: date key to be used to compute delta :param key: date key to be used to compute delta
:param end_date: end_date computed for wizard data :param end_date: end_date computed for wizard data
@ -204,24 +205,42 @@ class AccountAgedTrialBalanceWebkit(PartnersOpenInvoicesWebkit):
return delta.days return delta.days
def compute_delay_from_maturity(self, line, end_date, ledger_lines): def compute_delay_from_maturity(self, line, end_date, ledger_lines):
"""Compute overdue delay delta in days for line using attribute in key
delta = end_date - maturity date
:param line: current ledger line
:param end_date: end_date computed for wizard data
:returns: delta in days
"""
return self._compute_delay_from_key('date_maturity', return self._compute_delay_from_key('date_maturity',
line, line,
end_date) end_date)
def compute_delay_from_date(self, line, end_date, ledger_lines): def compute_delay_from_date(self, line, end_date, ledger_lines):
"""Compute overdue delay delta in days for line using attribute in key
delta = end_date - maturity date
:param line: current ledger line
:param end_date: end_date computed for wizard data
:returns: delta in days
"""
return self._compute_delay_from_key('ldate', return self._compute_delay_from_key('ldate',
line, line,
end_date) end_date)
def compute_delay_from_partial_rec(self, line, end_date, ledger_lines): def compute_delay_from_partial_rec(self, line, end_date, ledger_lines):
sale_lines = [x for x in ledger_lines if x['jtype'] in REC_PAY_TYPE] sale_lines = [x for x in ledger_lines if x['jtype'] in REC_PAY_TYPE and
refund_lines = [x for x in ledger_lines if x['jtype'] in REFUND_TYPE] line['rec_id'] == x['rec_id']]
refund_lines = [x for x in ledger_lines if x['jtype'] in REFUND_TYPE and
line['rec_id'] == x['rec_id']]
reference_line = line reference_line = line
if len(sale_lines) == 1: if len(sale_lines) == 1:
reference_line = sale_lines[0] reference_line = sale_lines[0]
elif len(refund_lines) == 1: elif len(refund_lines) == 1:
reference_line = refund_lines[0] reference_line = refund_lines[0]
key = 'date_maturity' if line.get('date_maturity') else 'ldate' key = 'date_maturity' if reference_line.get('date_maturity') else 'ldate'
return self._compute_delay_from_key(key, return self._compute_delay_from_key(key,
reference_line, reference_line,
end_date) end_date)