diff options
| author | Amit Patel (OpenERP) <apa@tinyerp.com> | 2012-06-12 12:05:39 +0530 |
|---|---|---|
| committer | Amit Patel (OpenERP) <apa@tinyerp.com> | 2012-06-12 12:05:39 +0530 |
| commit | deec2bda0da0a28d86d08b0d0a5a999b353882a2 (patch) | |
| tree | 005d3488ab79c3f5663bcfd27d50befa3bfd74fb /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | a3ebc147841f78d03d5616f3c7da10c01725bc04 (diff) | |
| parent | b8716390702b098c395fd452b9152481157c8b6d (diff) | |
[MERGE]:resolved conflicts and merged with trunk
bzr revid: apa@tinyerp.com-20120612063539-japenzf86hh59541
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
| -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 ccc6be3252f..524f0310401 100644 --- a/addons/analytic_user_function/analytic_user_function_view.xml +++ b/addons/analytic_user_function/analytic_user_function_view.xml @@ -77,7 +77,7 @@ <field name="type">form</field> <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/> <field name="arch" type="xml"> - <xpath expr="/form/notebook/page[@string='Information']/group/field[@name='account_id']" position="replace"> + <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)" select="1"/> </xpath> </field> @@ -89,7 +89,7 @@ <field name="type">form</field> <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/> <field name="arch" type="xml"> - <xpath expr="/form/group/field[@name='user_id']" position="replace"> + <xpath expr="//field[@name='user_id']" position="replace"> <field name="user_id" select="1" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/> </xpath> </field> |