diff options
| author | Antoine Huvelle <ahu@odoo.com> | 2014-12-01 14:43:04 +0100 |
|---|---|---|
| committer | Martin Trigaux <mat@odoo.com> | 2014-12-01 17:43:59 +0100 |
| commit | d7a47d0d1fb181183f3c5c72eb97a51d2a936c4b (patch) | |
| tree | 152619e6264e5e309ebca408c8a1b4ef6619ef47 /addons/analytic_user_function | |
| parent | b3060f277101dc4d47d84a83693e2a5c73fbe44f (diff) | |
[FIX] analytic_user_function: inherit conflict on account type
The field account_id was inherited with position="replace" meaning we erased
future changes made into hr_timesheet_sheet (41f2eba missed "type in []" and
65f31b9 missed use_timesheets).
Replace by position="attributes" to only change what matters: the on_change.
Fixes #3974
Diffstat (limited to 'addons/analytic_user_function')
| -rw-r--r-- | addons/analytic_user_function/analytic_user_function_view.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml index 51e020b3f81..051f15fd7f3 100644 --- a/addons/analytic_user_function/analytic_user_function_view.xml +++ b/addons/analytic_user_function/analytic_user_function_view.xml @@ -65,8 +65,8 @@ <field name="priority" eval="18"/> <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/> <field name="arch" type="xml"> - <xpath expr="//field[@name='timesheet_ids']/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)" context="{'default_use_timesheets': 1}"/> + <xpath expr="//field[@name='timesheet_ids']/tree/field[@name='account_id']" position="attributes"> + <attribute name="on_change">on_change_account_id(account_id, user_id, unit_amount)</attribute> </xpath> </field> </record> |