diff options
| author | Cedric Snauwaert <csn@openerp.com> | 2012-11-19 16:45:51 +0100 |
|---|---|---|
| committer | Cedric Snauwaert <csn@openerp.com> | 2012-11-19 16:45:51 +0100 |
| commit | 7e193e691cba10cb0f297de47bfd53ef27665768 (patch) | |
| tree | 0dc14e23a09aaa6921cc4aa03aa0aee33249d2ed /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 2ebf9e89fad0729b85bb8844e575ad2149bd9a1b (diff) | |
| parent | d9d127403b71d3fd401d3baf37b522b20ba89278 (diff) | |
[MERGE]merge with latest addons
bzr revid: csn@openerp.com-20121119154551-y8uizex6hu7fu1eo
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> |