diff options
| author | Frédéric van der Essen <fva@openerp.com> | 2012-07-10 16:24:47 +0200 |
|---|---|---|
| committer | Frédéric van der Essen <fva@openerp.com> | 2012-07-10 16:24:47 +0200 |
| commit | f8d32d3304341e17d10a63cd8fe2f36819104943 (patch) | |
| tree | 01de11faa1a8f58f21903fdd57e6858f43d7001f /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | dd2384325b0460e9bc4779938aed5f21c70ef4df (diff) | |
| parent | cc98560cfdab6308ed5db87b266cdbb6b9ff4f74 (diff) | |
[MERGE] point_of_sale
bzr revid: fva@openerp.com-20120710142447-s0z5ca89bofh0n2c
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
| -rw-r--r-- | addons/analytic_user_function/analytic_user_function_view.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml index 0582655374f..9c6e89d1bda 100644 --- a/addons/analytic_user_function/analytic_user_function_view.xml +++ b/addons/analytic_user_function/analytic_user_function_view.xml @@ -32,7 +32,7 @@ <field name="name">account.analytic.account.form</field> <field name="model">account.analytic.account</field> <field name="type">form</field> - <field name="inherit_id" ref="account.view_account_analytic_account_form"/> + <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/> <field name="arch" type="xml"> <xpath expr="//notebook/page" position="after"> <page string="Users/Products Rel."> @@ -77,8 +77,8 @@ <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"> - <field name="account_id" domain="[('type','=','normal'),('state', '<>', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" select="1"/> + <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> </field> </record> @@ -89,8 +89,8 @@ <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"> - <field name="user_id" select="1" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/> + <xpath expr="//field[@name='user_id']" position="replace"> + <field name="user_id" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/> </xpath> </field> </record> @@ -102,7 +102,7 @@ <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)" select="1"/> + <field name="account_id" domain="[('type','=','normal'),('state', '<>', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" /> </xpath> </field> </record> @@ -114,7 +114,7 @@ <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/> <field name="arch" type="xml"> <xpath expr="/tree/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)"/> + <field name="user_id" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/> </xpath> </field> </record> |