diff options
| author | Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com> | 2012-12-06 16:54:24 -0500 |
|---|---|---|
| committer | Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com> | 2012-12-06 16:54:24 -0500 |
| commit | 40e9d9b96a8d421b3bd744ede75f5001cf968f5b (patch) | |
| tree | 3c6a58dad2832fe78c5e34d587129e5c383da865 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 13dacd11c10dac853def763432829b8976604a7d (diff) | |
| parent | 88053a85a2543cd14c8f17e5bbcc3df684a2c4a5 (diff) | |
[MRG]
bzr revid: maxime.chambreuil@savoirfairelinux.com-20121206215424-j09flu3us034af80
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, 30 insertions, 11 deletions
diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml index 6fa141f480d..490b3026d7f 100644 --- a/addons/analytic_user_function/analytic_user_function_view.xml +++ b/addons/analytic_user_function/analytic_user_function_view.xml @@ -7,9 +7,11 @@ <field name="name">analytic_user_funct_grid.tree</field> <field name="model">analytic.user.funct.grid</field> <field name="arch" type="xml"> - <tree string="User's Product for this Analytic Account" editable="bottom"> - <field name="user_id" required="1"/> - <field name="product_id" required="1" /> + <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> </field> </record> @@ -18,9 +20,13 @@ <field name="name">analytic_user_funct_grid.form</field> <field name="model">analytic.user.funct.grid</field> <field name="arch" type="xml"> - <form string="User's Product for this Analytic Account"> - <field name="user_id" required="1"/> - <field name="product_id" required="1"/> + <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> </field> </record> @@ -29,13 +35,26 @@ <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"> - <xpath expr="//notebook/page" position="after"> - <page string="Users/Products Rel."> - <field name="user_product_ids" colspan="4" nolabel="1"/> - </page> - </xpath> + <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> </field> </record> |