From 0960f9b10580faaea9bb3f84f41153aac5b5a7b3 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Apr 2012 12:13:50 +0530
Subject: [FIX] analytic_user_function: improved code

bzr revid: tpa@tinyerp.com-20120427064350-2uulr9e0b0jhekte
---
 addons/analytic_user_function/analytic_user_function_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/analytic_user_function/analytic_user_function_view.xml')

diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index 763b3115814..a3995d33808 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -50,7 +50,7 @@
             <field name="priority" eval="18"/>
             <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
+                <xpath expr="/form/sheet/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
                     <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)"/>
                 </xpath>
             </field>
@@ -64,7 +64,7 @@
             <field name="priority" eval="19"/>
             <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='timesheet_ids']/form/field[@name='account_id']" position="replace">
+                <xpath expr="/form/sheet/notebook/page/field[@name='timesheet_ids']/form/field[@name='account_id']" position="replace">
                     <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)"/>
                 </xpath>
             </field>
-- 
cgit v1.2.3


From 250cafb5d0a9b2b4bb5af8ff452fa91bc40c0de7 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 30 Apr 2012 17:15:24 +0530
Subject: [IMP]analytic_user_function: improve xpath and button order

bzr revid: mma@tinyerp.com-20120430114524-221jqy196nwwf0fw
---
 addons/analytic_user_function/analytic_user_function_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/analytic_user_function/analytic_user_function_view.xml')

diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index a3995d33808..791e9deddf5 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -34,7 +34,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page" position="after">
+                <xpath expr="/form/sheet/notebook/page" position="after">
                     <page string="Users/Products Rel.">
                         <field name="user_product_ids" colspan="4" nolabel="1"/>
                     </page>
-- 
cgit v1.2.3


From 81fd7b194641d002a80bbec409a001a511958000 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 28 May 2012 16:13:10 +0530
Subject: [IMP/ADD]create analytic view in analytic and made changes as per
 needed and improve code and made onchange for partner

bzr revid: sgo@tinyerp.com-20120528104310-oquklh2l63fq3muk
---
 addons/analytic_user_function/analytic_user_function_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/analytic_user_function/analytic_user_function_view.xml')

diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index 0582655374f..ccc6be3252f 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.">
-- 
cgit v1.2.3


From 4cf3671e6019d96744b4fd5ae43401a5dd45d71e Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 8 Jun 2012 18:45:16 +0530
Subject: [IMP]set xpath correctly

bzr revid: sgo@tinyerp.com-20120608131516-ae25wf3bd6l4vinb
---
 addons/analytic_user_function/analytic_user_function_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/analytic_user_function/analytic_user_function_view.xml')

diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index 0582655374f..d14ed977776 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -77,7 +77,7 @@
             <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">
+                <xpath expr="//field[@name='account_id']" position="replace">
                     <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" select="1"/>
                 </xpath>
             </field>
@@ -89,7 +89,7 @@
             <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">
+                <xpath expr="//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>
             </field>
-- 
cgit v1.2.3


From 7ed6f5052db5e76d3e5bbf49f086121ee40b82f2 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 28 Jun 2012 11:47:36 +0530
Subject: [IMP]remove all select=1 and select=2

bzr revid: sgo@tinyerp.com-20120628061736-ujwe0swulvrcrkjt
---
 addons/analytic_user_function/analytic_user_function_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/analytic_user_function/analytic_user_function_view.xml')

diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index 524f0310401..9c6e89d1bda 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -78,7 +78,7 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='account_id']" position="replace">
-                    <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" select="1"/>
+                    <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" />
                 </xpath>
             </field>
         </record>
@@ -90,7 +90,7 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//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>
@@ -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', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" select="1"/>
+                    <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', '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>
-- 
cgit v1.2.3


From 3bf9557952d7125b9d34f44293e4444b0b1eb8a9 Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Wed, 8 Aug 2012 17:12:35 +0530
Subject: [IMP]Remove type field from the views

bzr revid: tch@tinyerp.com-20120808114235-ljj72at9o7lny4jh
---
 addons/analytic_user_function/analytic_user_function_view.xml | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'addons/analytic_user_function/analytic_user_function_view.xml')

diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index 9c6e89d1bda..6fa141f480d 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -6,7 +6,6 @@
         <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"/>
@@ -18,7 +17,6 @@
         <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"/>
@@ -31,7 +29,6 @@
         <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 name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook/page" position="after">
@@ -46,7 +43,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 +56,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 +69,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 +80,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 +91,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 +102,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">
-- 
cgit v1.2.3


From 67a66d0ca47ec4a39c80182a192ea4c57ca704a0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 28 Oct 2012 11:33:28 +0100
Subject: [IMP] Useability: contracts

bzr revid: fp@openerp.com-20121028103328-qjqeznq9a95mcdpe
---
 .../analytic_user_function_view.xml                | 41 ++++++++++++++++------
 1 file changed, 30 insertions(+), 11 deletions(-)

(limited to 'addons/analytic_user_function/analytic_user_function_view.xml')

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>
 
-- 
cgit v1.2.3