diff options
| author | Xavier Morel <xmo@openerp.com> | 2014-05-14 15:13:04 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2014-05-14 15:13:04 +0200 |
| commit | f4d78ae738e474abd4e77dc8fc6cdf8a668a5d72 (patch) | |
| tree | a02d0dedc047ff296517530b50a33556e5d4f6c7 /addons/account_analytic_analysis | |
| parent | 9d9cfd585f56bf64126e7316ea60ea5131a02059 (diff) | |
| parent | 4f5cc00420c6af5430ac921e89f217dcedaa1b8f (diff) | |
Merge branch 'server-trunk'
Conflicts:
addons/mass_mailing/controllers/main.py
Diffstat (limited to 'addons/account_analytic_analysis')
| -rw-r--r-- | addons/account_analytic_analysis/account_analytic_analysis.py | 9 | ||||
| -rw-r--r-- | addons/account_analytic_analysis/account_analytic_analysis_view.xml | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 785d7cd6db0..6c71f940e8a 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -542,17 +542,18 @@ class account_analytic_account(osv.osv): 'nodestroy': True, } - def on_change_template(self, cr, uid, ids, template_id, date_start=False, context=None): + def on_change_template(self, cr, uid, ids, template_id, date_start=False, fix_price_invoices=False, invoice_on_timesheets=False, recurring_invoices=False, context=None): if not template_id: return {} + obj_analytic_line = self.pool.get('account.analytic.invoice.line') res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, date_start=date_start, context=context) template = self.browse(cr, uid, template_id, context=context) - if not ids: + if not fix_price_invoices: res['value']['fix_price_invoices'] = template.fix_price_invoices res['value']['amount_max'] = template.amount_max - if not ids: + if not invoice_on_timesheets: res['value']['invoice_on_timesheets'] = template.invoice_on_timesheets res['value']['hours_qtt_est'] = template.hours_qtt_est @@ -560,7 +561,7 @@ class account_analytic_account(osv.osv): res['value']['to_invoice'] = template.to_invoice.id if template.pricelist_id.id: res['value']['pricelist_id'] = template.pricelist_id.id - if not ids: + if not recurring_invoices: invoice_line_ids = [] for x in template.recurring_invoice_line_ids: invoice_line_ids.append((0, 0, { diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml index a6fe828926a..97fb15e9290 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml @@ -38,6 +38,9 @@ <field name="partner_id" position="attributes"> <attribute name="attrs">{'required': [('type','=','contract'),'|','|',('fix_price_invoices','=',True), ('invoice_on_timesheets', '=', True), ('recurring_invoices', '=', True)]}</attribute> </field> + <field name="template_id" position="attributes"> + <attribute name="on_change">on_change_template(template_id, date_start, fix_price_invoices, invoice_on_timesheets, recurring_invoices)</attribute> + </field> <xpath expr='//group[@name="invoice_on_timesheets"]' position="replace"> </xpath> <xpath expr='//separator[@name="description"]' position='before'> |