[MRG] Merged with lp:openobject-addons rev. 8141

bzr revid: stefan@therp.nl-20121127114532-otfs7npzvow1wacs

1 files changed, 30 insertions, 20 deletions

diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index 9c6e89d1bda..490b3026d7f 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -6,11 +6,12 @@
         <record model="ir.ui.view" id="analytic_user_funct_grid_tree">
             <field name="name">analytic_user_funct_grid.tree</field>
             <field name="model">analytic.user.funct.grid</field>
-            <field name="type">tree</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,11 +19,14 @@
         <record model="ir.ui.view" id="analytic_user_funct_grid_form">
             <field name="name">analytic_user_funct_grid.form</field>
             <field name="model">analytic.user.funct.grid</field>
-            <field name="type">form</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>
@@ -31,14 +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 name="type">form</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>
 
@@ -46,7 +62,6 @@
         <record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit">
             <field name="name">hr.timesheet.sheet.form.tree</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
-            <field name="type">form</field>
             <field name="priority" eval="18"/>
             <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
             <field name="arch" type="xml">
@@ -60,7 +75,6 @@
         <record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit1">
             <field name="name">hr.timesheet.sheet.form.form</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
-            <field name="type">form</field>
             <field name="priority" eval="19"/>
             <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
             <field name="arch" type="xml">
@@ -74,7 +88,6 @@
         <record model="ir.ui.view" id="hr_timesheet_line_form_inherit">
             <field name="name">hr.analytic.timesheet.form</field>
             <field name="model">hr.analytic.timesheet</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='account_id']" position="replace">
@@ -86,7 +99,6 @@
         <record model="ir.ui.view" id="hr_timesheet_line_form_inherit_2">
             <field name="name">hr.analytic.timesheet.form</field>
             <field name="model">hr.analytic.timesheet</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='user_id']" position="replace">
@@ -98,7 +110,6 @@
         <record model="ir.ui.view" id="hr_timesheet_line_tree_inherit">
             <field name="name">hr.analytic.timesheet.tree</field>
             <field name="model">hr.analytic.timesheet</field>
-            <field name="type">tree</field>
             <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">
@@ -110,7 +121,6 @@
         <record model="ir.ui.view" id="hr_timesheet_line_tree_inherit_2">
             <field name="name">hr.analytic.timesheet.tree</field>
             <field name="model">hr.analytic.timesheet</field>
-            <field name="type">tree</field>
             <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">