diff options
Diffstat (limited to 'addons/account_analytic_analysis/account_analytic_analysis.py')
| -rw-r--r-- | addons/account_analytic_analysis/account_analytic_analysis.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 9550f77bcab..3b5819968a3 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -24,7 +24,6 @@ import logging import time from openerp.osv import osv, fields -from openerp.osv.orm import intersect, except_orm import openerp.tools from openerp.tools.translate import _ @@ -518,7 +517,7 @@ class account_analytic_account(osv.osv): 'invoiced_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all", string="Total Invoiced"), 'remaining_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all", string="Total Remaining", help="Expectation of remaining income for this contract. Computed as the sum of remaining subtotals which, in turn, are computed as the maximum between '(Estimation - Invoiced)' and 'To Invoice' amounts"), 'toinvoice_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all", string="Total to Invoice", help=" Sum of everything that could be invoiced for this contract."), - 'recurring_invoice_line_ids': fields.one2many('account.analytic.invoice.line', 'analytic_account_id', 'Invoice Lines'), + 'recurring_invoice_line_ids': fields.one2many('account.analytic.invoice.line', 'analytic_account_id', 'Invoice Lines', copy=True), 'recurring_invoices' : fields.boolean('Generate recurring invoices automatically'), 'recurring_rule_type': fields.selection([ ('daily', 'Day(s)'), @@ -595,8 +594,7 @@ class account_analytic_account(osv.osv): return value def cron_account_analytic_account(self, cr, uid, context=None): - if context is None: - context = {} + context = dict(context or {}) remind = {} def fill_remind(key, domain, write_pending=False): @@ -612,7 +610,7 @@ class account_analytic_account(osv.osv): accounts = self.browse(cr, uid, accounts_ids, context=context) for account in accounts: if write_pending: - account.write({'state' : 'pending'}, context=context) + account.write({'state' : 'pending'}) remind_user = remind.setdefault(account.manager_id.id, {}) remind_type = remind_user.setdefault(key, {}) remind_partner = remind_type.setdefault(account.partner_id, []).append(account) |