diff options
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
| -rw-r--r-- | addons/analytic_user_function/analytic_user_function_view.xml | 41 |
1 files changed, 11 insertions, 30 deletions
diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml index 490b3026d7f..6fa141f480d 100644 --- a/addons/analytic_user_function/analytic_user_function_view.xml +++ b/addons/analytic_user_function/analytic_user_function_view.xml @@ -7,11 +7,9 @@ <field name="name">analytic_user_funct_grid.tree</field> <field name="model">analytic.user.funct.grid</field> <field name="arch" type="xml"> - <tree string="Invoicing Data" editable="bottom"> - <field name="user_id" on_change="onchange_user_product_id(user_id, product_id)"/> - <field name="product_id" on_change="onchange_user_product_id(user_id, product_id)" domain="[('type','=','service')]"/> - <field name="price"/> - <field name="uom_id"/> + <tree string="User's Product for this Analytic Account" editable="bottom"> + <field name="user_id" required="1"/> + <field name="product_id" required="1" /> </tree> </field> </record> @@ -20,13 +18,9 @@ <field name="name">analytic_user_funct_grid.form</field> <field name="model">analytic.user.funct.grid</field> <field name="arch" type="xml"> - <form string="Invoicing Data"> - <group> - <field name="user_id" on_change="onchange_user_product_id(user_id, product_id)"/> - <field name="product_id" domain="[('type','=','service')]" on_change="onchange_user_product_id(user_id, product_id)"/> - <field name="price"/> - <field name="uom_id"/> - </group> + <form string="User's Product for this Analytic Account"> + <field name="user_id" required="1"/> + <field name="product_id" required="1"/> </form> </field> </record> @@ -35,26 +29,13 @@ <record model="ir.ui.view" id="view_account_analytic_account_form_inherit"> <field name="name">account.analytic.account.form</field> <field name="model">account.analytic.account</field> - <field eval="60" name="priority"/> <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/> <field name="arch" type="xml"> - <separator name="description" position="before"> - <div name="user_function_price" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"> - <separator string="Invoice Price Rate per User"/> - <p class="oe_grey oe_edit_only"> - Define a specific service (e.g. Senior Consultant) - and price for some users to use these data instead - of the default values when invoicing the customer. - </p> - <p class="oe_grey oe_edit_only"> - OpenERP will recursively search on parent accounts - to check if specific conditions are defined for a - specific user. This allows to set invoicing - conditions for a group of contracts. - </p> - <field name="user_product_ids"/> - </div> - </separator> + <xpath expr="//notebook/page" position="after"> + <page string="Users/Products Rel."> + <field name="user_product_ids" colspan="4" nolabel="1"/> + </page> + </xpath> </field> </record> |