diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-02-19 17:32:31 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-02-19 17:32:31 +0100 |
| commit | 61483e1a25499664df671dbc1738402407c286aa (patch) | |
| tree | ff72e320c4ebdb7104a0f2e9cea3e3977d0575e8 /addons/analytic_user_function | |
| parent | 71f41f7c35541af6cd4c5d955413cd056092e61c (diff) | |
| parent | 9333c622e967207dd6fc9ee23513af9769fc9ee1 (diff) | |
[MERGE] forward port of branch 8.0 up to 9333c62
Diffstat (limited to 'addons/analytic_user_function')
| -rw-r--r-- | addons/analytic_user_function/analytic_user_function_view.xml | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml index 67d8672f44b..132f44ebef5 100644 --- a/addons/analytic_user_function/analytic_user_function_view.xml +++ b/addons/analytic_user_function/analytic_user_function_view.xml @@ -78,8 +78,10 @@ <field name="priority" eval="19"/> <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/> <field name="arch" type="xml"> - <xpath expr="//field[@name='timesheet_ids']/form/field[@name='account_id']" position="replace"> - <field name="account_id" domain="[('type','=','normal'),('state', '<>', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" context="{'default_invoice_on_timesheets': 1}"/> + <xpath expr="//field[@name='timesheet_ids']/form/field[@name='account_id']" position="attributes"> + <attribute name="domain">[('type','=','normal'),('state', '<>', 'close')]</attribute> + <attribute name="on_change">on_change_account_id(account_id, user_id, unit_amount)</attribute> + <attribute name="context">{'default_invoice_on_timesheets': 1}</attribute> </xpath> </field> </record> @@ -90,8 +92,9 @@ <field name="model">hr.analytic.timesheet</field> <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/> <field name="arch" type="xml"> - <xpath expr="//field[@name='account_id']" position="replace"> - <field name="account_id" domain="[('type','=','normal'),('state', '<>', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" /> + <xpath expr="//field[@name='account_id']" position="attributes"> + <attribute name="domain">[('type','=','normal'),('state', '<>', 'close')]</attribute> + <attribute name="on_change">on_change_account_id(account_id, user_id, unit_amount)</attribute> </xpath> </field> </record> @@ -112,8 +115,9 @@ <field name="model">hr.analytic.timesheet</field> <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/> <field name="arch" type="xml"> - <xpath expr="/tree/field[@name='account_id']" position="replace"> - <field name="account_id" domain="[('type','=','normal'),('state', '<>', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" /> + <xpath expr="/tree/field[@name='account_id']" position="attributes"> + <attribute name="domain">[('type','=','normal'),('state', '<>', 'close')]</attribute> + <attribute name="on_change">on_change_account_id(account_id, user_id, unit_amount)</attribute> </xpath> </field> </record> |