From 0452608a2f950eb6fe0232c0e43319e73e20a005 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Fri, 10 Jul 2015 19:39:23 +0200 Subject: [PATCH 1/4] Add aged open invoices report Minor style enhancement to aged trial balance --- .../__openerp__.py | 1 + .../report/__init__.py | 1 + .../report/aged_open_invoices.py | 426 ++++++++++++++++++ .../report/aged_partner_balance.py | 4 +- .../report/report.xml | 21 + .../report/templates/aged_open_invoices.mako | 177 ++++++++ .../report/templates/aged_trial_webkit.mako | 4 +- .../report_menus.xml | 18 +- .../wizard/__init__.py | 1 + .../wizard/aged_open_invoices_wizard.py | 58 +++ .../wizard/aged_open_invoices_wizard.xml | 72 +++ 11 files changed, 772 insertions(+), 11 deletions(-) create mode 100644 account_financial_report_webkit/report/aged_open_invoices.py create mode 100644 account_financial_report_webkit/report/templates/aged_open_invoices.mako create mode 100644 account_financial_report_webkit/wizard/aged_open_invoices_wizard.py create mode 100644 account_financial_report_webkit/wizard/aged_open_invoices_wizard.xml diff --git a/account_financial_report_webkit/__openerp__.py b/account_financial_report_webkit/__openerp__.py index 158a652c..99cbed53 100644 --- a/account_financial_report_webkit/__openerp__.py +++ b/account_financial_report_webkit/__openerp__.py @@ -189,6 +189,7 @@ wkhtmltopdf. The texts are defined inside the report classes. 'wizard/trial_balance_wizard_view.xml', 'wizard/partner_balance_wizard_view.xml', 'wizard/open_invoices_wizard_view.xml', + 'wizard/aged_open_invoices_wizard.xml', 'wizard/aged_partner_balance_wizard.xml', 'wizard/print_journal_view.xml', 'report_menus.xml', diff --git a/account_financial_report_webkit/report/__init__.py b/account_financial_report_webkit/report/__init__.py index e597e39d..11e7880b 100644 --- a/account_financial_report_webkit/report/__init__.py +++ b/account_financial_report_webkit/report/__init__.py @@ -10,3 +10,4 @@ from . import partner_balance from . import open_invoices from . import print_journal from . import aged_partner_balance +from . import aged_open_invoices diff --git a/account_financial_report_webkit/report/aged_open_invoices.py b/account_financial_report_webkit/report/aged_open_invoices.py new file mode 100644 index 00000000..049903fd --- /dev/null +++ b/account_financial_report_webkit/report/aged_open_invoices.py @@ -0,0 +1,426 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Author: Alexis de Lattre +# Author: Nicolas Bessi +# Copyright 2015 Akretion (www.akretion.com) +# Copyright 2014 Camptocamp SA +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## +from __future__ import division +from datetime import datetime + +from openerp import pooler +from openerp.tools import DEFAULT_SERVER_DATE_FORMAT +from openerp.tools.translate import _ +from .open_invoices import PartnersOpenInvoicesWebkit +from .webkit_parser_header_fix import HeaderFooterTextWebKitParser + + +def make_ranges(top, offset): + """Return sorted days ranges + + :param top: maximum overdue day + :param offset: offset for ranges + + :returns: list of sorted ranges tuples in days + eg. [(-100000, 0), (0, offset), + (offset, n*offset), ... (top, 100000)] + """ + ranges = [(n, min(n + offset, top)) for n in xrange(0, top, offset)] + ranges.insert(0, (-100000000000, 0)) + ranges.append((top, 100000000000)) + return ranges + +# list of overdue ranges +RANGES = make_ranges(120, 30) + + +def make_ranges_titles(): + """Generates title to be used by mako""" + titles = [_('Not Due')] + titles += [_(u'Overdue ≤ %s d.') % x[1] for x in RANGES[1:-1]] + titles.append(_('Overdue > %s d.') % RANGES[-1][0]) + return titles + +# list of overdue ranges title +RANGES_TITLES = make_ranges_titles() +# list of payable journal types +REC_PAY_TYPE = ('purchase', 'sale') +# list of refund payable type +REFUND_TYPE = ('purchase_refund', 'sale_refund') +INV_TYPE = REC_PAY_TYPE + REFUND_TYPE + + +class AccountAgedOpenInvoicesWebkit(PartnersOpenInvoicesWebkit): + + """Compute Aged Open Invoices based on result of Open Invoices""" + + def __init__(self, cursor, uid, name, context=None): + """Constructor, + refer to :class:`openerp.report.report_sxw.rml_parse`""" + super(AccountAgedOpenInvoicesWebkit, self).__init__(cursor, uid, name, + context=context) + self.pool = pooler.get_pool(self.cr.dbname) + self.cursor = self.cr + company = self.pool.get('res.users').browse(self.cr, uid, uid, + context=context).company_id + + header_report_name = ' - '.join((_('Aged Open Invoices'), + company.currency_id.name)) + + footer_date_time = self.formatLang(str(datetime.today()), + date_time=True) + + self.localcontext.update({ + 'cr': cursor, + 'uid': uid, + 'company': company, + 'ranges': self._get_ranges(), + 'ranges_titles': self._get_ranges_titles(), + 'report_name': _('Aged Open Invoices'), + 'additional_args': [ + ('--header-font-name', 'Helvetica'), + ('--footer-font-name', 'Helvetica'), + ('--header-font-size', '10'), + ('--footer-font-size', '6'), + ('--header-left', header_report_name), + ('--header-spacing', '2'), + ('--footer-left', footer_date_time), + ('--footer-right', + ' '.join((_('Page'), '[page]', _('of'), '[topage]'))), + ('--footer-line',), + ], + }) + + def _get_ranges(self): + """:returns: :cons:`RANGES`""" + return RANGES + + def _get_ranges_titles(self): + """:returns: :cons: `RANGES_TITLES`""" + return RANGES_TITLES + + def set_context(self, objects, data, ids, report_type=None): + """Populate aged_lines, aged_balance, aged_percents attributes + + on each account browse record that will be used by mako template + The browse record are store in :attr:`objects` + + The computation are based on the ledger_lines attribute set on account + contained by :attr:`objects` + + :attr:`objects` values were previously set by parent class + :class: `.open_invoices.PartnersOpenInvoicesWebkit` + + :returns: parent :class:`.open_invoices.PartnersOpenInvoicesWebkit` + call to set_context + + """ + + res = super(AccountAgedOpenInvoicesWebkit, self).set_context( + objects, + data, + ids, + report_type=report_type + ) + + aged_open_inv = {} + # {account1_id: {(0, 30): 0.0, + # (30, 60): -101.0, + # (60, 90): 0.0, + # partenaire1_id: {(0, 30): 5.0, + # (30, 60): -10, + # 'lines': [line1, line2] + # }, + # }, + # } + + # Stupid dict that we copy in parts of the main aged_open_inv dict + aged_dict = {} + for classif in self.localcontext['ranges']: + aged_dict[classif] = 0.0 + + for acc in self.objects: + #print "acc.code=", acc.code + aged_open_inv[acc.id] = aged_dict.copy() + aged_open_inv[acc.id]['balance'] = 0.0 + + for part_id, partner_lines in\ + self.localcontext['ledger_lines'][acc.id].items(): + aged_open_inv[acc.id][part_id] = aged_dict.copy() + aged_open_inv[acc.id][part_id]['balance'] = 0.0 + aged_open_inv[acc.id][part_id]['lines'] = list(partner_lines) + for line in aged_open_inv[acc.id][part_id]['lines']: + line.update(aged_dict) + self.compute_aged_line(part_id, line, data) + aged_open_inv[acc.id][part_id]['balance'] +=\ + line['balance'] + aged_open_inv[acc.id]['balance'] += line['balance'] + for classif in self.localcontext['ranges']: + aged_open_inv[acc.id][part_id][classif] +=\ + line[classif] + aged_open_inv[acc.id][classif] +=\ + line[classif] + + self.localcontext.update({ + 'aged_open_inv': aged_open_inv, + }) + return res + + def compute_aged_line(self, partner_id, ledger_line, data): + """Add classification to accounts browse records + + contained in :attr:`objects` for a given partner + + :param: partner_id: current partner + :param ledger_line: generated by parent + :class:`.open_invoices.PartnersOpenInvoicesWebkit` + + :returns: dict of computed aged lines + eg {'balance': 1000.0, + 'aged_lines': {(90, 120): 0.0, ...} + + """ + #lines_to_age = self.filter_lines(partner_id, [ledger_line]) + end_date = self._get_end_date(data) + reconcile_lookup = self.get_reconcile_count_lookup([ledger_line]) + compute_method = self.get_compute_method(reconcile_lookup, + partner_id, + ledger_line) + delay = compute_method(ledger_line, end_date, [ledger_line]) + classification = self.classify_line(partner_id, delay) + ledger_line[classification] += ledger_line['balance'] + + def _get_end_date(self, data): + """Retrieve end date to be used to compute delay. + + :param data: data dict send to report contains form dict + + :returns: end date to be used to compute overdue delay + + """ + end_date = None + date_to = data['form']['date_to'] + period_to_id = data['form']['period_to'] + fiscal_to_id = data['form']['fiscalyear_id'] + if date_to: + end_date = date_to + elif period_to_id: + period_to = self.pool['account.period'].browse(self.cr, + self.uid, + period_to_id) + end_date = period_to.date_stop + elif fiscal_to_id: + fiscal_to = self.pool['account.fiscalyear'].browse(self.cr, + self.uid, + fiscal_to_id) + end_date = fiscal_to.date_stop + else: + raise ValueError('End date and end period not available') + return end_date + + def _compute_delay_from_key(self, key, line, end_date): + """Compute overdue delay delta in days for line using attribute in key + + delta = end_date - date of key + + :param line: current ledger line + :param key: date key to be used to compute delta + :param end_date: end_date computed for wizard data + + :returns: delta in days + """ + from_date = datetime.strptime(line[key], DEFAULT_SERVER_DATE_FORMAT) + end_date = datetime.strptime(end_date, DEFAULT_SERVER_DATE_FORMAT) + delta = end_date - from_date + return delta.days + + 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 + :param ledger_lines: generated by parent + :class:`.open_invoices.PartnersOpenInvoicesWebkit` + + :returns: delta in days + """ + return self._compute_delay_from_key('date_maturity', + line, + end_date) + + 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 - date + + :param line: current ledger line + :param end_date: end_date computed for wizard data + :param ledger_lines: generated by parent + :class:`.open_invoices.PartnersOpenInvoicesWebkit` + + :returns: delta in days + """ + return self._compute_delay_from_key('ldate', + line, + end_date) + + def compute_delay_from_partial_rec(self, line, end_date, ledger_lines): + """Compute overdue delay delta in days for the case where move line + + is related to a partial reconcile with more than one reconcile line + + :param line: current ledger line + :param end_date: end_date computed for wizard data + :param ledger_lines: generated by parent + :class:`.open_invoices.PartnersOpenInvoicesWebkit` + + :returns: delta in days + """ + sale_lines = [x for x in ledger_lines if x['jtype'] in REC_PAY_TYPE + and 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']] + if len(sale_lines) == 1: + reference_line = sale_lines[0] + elif len(refund_lines) == 1: + reference_line = refund_lines[0] + else: + reference_line = line + key = 'date_maturity' if reference_line.get( + 'date_maturity') else 'ldate' + return self._compute_delay_from_key(key, + reference_line, + end_date) + + def get_compute_method(self, reconcile_lookup, partner_id, line): + """Get the function that should compute the delay for a given line + + :param reconcile_lookup: dict of reconcile group by id and count + {rec_id: count of line related to reconcile} + :param partner_id: current partner_id + :param line: current ledger line generated by parent + :class:`.open_invoices.PartnersOpenInvoicesWebkit` + + :returns: function bounded to :class:`.AccountAgedOpenInvoicesWebkit` + + """ + if reconcile_lookup.get(line['rec_id'], 0.0) > 1: + return self.compute_delay_from_partial_rec + elif line['jtype'] in INV_TYPE and line.get('date_maturity'): + return self.compute_delay_from_maturity + else: + return self.compute_delay_from_date + + def line_is_valid(self, partner_id, line): + """Predicate hook that allows to filter line to be treated + + :param partner_id: current partner_id + :param line: current ledger line generated by parent + :class:`.open_invoices.PartnersOpenInvoicesWebkit` + + :returns: boolean True if line is allowed + """ + return True + + def filter_lines(self, partner_id, lines): + """Filter ledger lines that have to be treated + + :param partner_id: current partner_id + :param lines: ledger_lines related to current partner + and generated by parent + :class:`.open_invoices.PartnersOpenInvoicesWebkit` + + :returns: list of allowed lines + + """ + return [x for x in lines if self.line_is_valid(partner_id, x)] + + def classify_line(self, partner_id, overdue_days): + """Return the overdue range for a given delay + + We loop from smaller range to higher + This should be the most effective solution as generaly + customer tend to have one or two month of delay + + :param overdue_days: delay in days + :param partner_id: current partner_id + + :returns: the correct range in :const:`RANGES` + + """ + for drange in RANGES: + if overdue_days <= drange[1]: + return drange + return drange + + def compute_balance(self, res, aged_lines): + """Compute the total balance of aged line + for given account""" + res['balance'] = sum(aged_lines.values()) + + def compute_totals(self, aged_lines): + """Compute the totals for an account + + :param aged_lines: dict of aged line taken from the + property added to account record + + :returns: dict of total {'balance':1000.00, (30, 60): 3000,...} + + """ + totals = {} + totals['balance'] = sum(x.get('balance', 0.0) for + x in aged_lines) + aged_ranges = [x.get('aged_lines', {}) for x in aged_lines] + for drange in RANGES: + totals[drange] = sum(x.get(drange, 0.0) for x in aged_ranges) + return totals + + def get_reconcile_count_lookup(self, lines): + """Compute an lookup dict + + It contains has partial reconcile id as key and the count of lines + related to the reconcile id + + :param: a list of ledger lines generated by parent + :class:`.open_invoices.PartnersOpenInvoicesWebkit` + + :retuns: lookup dict {ṛec_id: count} + + """ + # possible bang if l_ids is really long. + # We have the same weakness in common_report ... + # but it seems not really possible for a partner + # So I'll keep that option. + l_ids = tuple(x['id'] for x in lines) + sql = ("SELECT reconcile_partial_id, COUNT(*) FROM account_move_line" + " WHERE reconcile_partial_id IS NOT NULL" + " AND id in %s" + " GROUP BY reconcile_partial_id") + self.cr.execute(sql, (l_ids,)) + res = self.cr.fetchall() + return dict((x[0], x[1]) for x in res) + +HeaderFooterTextWebKitParser( + 'report.account.account_aged_open_invoices_webkit', + 'account.account', + 'addons/account_financial_report_webkit/report/templates/\ + aged_open_invoices_webkit.mako', + parser=AccountAgedOpenInvoicesWebkit, +) diff --git a/account_financial_report_webkit/report/aged_partner_balance.py b/account_financial_report_webkit/report/aged_partner_balance.py index 9275af2f..5b09d8ee 100644 --- a/account_financial_report_webkit/report/aged_partner_balance.py +++ b/account_financial_report_webkit/report/aged_partner_balance.py @@ -49,9 +49,9 @@ RANGES = make_ranges(120, 30) def make_ranges_titles(): """Generates title to be used by mako""" - titles = [_('Due')] + titles = [_('Not Due')] titles += [_(u'Overdue ≤ %s d.') % x[1] for x in RANGES[1:-1]] - titles.append(_('Older')) + titles.append(_('Overdue > %s d.') % RANGES[-1][0]) return titles # list of overdue ranges title diff --git a/account_financial_report_webkit/report/report.xml b/account_financial_report_webkit/report/report.xml index 41278e3a..8ea40793 100644 --- a/account_financial_report_webkit/report/report.xml +++ b/account_financial_report_webkit/report/report.xml @@ -108,6 +108,27 @@ + + webkit + account.account_aged_open_invoices_webkit + + + + + account.account + ir.actions.report.xml + Aged Open Invoices Report + account_financial_report_webkit/report/templates/aged_open_invoices.mako + account_financial_report_webkit/report/templates/aged_open_invoices.mako + + + + account_report_aged_open_invoices_webkit + + + + + webkit account.account_aged_trial_balance_webkit diff --git a/account_financial_report_webkit/report/templates/aged_open_invoices.mako b/account_financial_report_webkit/report/templates/aged_open_invoices.mako new file mode 100644 index 00000000..740b1172 --- /dev/null +++ b/account_financial_report_webkit/report/templates/aged_open_invoices.mako @@ -0,0 +1,177 @@ +## -*- coding: utf-8 -*- + + + + + + + <%! + def amount(text): + # replace by a non-breaking hyphen (it will not word-wrap between hyphen and numbers) + return text.replace('-', '‑') + %> + + <%setLang(user.lang)%> + +
+
+
${_('Chart of Account')}
+
${_('Fiscal Year')}
+
+ %if filter_form(data) == 'filter_date': + ${_('Dates Filter')} + %else: + ${_('Periods Filter')} + %endif +
+
${_('Clearance Date')}
+
${_('Accounts Filter')}
+
${_('Target Moves')}
+ +
+
+
${ chart_account.name }
+
${ fiscalyear.name if fiscalyear else '-' }
+
+ ${_('From:')} + %if filter_form(data) == 'filter_date': + ${formatLang(start_date, date=True) if start_date else u'' } + %else: + ${start_period.name if start_period else u''} + %endif + ${_('To:')} + %if filter_form(data) == 'filter_date': + ${ formatLang(stop_date, date=True) if stop_date else u'' } + %else: + ${stop_period.name if stop_period else u'' } + %endif +
+
${ formatLang(date_until, date=True) }
+
+ %if partner_ids: + ${_('Custom Filter')} + %else: + ${ display_partner_account(data) } + %endif +
+
${ display_target_move(data) }
+
+
+ %for account in objects: + %if aged_open_inv[account.id] and partners_order[account.id]: + + + + %for partner_name, p_id, p_ref, p_name in partners_order[account.id]: +
+ +
+
+ ## date +
${_('Date')}
+ ## move +
${_('Entry')}
+ ## journal +
${_('Journal')}
+ ## label +
${_('Label')}
+ ## reconcile +
${_('Rec.')}
+ ## maturity +
${_('Due Date')}
+ ## balance +
${_('Amount')}
+ ## Classifications + %for title in ranges_titles: +
${title}
+ %endfor +
+
+
+ %for line in aged_open_inv[account.id][p_id].get('lines', []): +
+ ## date +
${formatLang(line.get('ldate') or '', date=True)}
+ ## move +
${line.get('move_name') or ''}
+ ## journal +
${line.get('jcode') or ''}
+ ## label +
${line.get('lname')}
+ ## reconcile +
${line.get('rec_name') or ''}
+ ## maturity date +
${formatLang(line.get('date_maturity') or '', date=True)}
+ ## balance +
${formatLang(line.get('balance') or 0.0) | amount }
+ ## classifications + %for classif in ranges: +
+ ${formatLang(line.get(classif) or 0.0) | amount } +
+ %endfor +
+ %endfor # end of the loop on lines +
+
${_('Total Partner')}
+
+
+
+
+
+
${formatLang(aged_open_inv[account.id][p_id]['balance']) | amount}
+ %for classif in ranges: +
${formatLang(aged_open_inv[account.id][p_id][classif]) | amount }
+ %endfor +
+
+ %endfor # end of the loop on partners +
+ +
+
+
+
+
+ + %for classif in ranges: + + %endfor +
+ %endif + %endfor # end of the loop on accounts + + diff --git a/account_financial_report_webkit/report/templates/aged_trial_webkit.mako b/account_financial_report_webkit/report/templates/aged_trial_webkit.mako index 6ad17d7f..0717e7ad 100644 --- a/account_financial_report_webkit/report/templates/aged_trial_webkit.mako +++ b/account_financial_report_webkit/report/templates/aged_trial_webkit.mako @@ -100,9 +100,9 @@ ## partner
${_('Partner')}
## code -
${_('code')}
+
${_('Code')}
## balance -
${_('balance')}
+
${_('Balance')}
## Classifications %for title in ranges_titles:
${title}
diff --git a/account_financial_report_webkit/report_menus.xml b/account_financial_report_webkit/report_menus.xml index 22251ba6..531cdbd3 100644 --- a/account_financial_report_webkit/report_menus.xml +++ b/account_financial_report_webkit/report_menus.xml @@ -2,31 +2,35 @@ - - - - - - - + + diff --git a/account_financial_report_webkit/wizard/__init__.py b/account_financial_report_webkit/wizard/__init__.py index e261be6f..341da9a8 100644 --- a/account_financial_report_webkit/wizard/__init__.py +++ b/account_financial_report_webkit/wizard/__init__.py @@ -26,5 +26,6 @@ from . import partners_ledger_wizard from . import trial_balance_wizard from . import partner_balance_wizard from . import open_invoices_wizard +from . import aged_open_invoices_wizard from . import print_journal from . import aged_partner_balance_wizard diff --git a/account_financial_report_webkit/wizard/aged_open_invoices_wizard.py b/account_financial_report_webkit/wizard/aged_open_invoices_wizard.py new file mode 100644 index 00000000..c1297b43 --- /dev/null +++ b/account_financial_report_webkit/wizard/aged_open_invoices_wizard.py @@ -0,0 +1,58 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Author: Alexis de Lattre +# Copyright 2015 Akretion (www.akretion.com) +# Copyright 2014 Camptocamp SA +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from openerp.osv import orm + + +class AgedOpenInvoice(orm.TransientModel): + """Will launch age partner balance report. + This report is based on Open Invoice Report + and share a lot of knowledge with him + """ + + _inherit = "open.invoices.webkit" + _name = "aged.open.invoices.webkit" + _description = "Aged open invoices" + + def onchange_fiscalyear(self, cr, uid, ids, fiscalyear=False, + period_id=False, date_to=False, until_date=False, + context=None): + res = super(AgedOpenInvoice, self).onchange_fiscalyear( + cr, uid, ids, fiscalyear=fiscalyear, period_id=period_id, + date_to=date_to, until_date=until_date, context=context + ) + filters = self.onchange_filter(cr, uid, ids, filter='filter_period', + fiscalyear_id=fiscalyear, + context=context) + print "filters=", filters + res['value'].update({ + 'period_from': filters['value']['period_from'], + 'period_to': filters['value']['period_to'], + }) + return res + + def _print_report(self, cr, uid, ids, data, context=None): + # we update form with display account value + data = self.pre_print_report(cr, uid, ids, data, context=context) + return {'type': 'ir.actions.report.xml', + 'report_name': 'account.account_aged_open_invoices_webkit', + 'datas': data} diff --git a/account_financial_report_webkit/wizard/aged_open_invoices_wizard.xml b/account_financial_report_webkit/wizard/aged_open_invoices_wizard.xml new file mode 100644 index 00000000..1d8217aa --- /dev/null +++ b/account_financial_report_webkit/wizard/aged_open_invoices_wizard.xml @@ -0,0 +1,72 @@ + + + + + + Aged Open Invoice Report + aged.open.invoices.webkit + + + + + + + + + 4 + + + + + + + + + + + + + + + + + + Time Filters + + + True + + + onchange_fiscalyear(fiscalyear_id, period_to, date_to, until_date) + + + onchange_date_to(fiscalyear_id, period_to, date_to, until_date) + + + onchange_period_to(fiscalyear_id, period_to, date_to, until_date) + + + [('fiscalyear_id', '=', fiscalyear_id), ('special', '=', False)] + + + [('fiscalyear_id', '=', fiscalyear_id), ('special', '=', False)] + + + + + + + Aged Open Invoice + ir.actions.act_window + aged.open.invoices.webkit + form + form + + new + + + From 8ffc548a0d995f3f3a58403cadc4b97d8ff055b7 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Fri, 10 Jul 2015 19:58:51 +0200 Subject: [PATCH 2/4] Filter by date by default, to have an aged open invoices report as of today --- account_financial_report_webkit/report/aged_open_invoices.py | 1 - .../wizard/aged_open_invoices_wizard.py | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/account_financial_report_webkit/report/aged_open_invoices.py b/account_financial_report_webkit/report/aged_open_invoices.py index 049903fd..47fc5081 100644 --- a/account_financial_report_webkit/report/aged_open_invoices.py +++ b/account_financial_report_webkit/report/aged_open_invoices.py @@ -155,7 +155,6 @@ class AccountAgedOpenInvoicesWebkit(PartnersOpenInvoicesWebkit): aged_dict[classif] = 0.0 for acc in self.objects: - #print "acc.code=", acc.code aged_open_inv[acc.id] = aged_dict.copy() aged_open_inv[acc.id]['balance'] = 0.0 diff --git a/account_financial_report_webkit/wizard/aged_open_invoices_wizard.py b/account_financial_report_webkit/wizard/aged_open_invoices_wizard.py index c1297b43..3eb9f2fc 100644 --- a/account_financial_report_webkit/wizard/aged_open_invoices_wizard.py +++ b/account_financial_report_webkit/wizard/aged_open_invoices_wizard.py @@ -33,6 +33,10 @@ class AgedOpenInvoice(orm.TransientModel): _name = "aged.open.invoices.webkit" _description = "Aged open invoices" + _defaults = { + 'filter': 'filter_date', + } + def onchange_fiscalyear(self, cr, uid, ids, fiscalyear=False, period_id=False, date_to=False, until_date=False, context=None): @@ -43,7 +47,6 @@ class AgedOpenInvoice(orm.TransientModel): filters = self.onchange_filter(cr, uid, ids, filter='filter_period', fiscalyear_id=fiscalyear, context=context) - print "filters=", filters res['value'].update({ 'period_from': filters['value']['period_from'], 'period_to': filters['value']['period_to'], From b8afe8d7885bc72cbe73ccebbfa7302c431e77e9 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Mon, 27 Jul 2015 23:00:55 +0200 Subject: [PATCH 3/4] Fix string in label --- .../wizard/aged_open_invoices_wizard.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_financial_report_webkit/wizard/aged_open_invoices_wizard.xml b/account_financial_report_webkit/wizard/aged_open_invoices_wizard.xml index 1d8217aa..7f9b2f16 100644 --- a/account_financial_report_webkit/wizard/aged_open_invoices_wizard.xml +++ b/account_financial_report_webkit/wizard/aged_open_invoices_wizard.xml @@ -13,7 +13,7 @@