diff --git a/account_partner_aged_statement_webkit/report/partner_aged_statement.mako b/account_partner_aged_statement_webkit/report/partner_aged_statement.mako index 34fea72e..631eb929 100644 --- a/account_partner_aged_statement_webkit/report/partner_aged_statement.mako +++ b/account_partner_aged_statement_webkit/report/partner_aged_statement.mako @@ -59,9 +59,9 @@ - - - + + + @@ -69,10 +69,10 @@ %for l in get_balance(partner, company): - - - - + + + + @@ -120,9 +120,9 @@ %endif ## if getLinesCurrent(partner, company)
${_('List of overdue invoices')}
- %if getLines3060(partner, company): + %if getLines3160(partner, company):
-
${_('30-60')}
+
${_('31-60')}
${_('Current')}${_('30-60')}${_('60-90')}${_('90-120')}${_('31-60')}${_('61-90')}${_('91-120')} ${_('+120')} ${_('Total')} ${_('Currency')}
${ l['current'] }${ l['3060'] }${ l['6090'] }${ l['90120'] }${ l['120'] }${ l['3160'] }${ l['6190'] }${ l['91120'] }${ l['121'] } ${ l['total'] } ${ l['currency_name']}
@@ -134,7 +134,7 @@ - %for line in getLines3060(partner, company): + %for line in getLines3160(partner, company): @@ -145,10 +145,10 @@ - %endfor ## for line in getLines3060(partner, company) + %endfor ## for line in getLines3160(partner, company)
${_('Date')}${_('Total')} ${_('Currency')}
${ formatLang(line['date_original'], date=True) } ${ line['name'] }${ formatLang(line['amount_unreconciled']) } ${ line['currency_name'] }
- %endif ## if getLines3060(partner, company) - %if getLines60(partner, company): + %endif ## if getLines3160(partner, company) + %if getLines61(partner, company):
${_('+60')}
@@ -162,7 +162,7 @@ - %for line in getLines60(partner, company): + %for line in getLines61(partner, company): @@ -173,9 +173,9 @@ - %endfor ## for line in getLines60(partner, company) + %endfor ## for line in getLines61(partner, company)
${_('Total')} ${_('Currency')}
${ formatLang(line['date_original'], date=True) } ${ line['name'] }${ formatLang(line['amount_unreconciled']) } ${ line['currency_name'] }
- %endif ## if getLines60(partner) + %endif ## if getLines61(partner) %if getLinesRefunds(partner, company):
diff --git a/account_partner_aged_statement_webkit/report/partner_aged_statement_report.py b/account_partner_aged_statement_webkit/report/partner_aged_statement_report.py index bc63445b..863f4145 100644 --- a/account_partner_aged_statement_webkit/report/partner_aged_statement_report.py +++ b/account_partner_aged_statement_webkit/report/partner_aged_statement_report.py @@ -49,8 +49,8 @@ class PartnerAgedTrialReport(aged_trial_report): self.localcontext.update({ 'message': self._message, 'getLinesCurrent': self._lines_get_current, - 'getLines3060': self._lines_get_30_60, - 'getLines60': self._lines_get_60, + 'getLines3160': self._lines_get_31_60, + 'getLines61': self._lines_get_61, 'getLinesRefunds': self._lines_get_refunds, 'show_message': True, 'get_current_invoice_lines': self._get_current_invoice_lines, @@ -96,10 +96,10 @@ class PartnerAgedTrialReport(aged_trial_report): res[currency_name] = { 'current': 0, '30': 0, - '3060': 0, - '6090': 0, - '90120': 0, - '120': 0, + '3160': 0, + '6190': 0, + '91120': 0, + '121': 0, 'total': 0, 'currency_name': currency_name, } @@ -114,17 +114,17 @@ class PartnerAgedTrialReport(aged_trial_report): ): current_dict['current'] += amount - elif line['date_original'] > date_60: - current_dict['3060'] += amount + elif line['date_original'] >= date_60: + current_dict['3160'] += amount - elif line['date_original'] > date_90: - current_dict['6090'] += amount + elif line['date_original'] >= date_90: + current_dict['6190'] += amount - elif line['date_original'] > date_120: - current_dict['90120'] += amount + elif line['date_original'] >= date_120: + current_dict['91120'] += amount else: - current_dict['120'] += amount + current_dict['121'] += amount current_dict['total'] += amount @@ -203,10 +203,10 @@ class PartnerAgedTrialReport(aged_trial_report): print movelines return movelines - def _lines_get_30_60(self, partner, company): + def _lines_get_31_60(self, partner, company): today = self.today - start = today - relativedelta(days=30) - stop = start - relativedelta(days=30) + start = today - relativedelta(days=31) + stop = today - relativedelta(days=60) today = today.strftime(DEFAULT_SERVER_DATE_FORMAT) start = start.strftime(DEFAULT_SERVER_DATE_FORMAT) @@ -217,14 +217,14 @@ class PartnerAgedTrialReport(aged_trial_report): line for line in movelines if (( line['date_original'] and - stop < line['date_original'] <= start + stop <= line['date_original'] <= start ) and line['type'] in ['in_invoice', 'out_invoice']) ] return movelines - def _lines_get_60(self, partner, company): + def _lines_get_61(self, partner, company): today = self.today - start = today - relativedelta(days=60) + start = today - relativedelta(days=61) today = today.strftime(DEFAULT_SERVER_DATE_FORMAT) start = start.strftime(DEFAULT_SERVER_DATE_FORMAT) diff --git a/account_partner_aged_statement_webkit/tests/test_aged_statement.py b/account_partner_aged_statement_webkit/tests/test_aged_statement.py index a698f7d3..fe742cb4 100644 --- a/account_partner_aged_statement_webkit/tests/test_aged_statement.py +++ b/account_partner_aged_statement_webkit/tests/test_aged_statement.py @@ -137,10 +137,10 @@ class test_aged_statement(common.TransactionCase): self.assertEqual(len(balance), 1) self.assertEqual(balance[0]['current'], 400) - self.assertEqual(balance[0]['3060'], 150) - self.assertEqual(balance[0]['6090'], 200) - self.assertEqual(balance[0]['90120'], 250) - self.assertEqual(balance[0]['120'], 500) + self.assertEqual(balance[0]['3160'], 150) + self.assertEqual(balance[0]['6190'], 200) + self.assertEqual(balance[0]['91120'], 250) + self.assertEqual(balance[0]['121'], 500) self.assertEqual(balance[0]['total'], 400 + 150 + 200 + 250 + 500) def compare_vals(self, line, vals): @@ -165,8 +165,8 @@ class test_aged_statement(common.TransactionCase): 'amount_unreconciled': 100, }) - def test_line_get_30_60(self): - lines = self.report._lines_get_30_60(self.partner, self.company) + def test_line_get_31_60(self): + lines = self.report._lines_get_31_60(self.partner, self.company) self.compare_vals(lines[0], { 'date_original': self.date2, @@ -174,9 +174,9 @@ class test_aged_statement(common.TransactionCase): 'amount_unreconciled': 150, }) - def test_line_get_60(self): + def test_line_get_61(self): lines = sorted( - self.report._lines_get_60(self.partner, self.company), + self.report._lines_get_61(self.partner, self.company), key=lambda l: l['date_original']) self.compare_vals(lines[0], {