From 22dce019498e609a3c85680a7b1356215c001797 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 28 May 2012 14:49:10 +0530
Subject: [IMP]add sequence file and sequence for analytic account and changes
 in form view extend type field and made changes in project of account for
 view an hr_timsheet_invoice and made on change for partner and template ids

bzr revid: sgo@tinyerp.com-20120528091910-jw8804dxj4hlbjaa
---
 .../account_analytic_analysis_view.xml                    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index b6803558b62..c61efb23819 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -36,6 +36,9 @@
             <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
+            	<xpath expr='//field[@name="parent_id"]' position='after'>
+            	    <field name="template_id" on_change="on_change_template(template_id)"  domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
+            	</xpath>
                 <notebook position="inside">
                     <page string="Invoice Analysis">
                         <separator colspan="4" string="Work Done Stats"/>
@@ -110,6 +113,18 @@
                 </field>
             </field>
         </record>
+        
+        <record id="template_of_contract_action" model="ir.actions.act_window">
+            <field name="name">Template Of contract</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('type','=','template')]</field>
+            <field name="context">{'search_default_type':'template','default_type' : 'template'}</field>
+        </record>
+        <menuitem action="template_of_contract_action" id="menu_template_of_contract_action" parent="base.menu_base_config" />
+
 
     </data>
 </openerp>
-- 
cgit v1.2.3


From 0280c0837fe98842cd64539d0134abc8980f4c99 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 28 May 2012 15:39:02 +0530
Subject: [IMP]:typo

bzr revid: apa@tinyerp.com-20120528100902-tc0oe79p9raxtnsf
---
 addons/account_analytic_analysis/account_analytic_analysis_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index c61efb23819..c6addd98619 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -115,7 +115,7 @@
         </record>
         
         <record id="template_of_contract_action" model="ir.actions.act_window">
-            <field name="name">Template Of contract</field>
+            <field name="name">Template Of Contract</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
@@ -124,7 +124,5 @@
             <field name="context">{'search_default_type':'template','default_type' : 'template'}</field>
         </record>
         <menuitem action="template_of_contract_action" id="menu_template_of_contract_action" parent="base.menu_base_config" />
-
-
     </data>
 </openerp>
-- 
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/account_analytic_analysis/account_analytic_analysis_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index c61efb23819..6e7a7e60b7d 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -33,7 +33,7 @@
             <field name="name">account.analytic.account.invoice.form.inherit</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 eval="18" name="priority"/>
             <field name="arch" type="xml">
             	<xpath expr='//field[@name="parent_id"]' position='after'>
-- 
cgit v1.2.3


From 0e90703ad0d1727c7a4511e30f335c0a3667357c Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 28 May 2012 18:00:54 +0530
Subject: [IMP]add boolean of project,projec_longterm,and project issue and
 create related project

bzr revid: sgo@tinyerp.com-20120528123054-ntp1u33q1iavwtej
---
 .../account_analytic_analysis_view.xml             | 23 ++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 5c994130630..fcea1589f8d 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -7,7 +7,7 @@
 
         Remove information on Account data => because they move on analysis sheet
         create a page with invoicing informations
-        -->
+       
         <record id="account_analytic_account_invoice_stat_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.stat.form.inherit</field>
             <field name="model">account.analytic.account</field>
@@ -27,7 +27,7 @@
                         icon="gtk-go-forward"/>
                 </group>
             </field>
-        </record>
+        </record> -->
 
         <record id="hr_timesheet.account_analytic_account_form_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form.inherit</field>
@@ -39,7 +39,22 @@
             	<xpath expr='//field[@name="parent_id"]' position='after'>
             	    <field name="template_id" on_change="on_change_template(template_id)"  domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
             	</xpath>
-                <notebook position="inside">
+            	<xpath expr='//page[@name="contract_page"]' position='inside'>
+	            	<group colspan="4" class="oe_form_group_label_border"> 
+	                        <field name="pricelist_id" />
+	                        <field name="to_invoice" widget="selection" />
+			    	</group>
+                    <separator colspan="4" string="Terms and Condition"/>
+                    <group colspan="4" > 
+                        <field colspan="4" name="description" nolabel="1"/>
+                    </group>
+                </xpath>
+                <xpath expr='//group[@name="contract"]' position="after">
+                    <group col="6" colspan="3" class="oe_form_group_label_border">
+                        <field name="quantity_max"/><field name="company_uom_id" nolabel="1" readonly="True"/> <label string="/"/> <label string="Remaining"/> <field name="remaining_hours" nolabel="1"/>
+                    </group>
+                </xpath>
+                <!-- <notebook position="inside">
                     <page string="Invoice Analysis">
                         <separator colspan="4" string="Work Done Stats"/>
 
@@ -80,7 +95,7 @@
                             </tree>
                         </field>
                     </page>
-                </notebook>
+                </notebook> -->
 
             </field>
         </record>
-- 
cgit v1.2.3


From 5bb11f925b278c716831ce5620cf4f70af8b9f76 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 28 May 2012 18:53:13 +0530
Subject: [IMP]:improved view.

bzr revid: apa@tinyerp.com-20120528132313-yg16pxo8xfbzmgbe
---
 .../account_analytic_analysis_view.xml                         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index c4c32014176..9917d756885 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -40,14 +40,14 @@
             	    <field name="template_id" on_change="on_change_template(template_id)"  domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
             	</xpath>
             	<xpath expr='//page[@name="contract_page"]' position='inside'>
-	            	<group colspan="4" class="oe_form_group_label_border"> 
-	                        <field name="pricelist_id" />
-	                        <field name="to_invoice" widget="selection" />
-			    	</group>
+	            <group colspan="4" class="oe_form_group_label_border"> 
+	                <field name="pricelist_id" />
+	                <field name="to_invoice" widget="selection" />
+		    </group>
                 </xpath>
                 <xpath expr='//group[@name="contract"]' position="after">
                     <group col="6" colspan="3" class="oe_form_group_label_border">
-                        <field name="quantity_max"/><field name="company_uom_id" nolabel="1" readonly="True"/> <label string="/"/> <label string="Remaining"/> <field name="remaining_hours" nolabel="1"/>
+                        <field name="quantity_max"/><label string="/"/> <label string="Remaining"/> <field name="remaining_hours" nolabel="1"/>
                     </group>
                 </xpath>
                 <!-- <notebook position="inside">
-- 
cgit v1.2.3


From a39b8f3b70abfef1875000e0b3f42610c94ec1b6 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 28 May 2012 19:01:58 +0530
Subject: [IMP]boolean timesheet move to hr_timesheet from invoice and view
 improve

bzr revid: sgo@tinyerp.com-20120528133158-n7cp580jl8kpru9y
---
 addons/account_analytic_analysis/account_analytic_analysis_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index c4c32014176..e53b1b5881c 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -45,9 +45,9 @@
 	                        <field name="to_invoice" widget="selection" />
 			    	</group>
                 </xpath>
-                <xpath expr='//group[@name="contract"]' position="after">
+                <xpath expr='//group[@name="project"]' position="after">
                     <group col="6" colspan="3" class="oe_form_group_label_border">
-                        <field name="quantity_max"/><field name="company_uom_id" nolabel="1" readonly="True"/> <label string="/"/> <label string="Remaining"/> <field name="remaining_hours" nolabel="1"/>
+                        <field name="quantity_max"/><label string="/"/> <label string="Remaining"/> <field name="remaining_hours" nolabel="1"/>
                     </group>
                 </xpath>
                 <!-- <notebook position="inside">
-- 
cgit v1.2.3


From cc38db164db0b29866b401083b1d0a049c9003a3 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 29 May 2012 11:16:21 +0530
Subject: [IMP]:improved view for contract

bzr revid: apa@tinyerp.com-20120529054621-7eaa6o1meg8xwvk1
---
 addons/account_analytic_analysis/account_analytic_analysis_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 197f1d98294..0a84bffd4f8 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -39,7 +39,7 @@
             	<xpath expr='//field[@name="parent_id"]' position='after'>
             	    <field name="template_id" on_change="on_change_template(template_id)"  domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
             	</xpath>
-            	<xpath expr='//page[@name="contract_page"]' position='inside'>
+            	<xpath expr='//separator[@name="description"]' position='before'>
 	            <group colspan="4" class="oe_form_group_label_border"> 
 	                <field name="pricelist_id" />
 	                <field name="to_invoice" widget="selection" />
-- 
cgit v1.2.3


From d29971eb7eaa734f662938ae005135809a5c5645 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 29 May 2012 12:27:13 +0530
Subject: [IMP]create view for contract lines and add field which needed

bzr revid: sgo@tinyerp.com-20120529065713-bokhp0ng21muadvo
---
 .../account_analytic_analysis_view.xml             | 61 +++++++++++++++++++---
 1 file changed, 55 insertions(+), 6 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 197f1d98294..f0e6785cf6d 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -39,17 +39,66 @@
             	<xpath expr='//field[@name="parent_id"]' position='after'>
             	    <field name="template_id" on_change="on_change_template(template_id)"  domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
             	</xpath>
-            	<xpath expr='//page[@name="contract_page"]' position='inside'>
-	            <group colspan="4" class="oe_form_group_label_border"> 
-	                <field name="pricelist_id" />
-	                <field name="to_invoice" widget="selection" />
-		    </group>
-                </xpath>
                 <xpath expr='//group[@name="project"]' position="after">
                     <group col="6" colspan="3" class="oe_form_group_label_border">
                         <field name="quantity_max"/><label string="/"/> <label string="Remaining"/> <field name="remaining_hours" nolabel="1"/>
                     </group>
                 </xpath>
+                <xpath expr='//separator[@name="term"]' position='before'>
+                    <separator colspan="4" string="Invoicing" name="invoicing"/>
+                    <group colspan="4" name="contract_lines" class="oe_form_group_label_border">
+                        <table name="contract_data">
+                            <tr name="title" >
+                                <th ><div class="oe_field_label" ></div></th>
+                                <td><div></div></td>
+                                <th ><div class="oe_float_field_view" >Total Cost</div></th>
+                                <th ><div class="oe_field_view" >Invoiced</div></th>
+                                <th ><div class="oe_field_view" >Remaining</div></th>
+                                <th ><div class="oe_float_field_view" >Ready to Invoice</div></th>
+                            </tr>
+                            <tr>
+                                <th><div class="oe_field_label">Fix price Invoices</div></th>
+                                <td><div><field name="so_visible" nolabel="1"/></div></td>
+                                <td><div class="oe_float_field_view"><field name="fix_exp_max" nolabel="1" attrs="{'invisible': [('so_visible','=',0)]}"/></div></td>
+                                <td><div class="oe_field_view"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('so_visible','=',0)]}"/></div></td>
+                                <td><div class="oe_field_view"></div></td>
+                                <td><div class="oe_float_field_view"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('so_visible','=',0)]}"/></div></td>
+                                <td><button class="oe_title_button_right" name="%(sale.action_order_form)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('so_visible','=',0)]}"/></td>
+                                <td><button class="oe_title_button_left" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('so_visible','=',0)]}"/></td>
+			    			</tr>
+                            <tr>
+                               <th><div class="oe_field_label">Invoice on timesheet</div></th>
+                               <td><div><field name="timsheet_visible" nolabel="1"/></div></td>
+                               <td><div class="oe_float_field_view" ><field name="timesheet_max" nolabel="1" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></div></td>
+                               <td><div class="oe_field_view" ><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></div></td>
+                               <td><div class="oe_field_view" ></div></td>
+                               <td><div class="oe_float_field_view" ><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></div></td>
+                               <td><button class="oe_title_button_right" name="%(hr_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account)d" string="Timesheets" type="action" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></td>
+                               <td><button class="oe_title_button_left" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></td>
+                           </tr>
+                            <tr>
+                                <th><div class="oe_field_label" >Charge Expenses</div></th>
+                                <td><div><field name="expense_visible" nolabel="1"/></div></td>
+                                <td><div class="oe_float_field_view" ><field name="expense_max" nolabel="1" attrs="{'invisible': [('expense_visible','=',0)]}"/></div></td>
+                                <td><div class="oe_field_view" ></div></td>
+                                <td><div class="oe_field_view" ></div></td>
+                                <td><div class="oe_float_field_view"></div></td>
+                            </tr>
+                            <!-- <tr name="total">
+                                <th><div class="oe_field_label" >Total</div></th>
+                                <td><div></div></td>
+                                <td><div class="oe_totals" ><field name="total_max" nolabel="1" /><field name="currency_symbol" nolabel="1" readonly="True"/></div></td>
+                                <td><div class="oe_totals_view" ><field name="total_invoiced" nolabel="1" /><field name="currency_symbol" nolabel="1" readonly="True"/></div></td>
+                                <td><div class="oe_totals_view" ><field name="total_remaining" nolabel="1" /></div></td>
+                                <td><div class="oe_totals" ><field name="total_toinvoice" nolabel="1" ></field></div></td>
+                            </tr> -->
+                        </table>
+                    </group>
+	            <group colspan="4" class="oe_form_group_label_border"> 
+	                <field name="pricelist_id" />
+	                <field name="to_invoice" widget="selection" />
+		    	</group>
+                </xpath>
                 <!-- <notebook position="inside">
                     <page string="Invoice Analysis">
                         <separator colspan="4" string="Work Done Stats"/>
-- 
cgit v1.2.3


From 6993932c06dbec666100686ea1cbe7cfbfe942e9 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 29 May 2012 14:01:45 +0530
Subject: [IMP]add total line for lines total

bzr revid: sgo@tinyerp.com-20120529083145-2iw8liantsejqs0x
---
 .../account_analytic_analysis_view.xml                     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index b1baa35e431..239dd95dcb5 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -51,7 +51,7 @@
                             <tr name="title" >
                                 <th ><div class="oe_field_label" ></div></th>
                                 <td><div></div></td>
-                                <th ><div class="oe_float_field_view" >Total Cost</div></th>
+                                <th ><div class="oe_float_field_view" >Est. Total</div></th>
                                 <th ><div class="oe_field_view" >Invoiced</div></th>
                                 <th ><div class="oe_field_view" >Remaining</div></th>
                                 <th ><div class="oe_float_field_view" >Ready to Invoice</div></th>
@@ -84,14 +84,14 @@
                                 <td><div class="oe_field_view" ></div></td>
                                 <td><div class="oe_float_field_view"></div></td>
                             </tr>
-                            <!-- <tr name="total">
+                            <tr name="total">
                                 <th><div class="oe_field_label" >Total</div></th>
                                 <td><div></div></td>
-                                <td><div class="oe_totals" ><field name="total_max" nolabel="1" /><field name="currency_symbol" nolabel="1" readonly="True"/></div></td>
-                                <td><div class="oe_totals_view" ><field name="total_invoiced" nolabel="1" /><field name="currency_symbol" nolabel="1" readonly="True"/></div></td>
-                                <td><div class="oe_totals_view" ><field name="total_remaining" nolabel="1" /></div></td>
-                                <td><div class="oe_totals" ><field name="total_toinvoice" nolabel="1" ></field></div></td>
-                            </tr> -->
+                                <td><div class="oe_totals" ></div></td>
+                                <td><div class="oe_totals_view" ></div></td>
+                                <td><div class="oe_totals_view" ></div></td>
+                                <td><div class="oe_totals" ></div></td>
+                            </tr>
                         </table>
                     </group>
 	            	<group colspan="4" class="oe_form_group_label_border"> 
-- 
cgit v1.2.3


From 3bdb46d1132e68c9865a91fa6f23248adf51fb95 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 29 May 2012 16:09:49 +0530
Subject: [IMP]remaining added and view improvement

bzr revid: sgo@tinyerp.com-20120529103949-wm8ln19qzwjar9yn
---
 .../account_analytic_analysis_view.xml             | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 239dd95dcb5..a2bf0b83b9f 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -28,6 +28,12 @@
                 </group>
             </field>
         </record> -->
+        <act_window
+            id="action_sales_order_line"
+            name="Sales Order Lines"
+            res_model="sale.order.line"
+            src_model="account.analytic.account"
+            />
 
         <record id="hr_timesheet.account_analytic_account_form_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form.inherit</field>
@@ -59,31 +65,31 @@
                             <tr>
                                 <th><div class="oe_field_label">Fix price Invoices</div></th>
                                 <td><div><field name="so_visible" nolabel="1"/></div></td>
-                                <td><div class="oe_float_field_view"><field name="fix_exp_max" nolabel="1" attrs="{'invisible': [('so_visible','=',0)]}"/></div></td>
+                                <td><div class="oe_float_field_view"><field name="amount_max" nolabel="1" attrs="{'invisible': [('so_visible','=',0)]}"/></div></td>
                                 <td><div class="oe_field_view"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('so_visible','=',0)]}"/></div></td>
-                                <td><div class="oe_field_view"></div></td>
+                                <td><div class="oe_field_view"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('so_visible','=',0)]}"/></div></td>
                                 <td><div class="oe_float_field_view"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('so_visible','=',0)]}"/></div></td>
-                                <td><button class="oe_title_button_right" name="%(sale.action_order_form)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('so_visible','=',0)]}"/></td>
+                                <td><button class="oe_title_button_right" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('so_visible','=',0)]}"/></td>
                                 <td><button class="oe_title_button_left" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('so_visible','=',0)]}"/></td>
 			    			</tr>
                             <tr>
                                <th><div class="oe_field_label">Invoice on timesheet</div></th>
                                <td><div><field name="timsheet_visible" nolabel="1"/></div></td>
-                               <td><div class="oe_float_field_view" ><field name="timesheet_max" nolabel="1" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></div></td>
+                               <td><div class="oe_float_field_view" ><field name="quantity_max" nolabel="1" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></div></td>
                                <td><div class="oe_field_view" ><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></div></td>
-                               <td><div class="oe_field_view" ></div></td>
+                               <td><div class="oe_field_view" ><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></div></td>
                                <td><div class="oe_float_field_view" ><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></div></td>
-                               <td><button class="oe_title_button_right" name="%(hr_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account)d" string="Timesheets" type="action" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></td>
+                               <td><button class="oe_title_button_right" name="%(account.action_account_tree1)d" string="Timesheets" type="action" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></td>
                                <td><button class="oe_title_button_left" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></td>
                            </tr>
-                            <tr>
+                            <!-- <tr>
                                 <th><div class="oe_field_label" >Charge Expenses</div></th>
                                 <td><div><field name="expense_visible" nolabel="1"/></div></td>
                                 <td><div class="oe_float_field_view" ><field name="expense_max" nolabel="1" attrs="{'invisible': [('expense_visible','=',0)]}"/></div></td>
                                 <td><div class="oe_field_view" ></div></td>
                                 <td><div class="oe_field_view" ></div></td>
                                 <td><div class="oe_float_field_view"></div></td>
-                            </tr>
+                            </tr> -->
                             <tr name="total">
                                 <th><div class="oe_field_label" >Total</div></th>
                                 <td><div></div></td>
-- 
cgit v1.2.3


From cbb75342c05bd408c19531365640c48230144d01 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 29 May 2012 16:14:51 +0530
Subject: [IMP]:improved view and code.

bzr revid: apa@tinyerp.com-20120529104451-24axuiq8m5s43tcj
---
 .../account_analytic_analysis_view.xml             | 33 ++++++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 239dd95dcb5..ac048181be9 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -45,8 +45,35 @@
                     </group>
                 </xpath>
                 <xpath expr='//separator[@name="description"]' position='before'>
-                    <separator colspan="4" string="Invoicing" name="invoicing"/>
-                    <group colspan="4" name="contract_lines" class="oe_form_group_label_border">
+		    <separator colspan="4" string="Invoicing" name="invoicing"/>
+		    <group colspan="4">
+			<group col="2" colspan="1" class="oe_form_group_label_border">
+			    <label string=" "/><label string=" "/>
+			    <field name="fix_price_invoices"/>
+			    <field name="invoice_on_timesheets"/>
+			    <field name="charge_expenses"/>
+			</group>
+			<group col="2" colspan="1">
+			    <label string="Est.Tot"/>
+			    <label string="Invoiced"/>
+			    <field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>
+			</group>
+			<group col="2" colspan="1" class="oe_form_group_odd_border">
+			    <label string="Remaining"/>
+			    <label string="Ready To Invoice"/>
+			    <label string="TODO" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>
+			    <label string="TODO" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>
+			</group>
+			<group col="2" colspan="1">
+			    <label string=" "/><label string=" "/>
+			    <button name="%(sale.action_order_form)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>
+			    <button name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>
+			</group>
+		    </group>
+		    
+		    
+		    
+                    <!--<group colspan="4" name="contract_lines" class="oe_form_group_label_border">
                         <table name="contract_data">
                             <tr name="title" >
                                 <th ><div class="oe_field_label" ></div></th>
@@ -93,7 +120,7 @@
                                 <td><div class="oe_totals" ></div></td>
                             </tr>
                         </table>
-                    </group>
+                    </group>-->
 	            	<group colspan="4" class="oe_form_group_label_border"> 
 		                <field name="pricelist_id" />
 		                <field name="to_invoice" widget="selection" />
-- 
cgit v1.2.3


From 63708de91abea8cb389f6e5cb030a2f3a5f84bd5 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 17:01:22 +0530
Subject: [IMP]:improved analytic view

bzr revid: apa@tinyerp.com-20120530113122-jcngf2112sjq31nb
---
 .../account_analytic_analysis_view.xml             | 116 +++++++++++++++------
 1 file changed, 85 insertions(+), 31 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 065a0b4009b..c4c0491193a 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -58,38 +58,92 @@
                 </xpath>
                 <xpath expr='//separator[@name="description"]' position='before'>
 		    <separator colspan="4" string="Invoicing" name="invoicing"/>
-		    <group colspan="4">
-			<group col="2" colspan="1" class="oe_form_group_label_border">
-			    <label string=" "/><label string=" "/>
-			    <field name="fix_price_invoices"/>
-			    <field name="invoice_on_timesheets"/>
-			    <field name="charge_expenses"/>
-			</group>
-			<group col="2" colspan="1">
-			    <label string="Est.Tot"/>
-			    <label string="Invoiced"/>
-			    <field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>
-			    <field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>
-			    <field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-			    <field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-			</group>
-			<group col="2" colspan="1" class="oe_form_group_odd_border">
-			    <label string="Remaining"/>
-			    <label string="To Invoice"/>
-			    <field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>
-			    <field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>
-			    <field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-			    <field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-			</group>
-			<group col="2" colspan="1">
-			    <label string=" "/><label string=" "/>
-			    <button name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>
-			    <button name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>
-			    <button name="%(action_timesheet_lines_tree)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-                <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-
-			</group>
+		    <group col="1" colspan="4">
+			<table border="1">
+			    <tr>
+				<th height="20px"></th>
+				<th></th>
+				<th>Est.Tot</th>
+				<th>Invoiced</th>
+				<th>Remaining</th>
+				<th>Ready To Invoice</th>
+				<th></th>
+				<th></th>
+			    </tr>
+			    <tr>
+				<th>Fix Price Invoices</th>
+				<td><field name="fix_price_invoices" nolabel="1"/></td>
+				<td><field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td><button name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td><button name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+			    </tr>
+			    <tr>
+				<th>Invoice On Timesheets</th>
+				<td><field name="invoice_on_timesheets" nolabel="1"/></td>
+				<td><field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td><button name="%(action_timesheet_lines_tree)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td><button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+			    </tr>
+			    <tr>
+				<th>Charge Expenses</th>
+				<td><field name="charge_expenses" nolabel="1"/></td>
+				<td>todo</td>
+				<td>todo</td>
+				<td>todo</td>
+				<td>todo</td>
+				<td>todo</td>
+				<td>todo</td>
+			    </tr>
+			    <tr>
+				<th>Total</th>
+				<td></td>
+				<td>todo</td>
+				<td>todo</td>
+				<td>todo</td>
+				<td>todo</td>
+				<td></td>
+				<td></td>
+			    </tr>
+			</table>
 		    </group>
+<!--		    <group colspan="4">-->
+<!--			<group col="2" colspan="1" class="oe_form_group_label_border">-->
+<!--			    <label string=" "/><label string=" "/>-->
+<!--			    <field name="fix_price_invoices"/>-->
+<!--			    <field name="invoice_on_timesheets"/>-->
+<!--			    <field name="charge_expenses"/>-->
+<!--			</group>-->
+<!--			<group col="2" colspan="1">-->
+<!--			    <label string="Est.Tot"/>-->
+<!--			    <label string="Invoiced"/>-->
+<!--			    <field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>-->
+<!--			    <field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>-->
+<!--			    <field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>-->
+<!--			    <field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>-->
+<!--			</group>-->
+<!--			<group col="2" colspan="1" class="oe_form_group_odd_border">-->
+<!--			    <label string="Remaining"/>-->
+<!--			    <label string="To Invoice"/>-->
+<!--			    <field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>-->
+<!--			    <field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>-->
+<!--			    <field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>-->
+<!--			    <field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>-->
+<!--			</group>-->
+<!--			<group col="2" colspan="1">-->
+<!--			    <label string=" "/><label string=" "/>-->
+<!--			    <button name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>-->
+<!--			    <button name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>-->
+<!--			    <button name="%(action_timesheet_lines_tree)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>-->
+<!--                <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>-->
+<!---->
+<!--			</group>-->
+<!--		    </group>-->
 		    
 		    
 		    
-- 
cgit v1.2.3


From eddbed0f583d5d81ab61759d5e25af3c04181334 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 18:15:35 +0530
Subject: [IMP]:improved css for contract view

bzr revid: apa@tinyerp.com-20120530124535-d3it3v890juhjkof
---
 .../account_analytic_analysis_view.xml             | 78 +++++++++++-----------
 1 file changed, 40 insertions(+), 38 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index c4c0491193a..aa9df910d61 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -59,56 +59,58 @@
                 <xpath expr='//separator[@name="description"]' position='before'>
 		    <separator colspan="4" string="Invoicing" name="invoicing"/>
 		    <group col="1" colspan="4">
-			<table border="1">
+			<table border="0">
 			    <tr>
-				<th height="20px"></th>
-				<th></th>
-				<th>Est.Tot</th>
-				<th>Invoiced</th>
-				<th>Remaining</th>
-				<th>Ready To Invoice</th>
-				<th></th>
-				<th></th>
+				<th class="oe_th_150px" height="20px"></th>
+				<th width="10px"></th>
+				<th class="oe_th_110px">Est.Tot</th>
+				<th class="oe_th_110px">Invoiced</th>
+				<th class="oe_th_110px">Remaining</th>
+				<th class="oe_th_110px">Ready To Invoice</th>
+				<th width="10px"></th>
+				<th class="oe_th_150px"></th>
+				<th class="oe_th_150px"></th>
 			    </tr>
 			    <tr>
-				<th>Fix Price Invoices</th>
+				<th class="oe_border_right">Fix Price Invoices</th>
 				<td><field name="fix_price_invoices" nolabel="1"/></td>
-				<td><field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				<td><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				<td><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				<td><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				<td><button name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				<td><button name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td class="oe_amount_center oe_th_110px"><field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td class="oe_amount_center oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td class="oe_amount_center oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td width="10px"></td>
+				<td class="oe_th_150px"><button class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td class="oe_th_150px"><button class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
 			    </tr>
 			    <tr>
-				<th>Invoice On Timesheets</th>
+				<th class="oe_border_right">Invoice On Timesheets</th>
 				<td><field name="invoice_on_timesheets" nolabel="1"/></td>
-				<td><field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				<td><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				<td><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				<td><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				<td><button name="%(action_timesheet_lines_tree)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				<td><button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td class="oe_amount_center oe_th_110px"><field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td class="oe_amount_center oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td class="oe_amount_center oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td width="10px"></td>
+				<td class="oe_th_150px"><button class= "oe_btn_width" name="%(action_timesheet_lines_tree)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 			    </tr>
 			    <tr>
-				<th>Charge Expenses</th>
+				<th class="oe_border_right">Charge Expenses</th>
 				<td><field name="charge_expenses" nolabel="1"/></td>
-				<td>todo</td>
-				<td>todo</td>
-				<td>todo</td>
-				<td>todo</td>
-				<td>todo</td>
-				<td>todo</td>
+				<td class="oe_amount_center oe_th_110px">todo</td>
+				<td class="oe_amount_center oe_th_110px">todo</td>
+				<td class="oe_amount_center oe_th_110px oe_border_right">todo</td>
+				<td class="oe_amount_center oe_th_110px">todo</td>
+				<td width="10px"></td>
+				<td class="oe_th_150px">todo</td>
+				<td class="oe_th_150px">todo</td>
 			    </tr>
 			    <tr>
-				<th>Total</th>
-				<td></td>
-				<td>todo</td>
-				<td>todo</td>
-				<td>todo</td>
-				<td>todo</td>
-				<td></td>
-				<td></td>
+				<th class="oe_border_right">Total</th>
+				<td width="10px"></td>
+				<td class="oe_amount_center oe_th_110px oe_border_top">todo</td>
+				<td class="oe_amount_center oe_th_110px oe_border_top">todo</td>
+				<td class="oe_amount_center oe_th_110px oe_border_right oe_border_top">todo</td>
+				<td class="oe_amount_center oe_th_110px oe_border_top">todo</td>
 			    </tr>
 			</table>
 		    </group>
-- 
cgit v1.2.3


From 11bf57f1bf45f308ad76c35fd0f42560298a86f4 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 30 May 2012 18:26:41 +0530
Subject: [IMP]add expense line and add depend expense of hr in contract for
 calculation

bzr revid: sgo@tinyerp.com-20120530125641-w27mjp97b981yrpd
---
 .../account_analytic_analysis_view.xml             | 48 +++++++++++-----------
 1 file changed, 23 insertions(+), 25 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 065a0b4009b..139a2f5ef17 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -58,7 +58,7 @@
                 </xpath>
                 <xpath expr='//separator[@name="description"]' position='before'>
 		    <separator colspan="4" string="Invoicing" name="invoicing"/>
-		    <group colspan="4">
+		   <!--  <group colspan="4">
 			<group col="2" colspan="1" class="oe_form_group_label_border">
 			    <label string=" "/><label string=" "/>
 			    <field name="fix_price_invoices"/>
@@ -89,11 +89,9 @@
                 <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
 
 			</group>
-		    </group>
+		    </group> -->
 		    
-		    
-		    
-                    <!--<group colspan="4" name="contract_lines" class="oe_form_group_label_border">
+                    <group colspan="4" name="contract_lines" class="oe_form_group_label_border">
                         <table name="contract_data">
                             <tr name="title" >
                                 <th ><div class="oe_field_label" ></div></th>
@@ -105,31 +103,31 @@
                             </tr>
                             <tr>
                                 <th><div class="oe_field_label">Fix price Invoices</div></th>
-                                <td><div><field name="so_visible" nolabel="1"/></div></td>
-                                <td><div class="oe_float_field_view"><field name="amount_max" nolabel="1" attrs="{'invisible': [('so_visible','=',0)]}"/></div></td>
-                                <td><div class="oe_field_view"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('so_visible','=',0)]}"/></div></td>
-                                <td><div class="oe_field_view"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('so_visible','=',0)]}"/></div></td>
-                                <td><div class="oe_float_field_view"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('so_visible','=',0)]}"/></div></td>
-                                <td><button class="oe_title_button_right" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('so_visible','=',0)]}"/></td>
-                                <td><button class="oe_title_button_left" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('so_visible','=',0)]}"/></td>
+                                <td><div><field name="fix_price_invoices" nolabel="1"/></div></td>
+                                <td><div class="oe_float_field_view"><field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></div></td>
+                                <td><div class="oe_field_view"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></div></td>
+                                <td><div class="oe_field_view"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></div></td>
+                                <td><div class="oe_float_field_view"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></div></td>
+                                <td><button class="oe_title_button_right" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                                <td><button class="oe_title_button_left" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
 			    			</tr>
                             <tr>
                                <th><div class="oe_field_label">Invoice on timesheet</div></th>
-                               <td><div><field name="timsheet_visible" nolabel="1"/></div></td>
-                               <td><div class="oe_float_field_view" ><field name="quantity_max" nolabel="1" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></div></td>
-                               <td><div class="oe_field_view" ><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></div></td>
-                               <td><div class="oe_field_view" ><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></div></td>
-                               <td><div class="oe_float_field_view" ><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></div></td>
-                               <td><button class="oe_title_button_right" name="%(account.action_account_tree1)d" string="Timesheets" type="action" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></td>
-                               <td><button class="oe_title_button_left" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></td>
+                               <td><div><field name="invoice_on_timesheets" nolabel="1"/></div></td>
+                               <td><div class="oe_float_field_view" ><field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></div></td>
+                               <td><div class="oe_field_view" ><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></div></td>
+                               <td><div class="oe_field_view" ><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></div></td>
+                               <td><div class="oe_float_field_view" ><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></div></td>
+                               <td><button class="oe_title_button_right" name="%(account.action_account_tree1)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                               <td><button class="oe_title_button_left" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
                            </tr>
                            <tr>
                                 <th><div class="oe_field_label" >Charge Expenses</div></th>
-                                <td><div><field name="expense_visible" nolabel="1"/></div></td>
-                                <td><div class="oe_float_field_view" ><field name="expense_max" nolabel="1" attrs="{'invisible': [('expense_visible','=',0)]}"/></div></td>
-                                <td><div class="oe_field_view" ></div></td>
-                                <td><div class="oe_field_view" ></div></td>
-                                <td><div class="oe_float_field_view"></div></td>
+                                <td><div><field name="charge_expenses" nolabel="1"/></div></td>
+                                <td><div class="oe_float_field_view" ><field name="expense_max" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></div></td>
+                                <td><div class="oe_field_view" ><field name="expense_invoiced" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></div></td>
+                                <td><div class="oe_field_view" ><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></div></td>
+                                <td><div class="oe_float_field_view"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></div></td>
                             </tr> 
                             <tr name="total">
                                 <th><div class="oe_field_label" >Total</div></th>
@@ -140,7 +138,7 @@
                                 <td><div class="oe_totals" ></div></td>
                             </tr>
                         </table>
-                    </group>-->
+                    </group>
 	            	<group colspan="4" class="oe_form_group_label_border"> 
 		                <field name="pricelist_id" />
 		                <field name="to_invoice" widget="selection" />
-- 
cgit v1.2.3


From ee1b8f13429cf060569a483bf19dfbec8d933d24 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 19:04:36 +0530
Subject: [IMP]:renamed fieldslable

bzr revid: apa@tinyerp.com-20120530133436-wihrnh13wr12s4m8
---
 .../account_analytic_analysis/account_analytic_analysis_view.xml  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index aa9df910d61..7cad26844c3 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -197,10 +197,10 @@
                             </tr>
                         </table>
                     </group>-->
-	            	<group colspan="4" class="oe_form_group_label_border"> 
-		                <field name="pricelist_id" />
-		                <field name="to_invoice" widget="selection" />
-		    	</group>
+		    <group colspan="4" class="oe_form_group_label_border"> 
+			    <field name="pricelist_id" />
+			    <field name="to_invoice" widget="selection" />
+		    </group>
                 </xpath>
                 <!-- <notebook position="inside">
                     <page string="Invoice Analysis">
-- 
cgit v1.2.3


From 5bc6820c175d86141fb15eaebad13043bf766d70 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 31 May 2012 10:39:42 +0530
Subject: [IMP]:account_analytic_analysis:improved view for contract.

bzr revid: apa@tinyerp.com-20120531050942-e7y914pmzuq7qlwm
---
 .../account_analytic_analysis_view.xml             | 136 +--------------------
 1 file changed, 5 insertions(+), 131 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 7cad26844c3..c4d12f249af 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -61,7 +61,7 @@
 		    <group col="1" colspan="4">
 			<table border="0">
 			    <tr>
-				<th class="oe_th_150px" height="20px"></th>
+				<th class="oe_th_137px" height="20px"></th>
 				<th width="10px"></th>
 				<th class="oe_th_110px">Est.Tot</th>
 				<th class="oe_th_110px">Invoiced</th>
@@ -83,7 +83,7 @@
 				<td class="oe_th_150px"><button class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
 			    </tr>
 			    <tr>
-				<th class="oe_border_right">Invoice On Timesheets</th>
+				<th class="oe_border_right">Inv. On Timesheets</th>
 				<td><field name="invoice_on_timesheets" nolabel="1"/></td>
 				<td class="oe_amount_center oe_th_110px"><field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 				<td class="oe_amount_center oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
@@ -114,137 +114,11 @@
 			    </tr>
 			</table>
 		    </group>
-<!--		    <group colspan="4">-->
-<!--			<group col="2" colspan="1" class="oe_form_group_label_border">-->
-<!--			    <label string=" "/><label string=" "/>-->
-<!--			    <field name="fix_price_invoices"/>-->
-<!--			    <field name="invoice_on_timesheets"/>-->
-<!--			    <field name="charge_expenses"/>-->
-<!--			</group>-->
-<!--			<group col="2" colspan="1">-->
-<!--			    <label string="Est.Tot"/>-->
-<!--			    <label string="Invoiced"/>-->
-<!--			    <field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>-->
-<!--			    <field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>-->
-<!--			    <field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>-->
-<!--			    <field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>-->
-<!--			</group>-->
-<!--			<group col="2" colspan="1" class="oe_form_group_odd_border">-->
-<!--			    <label string="Remaining"/>-->
-<!--			    <label string="To Invoice"/>-->
-<!--			    <field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>-->
-<!--			    <field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>-->
-<!--			    <field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>-->
-<!--			    <field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>-->
-<!--			</group>-->
-<!--			<group col="2" colspan="1">-->
-<!--			    <label string=" "/><label string=" "/>-->
-<!--			    <button name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>-->
-<!--			    <button name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/>-->
-<!--			    <button name="%(action_timesheet_lines_tree)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>-->
-<!--                <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>-->
-<!---->
-<!--			</group>-->
-<!--		    </group>-->
-		    
-		    
-		    
-                    <!--<group colspan="4" name="contract_lines" class="oe_form_group_label_border">
-                        <table name="contract_data">
-                            <tr name="title" >
-                                <th ><div class="oe_field_label" ></div></th>
-                                <td><div></div></td>
-                                <th ><div class="oe_float_field_view" >Est. Total</div></th>
-                                <th ><div class="oe_field_view" >Invoiced</div></th>
-                                <th ><div class="oe_field_view" >Remaining</div></th>
-                                <th ><div class="oe_float_field_view" >Ready to Invoice</div></th>
-                            </tr>
-                            <tr>
-                                <th><div class="oe_field_label">Fix price Invoices</div></th>
-                                <td><div><field name="so_visible" nolabel="1"/></div></td>
-                                <td><div class="oe_float_field_view"><field name="amount_max" nolabel="1" attrs="{'invisible': [('so_visible','=',0)]}"/></div></td>
-                                <td><div class="oe_field_view"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('so_visible','=',0)]}"/></div></td>
-                                <td><div class="oe_field_view"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('so_visible','=',0)]}"/></div></td>
-                                <td><div class="oe_float_field_view"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('so_visible','=',0)]}"/></div></td>
-                                <td><button class="oe_title_button_right" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('so_visible','=',0)]}"/></td>
-                                <td><button class="oe_title_button_left" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('so_visible','=',0)]}"/></td>
-			    			</tr>
-                            <tr>
-                               <th><div class="oe_field_label">Invoice on timesheet</div></th>
-                               <td><div><field name="timsheet_visible" nolabel="1"/></div></td>
-                               <td><div class="oe_float_field_view" ><field name="quantity_max" nolabel="1" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></div></td>
-                               <td><div class="oe_field_view" ><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></div></td>
-                               <td><div class="oe_field_view" ><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></div></td>
-                               <td><div class="oe_float_field_view" ><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></div></td>
-                               <td><button class="oe_title_button_right" name="%(account.action_account_tree1)d" string="Timesheets" type="action" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></td>
-                               <td><button class="oe_title_button_left" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('timsheet_visible','=',0)]}"/></td>
-                           </tr>
-                           <tr>
-                                <th><div class="oe_field_label" >Charge Expenses</div></th>
-                                <td><div><field name="expense_visible" nolabel="1"/></div></td>
-                                <td><div class="oe_float_field_view" ><field name="expense_max" nolabel="1" attrs="{'invisible': [('expense_visible','=',0)]}"/></div></td>
-                                <td><div class="oe_field_view" ></div></td>
-                                <td><div class="oe_field_view" ></div></td>
-                                <td><div class="oe_float_field_view"></div></td>
-                            </tr> 
-                            <tr name="total">
-                                <th><div class="oe_field_label" >Total</div></th>
-                                <td><div></div></td>
-                                <td><div class="oe_totals" ></div></td>
-                                <td><div class="oe_totals_view" ></div></td>
-                                <td><div class="oe_totals_view" ></div></td>
-                                <td><div class="oe_totals" ></div></td>
-                            </tr>
-                        </table>
-                    </group>-->
-		    <group colspan="4" class="oe_form_group_label_border"> 
-			    <field name="pricelist_id" />
-			    <field name="to_invoice" widget="selection" />
+		    <group colspan="4" class="oe_form_group_label_border">
+			<field name="pricelist_id" />
+			<field name="to_invoice" widget="selection" />
 		    </group>
                 </xpath>
-                <!-- <notebook position="inside">
-                    <page string="Invoice Analysis">
-                        <separator colspan="4" string="Work Done Stats"/>
-
-                        <field name="total_cost"/>
-                        <field name="remaining_ca"/>
-                        <field name="ca_invoiced"/>
-                        <field name="ca_theorical"/>
-                        <newline/>
-                        <field name="hours_quantity"/>
-                        <field name="hours_qtt_invoiced"/>
-                        <field name="remaining_hours"/>
-                        <newline/>
-                        <separator colspan="4" string="Analysis Stats"/>
-
-                        <field name="revenue_per_hour"/>
-                        <field name="real_margin"/>
-                        <field name="real_margin_rate"/>
-                        <field name="theorical_margin"/>
-                        <separator colspan="4" string="Key Dates"/>
-
-                        <field name="last_invoice_date"/>
-                        <field name="last_worked_invoiced_date"/>
-                        <field name="last_worked_date"/>
-                    </page>
-                    <page string="Stats by month">
-                        <field colspan="4" name="month_ids" nolabel="1">
-                            <tree string="Month">
-                                <field name="month"/>
-                                <field name="unit_amount" widget="float_time"/>
-                            </tree>
-                        </field>
-                    </page>
-                    <page string="Stats by user">
-                        <field colspan="4" name="user_ids" nolabel="1">
-                            <tree string="Users">
-                                <field name="user"/>
-                                <field name="unit_amount" widget="float_time"/>
-                            </tree>
-                        </field>
-                    </page>
-                </notebook> -->
-
             </field>
         </record>
 
-- 
cgit v1.2.3


From 2da36cab751cf17deb707691b1d389739a39f72a Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 31 May 2012 12:57:58 +0530
Subject: [IMP]create function for open hr_expense for current analytic_id in
 hr_expense line and improve code

bzr revid: sgo@tinyerp.com-20120531072758-fhaake1kjj13iiwi
---
 .../account_analytic_analysis_view.xml                     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 33cefae38bb..44fcf7ac2f5 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -40,7 +40,7 @@
             res_model="account.analytic.line"
             src_model="account.analytic.account"
             />
-
+            
         <record id="hr_timesheet.account_analytic_account_form_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form.inherit</field>
             <field name="model">account.analytic.account</field>
@@ -101,16 +101,16 @@
 				<td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
 				<td class="oe_amount_center oe_th_110px"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
 				<td width="10px"></td>
-				<td class="oe_th_150px">todo</td>
-				<td class="oe_th_150px">todo</td>
+				<td class="oe_th_150px"><button class= "oe_btn_width" name="open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+				<td class="oe_th_150px"><button class= "oe_btn_width" name="hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
 			    </tr>
 			    <tr>
 				<th class="oe_border_right">Total</th>
 				<td width="10px"></td>
-				<td class="oe_amount_center oe_th_110px oe_border_top">todo</td>
-				<td class="oe_amount_center oe_th_110px oe_border_top">todo</td>
-				<td class="oe_amount_center oe_th_110px oe_border_right oe_border_top">todo</td>
-				<td class="oe_amount_center oe_th_110px oe_border_top">todo</td>
+				<td class="oe_amount_center oe_th_110px oe_border_top"><field name="est_total" nolabel="1"/></td>
+				<td class="oe_amount_center oe_th_110px oe_border_top"><field name="invoiced_total" nolabel="1"/></td>
+				<td class="oe_amount_center oe_th_110px oe_border_right oe_border_top"><field name="remaining_total" nolabel="1"/></td>
+				<td class="oe_amount_center oe_th_110px oe_border_top"><field name="toinvoice_total" nolabel="1"/></td>
 			    </tr>
 			</table>
 		    </group>
-- 
cgit v1.2.3


From 498549e8e5d14f53b07cbfb7ec8181b7fc313a5d Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 31 May 2012 15:03:23 +0530
Subject: [IMP]account_analytic_analysis: Inherit project form view

bzr revid: dbr@tinyerp.com-20120531093323-wks6p7arbyoam8t9
---
 .../account_analytic_analysis_view.xml             | 86 ++++++++++++++++++++++
 1 file changed, 86 insertions(+)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 7cad26844c3..0f2001467b1 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -248,6 +248,92 @@
             </field>
         </record>
 
+        <record id="project_account_analytic_account_form" model="ir.ui.view">
+            <field name="name">project.account.analytic.account.form.inherit</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.edit_project"/>
+            <field eval="18" name="priority"/>
+            <field name="arch" type="xml">
+            	<xpath expr='//page[@name="team"]' position='after'>
+            	    <page string="Contract Data" name="contract_page">
+                        <group colspan="2" col= "2" name="contract" class="oe_form_group_label_border">
+                            <separator colspan="2" string="Validity"/>
+                            <field name="date_start"/>
+                            <field name="date"/>
+                            <group col="6" colspan="3" class="oe_form_group_label_border">
+                                <field name="quantity_max"/><field name="company_uom_id" nolabel="1"/><field name="remaining_hours" string="/ Remaining"/>
+                            </group>
+                        </group>
+                        <group colspan="2" col= "2" name="invoice_rate" class="oe_form_group_label_border">
+                            <separator colspan="2" string="Invoice Rate"/>
+                            <field name="pricelist_id" />
+			                <field name="to_invoice" widget="selection" />
+                        </group>                     
+		                <separator colspan="4" string="Invoicing" name="invoicing"/>
+		                <group col="1" colspan="4">
+			              <table border="0">
+			                <tr>
+				            <th class="oe_th_150px" height="20px"></th>
+				            <th width="10px"></th>
+				            <th class="oe_th_110px">Est.Tot</th>
+				            <th class="oe_th_110px">Invoiced</th>
+				            <th class="oe_th_110px">Remaining</th>
+				            <th class="oe_th_110px">Ready To Invoice</th>
+				            <th width="10px"></th>
+				            <th class="oe_th_150px"></th>
+				            <th class="oe_th_150px"></th>
+			                </tr>
+			                <tr>
+				            <th class="oe_border_right">Fix Price Invoices</th>
+				            <td><field name="fix_price_invoices" nolabel="1"/></td>
+				            <td class="oe_amount_center oe_th_110px"><field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				            <td class="oe_amount_center oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				            <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				            <td class="oe_amount_center oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				            <td width="10px"></td>
+				            <td class="oe_th_150px"><button class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				            <td class="oe_th_150px"><button class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+			                </tr>
+			                <tr>
+				            <th class="oe_border_right">Invoice On Timesheets</th>
+				            <td><field name="invoice_on_timesheets" nolabel="1"/></td>
+				            <td class="oe_amount_center oe_th_110px"><field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				            <td class="oe_amount_center oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				            <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				            <td class="oe_amount_center oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				            <td width="10px"></td>
+				            <td class="oe_th_150px"><button class= "oe_btn_width" name="%(action_timesheet_lines_tree)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				            <td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+			                </tr>
+			                <tr>
+				            <th class="oe_border_right">Charge Expenses</th>
+				            <td><field name="charge_expenses" nolabel="1"/></td>
+				            <td class="oe_amount_center oe_th_110px">todo</td>
+				            <td class="oe_amount_center oe_th_110px">todo</td>
+				            <td class="oe_amount_center oe_th_110px oe_border_right">todo</td>
+				            <td class="oe_amount_center oe_th_110px">todo</td>
+				            <td width="10px"></td>
+				            <td class="oe_th_150px">todo</td>
+				            <td class="oe_th_150px">todo</td>
+			                </tr>
+			                <tr>
+				            <th class="oe_border_right">Total</th>
+				            <td width="10px"></td>
+				            <td class="oe_amount_center oe_th_110px oe_border_top">todo</td>
+				            <td class="oe_amount_center oe_th_110px oe_border_top">todo</td>
+				            <td class="oe_amount_center oe_th_110px oe_border_right oe_border_top">todo</td>
+				            <td class="oe_amount_center oe_th_110px oe_border_top">todo</td>
+			                </tr>
+			              </table>
+		                </group>
+		                <separator string="Terms and Condition" colspan="4" name="description"/>
+                        <field colspan="4" name="description" nolabel="1"/>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+
         <!-- Add information on Account analytic list for the project management -->
         <record id="view_account_analytic_account_tree_c2c_2" model="ir.ui.view">
             <field name="name">account.analytic.account.tree</field>
-- 
cgit v1.2.3


From 26a574f79612276dc4fddd3db0735300e39b38d7 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 4 Jun 2012 12:48:56 +0530
Subject: [IMP]change report and made changes in timesheet which is not shown
 contract record and attrs on the field

bzr revid: sgo@tinyerp.com-20120604071856-xibj1lz9rjclyzmq
---
 .../account_analytic_analysis_view.xml                 | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 1f5df857cda..bea6d70608b 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -34,12 +34,6 @@
             res_model="sale.order.line"
             src_model="account.analytic.account"
             />
-         <act_window
-            id="action_timesheet_lines_tree"
-            name="Timesheet Lines"
-            res_model="account.analytic.line"
-            src_model="account.analytic.account"
-            />
             
         <record id="hr_timesheet.account_analytic_account_form_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form.inherit</field>
@@ -90,7 +84,7 @@
 				<td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 				<td class="oe_amount_center oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 				<td width="10px"></td>
-				<td class="oe_th_150px"><button class= "oe_btn_width" name="%(action_timesheet_lines_tree)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 				<td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 			    </tr>
 			    <tr>
@@ -115,8 +109,8 @@
 			</table>
 		    </group>
 		    <group colspan="4" class="oe_form_group_label_border">
-			<field name="pricelist_id" />
-			<field name="to_invoice" widget="selection" />
+				<field name="pricelist_id" attrs="{'invisible': ['|',('invoice_on_timesheets','!=',True),('charge_expenses','!=',True)]}"/>
+			    <field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
 		    </group>
                 </xpath>
             </field>
@@ -138,8 +132,8 @@
                         </group>
 			<group colspan="2" col= "2" class="oe_form_group_label_border">
                             <separator colspan="2" string="Invoice Rate"/>
-                            <field name="pricelist_id" />
-			    <field name="to_invoice" widget="selection" />
+                            <field name="pricelist_id" attrs="{'invisible': ['|',('invoice_on_timesheets','=',0),('charge_expenses','=',0)]}"/>
+			    <field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
                         </group> 
 			<group col="6" colspan="2" class="oe_form_group_label_border">
                             <field name="quantity_max"/><field name="company_uom_id" nolabel="1" readonly="1"/><field name="remaining_hours" string="/ Remaining"/>
@@ -177,7 +171,7 @@
 				    <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 				    <td class="oe_amount_center oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 				    <td width="10px"></td>
-				    <td class="oe_th_150px"><button class= "oe_btn_width" name="%(action_timesheet_lines_tree)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				    <td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 				    <td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 				</tr>
 				<tr>
-- 
cgit v1.2.3


From e7f5c1088bbdcaee6a48fe534ec7501ff858c3d5 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 4 Jun 2012 16:03:42 +0530
Subject: [IMP]type invible when type is contract and template and project
 related issues solved

bzr revid: sgo@tinyerp.com-20120604103342-g0pnstp5cexttdb7
---
 addons/account_analytic_analysis/account_analytic_analysis_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index bea6d70608b..792b272ce1d 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -109,7 +109,7 @@
 			</table>
 		    </group>
 		    <group colspan="4" class="oe_form_group_label_border">
-				<field name="pricelist_id" attrs="{'invisible': ['|',('invoice_on_timesheets','!=',True),('charge_expenses','!=',True)]}"/>
+				<field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','!=',True),('charge_expenses','!=',True)]}"/>
 			    <field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
 		    </group>
                 </xpath>
-- 
cgit v1.2.3


From f5c7e060b888be686e94f6badac003d698337812 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 4 Jun 2012 16:21:29 +0530
Subject: [IMP]:improved view code

bzr revid: apa@tinyerp.com-20120604105129-zlbaoej3qj4kdpbo
---
 addons/account_analytic_analysis/account_analytic_analysis_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 79afea7e99b..11b2b6755a8 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -109,8 +109,8 @@
 			</table>
 		    </group>
 		    <group colspan="4" class="oe_form_group_label_border">
-				<field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','!=',True),('charge_expenses','!=',True)]}"/>
-			    <field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
+			<field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','!=',True),('charge_expenses','!=',True)]}"/>
+			<field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
 		    </group>
                 </xpath>
             </field>
-- 
cgit v1.2.3


From 48cf6955a736b9ba2ccc486e5bc2a29bf1229639 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 6 Jun 2012 12:36:51 +0530
Subject: [IMP]improve view and add field in hr_timesheet_invoice

bzr revid: sgo@tinyerp.com-20120606070651-ol42dl8d6o5lqlsl
---
 addons/account_analytic_analysis/account_analytic_analysis_view.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 11b2b6755a8..83632458c64 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -50,7 +50,7 @@
                         <field name="quantity_max"/><label string="/"/> <label string="Remaining"/> <field name="remaining_hours" nolabel="1"/>
                     </group>
                 </xpath>
-                <xpath expr='//separator[@name="description"]' position='before'>
+                <xpath expr='//group[@name="toinvoice"]' position='before'>
 		    <separator colspan="4" string="Invoicing" name="invoicing"/>
 		    <group col="1" colspan="4">
 			<table border="0">
@@ -108,10 +108,6 @@
 			    </tr>
 			</table>
 		    </group>
-		    <group colspan="4" class="oe_form_group_label_border">
-			<field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','!=',True),('charge_expenses','!=',True)]}"/>
-			<field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-		    </group>
                 </xpath>
             </field>
         </record>
-- 
cgit v1.2.3


From 0125e320c98705ec412daf0d154ca84466262687 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 6 Jun 2012 17:36:29 +0200
Subject: [IMP] analytic: misc imp related to project and contract mangement
 task

bzr revid: qdp-launchpad@openerp.com-20120606153629-jlk1k0ze09b7pu6s
---
 .../account_analytic_analysis_view.xml             | 250 ++++++++++-----------
 1 file changed, 123 insertions(+), 127 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 83632458c64..ffd1e614c90 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -42,72 +42,70 @@
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
-            	<xpath expr='//field[@name="parent_id"]' position='after'>
-            	    <field name="template_id" on_change="on_change_template(template_id)"  domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
-            	</xpath>
-                <xpath expr='//group[@name="project"]' position="after">
-                    <group col="6" colspan="3" class="oe_form_group_label_border">
+                <xpath expr='//field[@name="partner_id"]' position='after'>
+                    <field name="template_id" on_change="on_change_template(template_id)"  domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
+                </xpath>
+                <xpath expr='//field[@name="date"]' position="after">
+                    <group col="6" colspan="2" class="oe_form_group_label_border">
                         <field name="quantity_max"/><label string="/"/> <label string="Remaining"/> <field name="remaining_hours" nolabel="1"/>
                     </group>
                 </xpath>
-                <xpath expr='//group[@name="toinvoice"]' position='before'>
-		    <separator colspan="4" string="Invoicing" name="invoicing"/>
-		    <group col="1" colspan="4">
-			<table border="0">
-			    <tr>
-				<th class="oe_th_137px" height="20px"></th>
-				<th width="10px"></th>
-				<th class="oe_th_110px">Est.Tot</th>
-				<th class="oe_th_110px">Invoiced</th>
-				<th class="oe_th_110px">Remaining</th>
-				<th class="oe_th_110px">Ready To Invoice</th>
-				<th width="10px"></th>
-				<th class="oe_th_150px"></th>
-				<th class="oe_th_150px"></th>
-			    </tr>
-			    <tr>
-				<th class="oe_border_right">Fix Price Invoices</th>
-				<td><field name="fix_price_invoices" nolabel="1"/></td>
-				<td class="oe_amount_center oe_th_110px"><field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				<td class="oe_amount_center oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				<td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				<td class="oe_amount_center oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				<td width="10px"></td>
-				<td class="oe_th_150px"><button class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				<td class="oe_th_150px"><button class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-			    </tr>
-			    <tr>
-				<th class="oe_border_right">Invoice On Timesheets</th>
-				<td><field name="invoice_on_timesheets" nolabel="1"/></td>
-				<td class="oe_amount_center oe_th_110px"><field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				<td class="oe_amount_center oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				<td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				<td class="oe_amount_center oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				<td width="10px"></td>
-				<td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				<td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-			    </tr>
-			    <tr>
-				<th class="oe_border_right">Charge Expenses</th>
-				<td><field name="charge_expenses" nolabel="1"/></td>
-				<td class="oe_amount_center oe_th_110px"><field name="expense_max" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-				<td class="oe_amount_center oe_th_110px"><field name="expense_invoiced" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-				<td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-				<td class="oe_amount_center oe_th_110px"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-				<td width="10px"></td>
-				<td class="oe_th_150px"><button class= "oe_btn_width" name="open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-				<td class="oe_th_150px"><button class= "oe_btn_width" name="hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-			    </tr>
-			    <tr>
-				<th class="oe_border_right">Total</th>
-				<td width="10px"></td>
-				<td class="oe_amount_center oe_th_110px oe_border_top"><field name="est_total" nolabel="1"/></td>
-				<td class="oe_amount_center oe_th_110px oe_border_top"><field name="invoiced_total" nolabel="1"/></td>
-				<td class="oe_amount_center oe_th_110px oe_border_right oe_border_top"><field name="remaining_total" nolabel="1"/></td>
-				<td class="oe_amount_center oe_th_110px oe_border_top"><field name="toinvoice_total" nolabel="1"/></td>
-			    </tr>
-			</table>
-		    </group>
+                <xpath expr='//field[@name="pricelist_id"]' position='before'>
+                    <separator colspan="4" string="Invoicing" name="invoicing"/>
+                    <table border="0" colspan="4">
+                        <tr>
+                        <th class="oe_th_137px" height="20px"></th>
+                        <th width="10px"></th>
+                        <th class="oe_th_110px">Est.Tot</th>
+                        <th class="oe_th_110px">Invoiced</th>
+                        <th class="oe_th_110px">Remaining</th>
+                        <th class="oe_th_110px">Ready To Invoice</th>
+                        <th width="10px"></th>
+                        <th class="oe_th_150px"></th>
+                        <th class="oe_th_150px"></th>
+                        </tr>
+                        <tr>
+                        <th class="oe_border_right">Fix Price Invoices</th>
+                        <td><field name="fix_price_invoices" nolabel="1"/></td>
+                        <td class="oe_amount_center oe_th_110px"><field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                        <td class="oe_amount_center oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                        <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                        <td class="oe_amount_center oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                        <td width="10px"></td>
+                        <td class="oe_th_150px"><button class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                        <td class="oe_th_150px"><button class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                        </tr>
+                        <tr>
+                        <th class="oe_border_right">Invoice On Timesheets</th>
+                        <td><field name="invoice_on_timesheets" nolabel="1"/></td>
+                        <td class="oe_amount_center oe_th_110px"><field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                        <td class="oe_amount_center oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                        <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                        <td class="oe_amount_center oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                        <td width="10px"></td>
+                        <td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                        <td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                        </tr>
+                        <tr>
+                        <th class="oe_border_right">Charge Expenses</th>
+                        <td><field name="charge_expenses" nolabel="1"/></td>
+                        <td class="oe_amount_center oe_th_110px"><field name="expense_max" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                        <td class="oe_amount_center oe_th_110px"><field name="expense_invoiced" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                        <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                        <td class="oe_amount_center oe_th_110px"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                        <td width="10px"></td>
+                        <td class="oe_th_150px"><button class= "oe_btn_width" name="open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                        <td class="oe_th_150px"><button class= "oe_btn_width" name="hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                        </tr>
+                        <tr>
+                        <th class="oe_border_right">Total</th>
+                        <td width="10px"></td>
+                        <td class="oe_amount_center oe_th_110px oe_border_top"><field name="est_total" nolabel="1"/></td>
+                        <td class="oe_amount_center oe_th_110px oe_border_top"><field name="invoiced_total" nolabel="1"/></td>
+                        <td class="oe_amount_center oe_th_110px oe_border_right oe_border_top"><field name="remaining_total" nolabel="1"/></td>
+                        <td class="oe_amount_center oe_th_110px oe_border_top"><field name="toinvoice_total" nolabel="1"/></td>
+                        </tr>
+                    </table>
                 </xpath>
             </field>
         </record>
@@ -119,80 +117,78 @@
             <field name="inherit_id" ref="project.edit_project"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
-            	<xpath expr='//page[@name="team"]' position='after'>
-            	    <page string="Contract Data">
+                <xpath expr='//page[@name="team"]' position='after'>
+                    <page string="Contract Data">
                         <group colspan="2" col= "2" class="oe_form_group_label_border">
                             <separator colspan="2" string="Validity"/>
                             <field name="date_start"/>
                             <field name="date"/>
                         </group>
-			<group colspan="2" col= "2" class="oe_form_group_label_border">
+            <group colspan="2" col= "2" class="oe_form_group_label_border">
                             <separator colspan="2" string="Invoice Rate"/>
                             <field name="pricelist_id" attrs="{'invisible': ['|',('invoice_on_timesheets','=',0),('charge_expenses','=',0)]}"/>
-			    <field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
+                <field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
                         </group> 
-			<group col="6" colspan="2" class="oe_form_group_label_border">
+            <group col="6" colspan="2" class="oe_form_group_label_border">
                             <field name="quantity_max"/><field name="company_uom_id" nolabel="1" readonly="1"/><field name="remaining_hours" string="/ Remaining"/>
                         </group>
-		        <separator colspan="4" string="Invoicing"/>
-		        <group col="1" colspan="4">
-			    <table border="0">
-				<tr>
-				    <th class="oe_th_137px" height="20px"></th>
-				    <th width="10px"></th>
-				    <th class="oe_th_110px">Est.Tot</th>
-				    <th class="oe_th_110px">Invoiced</th>
-				    <th class="oe_th_110px">Remaining</th>
-				    <th class="oe_th_110px">Ready To Invoice</th>
-				    <th width="10px"></th>
-				    <th class="oe_th_150px"></th>
-				    <th class="oe_th_150px"></th>
-				</tr>
-				<tr>
-				    <th class="oe_border_right">Fix Price Invoices</th>
-				    <td><field name="fix_price_invoices" nolabel="1"/></td>
-				    <td class="oe_amount_center oe_th_110px"><field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				    <td class="oe_amount_center oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				    <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				    <td class="oe_amount_center oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				    <td width="10px"></td>
-				    <td class="oe_th_150px"><button class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				    <td class="oe_th_150px"><button class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				</tr>
-				<tr>
-				    <th class="oe_border_right">Inv. On Timesheets</th>
-				    <td><field name="invoice_on_timesheets" nolabel="1"/></td>
-				    <td class="oe_amount_center oe_th_110px"><field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				    <td class="oe_amount_center oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				    <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				    <td class="oe_amount_center oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				    <td width="10px"></td>
-				    <td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				    <td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				</tr>
-				<tr>
-				    <th class="oe_border_right">Charge Expenses</th>
-				    <td><field name="charge_expenses" nolabel="1"/></td>
-				    <td class="oe_amount_center oe_th_110px"><field name="expense_max" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-				    <td class="oe_amount_center oe_th_110px"><field name="expense_invoiced" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-				    <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-				    <td class="oe_amount_center oe_th_110px"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-				    <td width="10px"></td>
-				    <td class="oe_th_150px"><button class= "oe_btn_width" name="open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-				    <td class="oe_th_150px"><button class= "oe_btn_width" name="hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-				</tr>
-				<tr>
-				    <th class="oe_border_right">Total</th>
-				    <td width="10px"></td>
-				    <td class="oe_amount_center oe_th_110px oe_border_top"><field name="est_total" nolabel="1"/></td>
-				    <td class="oe_amount_center oe_th_110px oe_border_top"><field name="invoiced_total" nolabel="1"/></td>
-				    <td class="oe_amount_center oe_th_110px oe_border_right oe_border_top"><field name="remaining_total" nolabel="1"/></td>
-				    <td class="oe_amount_center oe_th_110px oe_border_top"><field name="toinvoice_total" nolabel="1"/></td>
-				</tr>
-			    </table>
-			</group>
-		    <separator string="Terms and Condition" colspan="4"/>
-                    <field colspan="4" name="description" nolabel="1"/>
+                <separator colspan="4" string="Invoicing"/>
+                <group col="1" colspan="4">
+                <table border="0">
+                <tr>
+                    <th class="oe_th_137px" height="20px"></th>
+                    <th width="10px"></th>
+                    <th class="oe_th_110px">Est.Tot</th>
+                    <th class="oe_th_110px">Invoiced</th>
+                    <th class="oe_th_110px">Remaining</th>
+                    <th class="oe_th_110px">Ready To Invoice</th>
+                    <th width="10px"></th>
+                    <th class="oe_th_150px"></th>
+                    <th class="oe_th_150px"></th>
+                </tr>
+                <tr>
+                    <th class="oe_border_right">Fix Price Invoices</th>
+                    <td><field name="fix_price_invoices" nolabel="1"/></td>
+                    <td class="oe_amount_center oe_th_110px"><field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                    <td class="oe_amount_center oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                    <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                    <td class="oe_amount_center oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                    <td width="10px"></td>
+                    <td class="oe_th_150px"><button class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                    <td class="oe_th_150px"><button class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                </tr>
+                <tr>
+                    <th class="oe_border_right">Inv. On Timesheets</th>
+                    <td><field name="invoice_on_timesheets" nolabel="1"/></td>
+                    <td class="oe_amount_center oe_th_110px"><field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                    <td class="oe_amount_center oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                    <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                    <td class="oe_amount_center oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                    <td width="10px"></td>
+                    <td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                    <td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                </tr>
+                <tr>
+                    <th class="oe_border_right">Charge Expenses</th>
+                    <td><field name="charge_expenses" nolabel="1"/></td>
+                    <td class="oe_amount_center oe_th_110px"><field name="expense_max" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                    <td class="oe_amount_center oe_th_110px"><field name="expense_invoiced" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                    <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                    <td class="oe_amount_center oe_th_110px"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                    <td width="10px"></td>
+                    <td class="oe_th_150px"><button class= "oe_btn_width" name="open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                    <td class="oe_th_150px"><button class= "oe_btn_width" name="hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                </tr>
+                <tr>
+                    <th class="oe_border_right">Total</th>
+                    <td width="10px"></td>
+                    <td class="oe_amount_center oe_th_110px oe_border_top"><field name="est_total" nolabel="1"/></td>
+                    <td class="oe_amount_center oe_th_110px oe_border_top"><field name="invoiced_total" nolabel="1"/></td>
+                    <td class="oe_amount_center oe_th_110px oe_border_right oe_border_top"><field name="remaining_total" nolabel="1"/></td>
+                    <td class="oe_amount_center oe_th_110px oe_border_top"><field name="toinvoice_total" nolabel="1"/></td>
+                </tr>
+                </table>
+            </group>
                     </page>
                 </xpath>
             </field>
-- 
cgit v1.2.3


From 9d7e448771b8846dfdd1890b32f7eeb40aa2dd97 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 7 Jun 2012 12:23:50 +0530
Subject: [IMP]:improved view and css for contract view

bzr revid: apa@tinyerp.com-20120607065350-gopdsnwdo1jmsccz
---
 .../account_analytic_analysis_view.xml             | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index ffd1e614c90..704759c0239 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -52,9 +52,9 @@
                 </xpath>
                 <xpath expr='//field[@name="pricelist_id"]' position='before'>
                     <separator colspan="4" string="Invoicing" name="invoicing"/>
-                    <table border="0" colspan="4">
+                    <table border="1" colspan="4">
                         <tr>
-                        <th class="oe_th_137px" height="20px"></th>
+                        <th class="oe_th_155px" height="20px"></th>
                         <th width="10px"></th>
                         <th class="oe_th_110px">Est.Tot</th>
                         <th class="oe_th_110px">Invoiced</th>
@@ -67,10 +67,10 @@
                         <tr>
                         <th class="oe_border_right">Fix Price Invoices</th>
                         <td><field name="fix_price_invoices" nolabel="1"/></td>
-                        <td class="oe_amount_center oe_th_110px"><field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                        <td class="oe_amount_center oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                        <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                        <td class="oe_amount_center oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                        <td><field class="oe_th_110px" name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                        <td class="oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                        <td class="oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                        <td class="oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
                         <td width="10px"></td>
                         <td class="oe_th_150px"><button class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
                         <td class="oe_th_150px"><button class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
@@ -78,10 +78,10 @@
                         <tr>
                         <th class="oe_border_right">Invoice On Timesheets</th>
                         <td><field name="invoice_on_timesheets" nolabel="1"/></td>
-                        <td class="oe_amount_center oe_th_110px"><field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                        <td class="oe_amount_center oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                        <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                        <td class="oe_amount_center oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                        <td><field class="oe_th_110px" name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                        <td class="oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                        <td class="oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                        <td class="oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
                         <td width="10px"></td>
                         <td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
                         <td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
@@ -89,10 +89,10 @@
                         <tr>
                         <th class="oe_border_right">Charge Expenses</th>
                         <td><field name="charge_expenses" nolabel="1"/></td>
-                        <td class="oe_amount_center oe_th_110px"><field name="expense_max" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                        <td class="oe_amount_center oe_th_110px"><field name="expense_invoiced" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                        <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                        <td class="oe_amount_center oe_th_110px"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                        <td><field class="oe_th_110px" name="expense_max" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                        <td class="oe_th_110px"><field name="expense_invoiced" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                        <td class="oe_th_110px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                        <td class="oe_th_110px"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
                         <td width="10px"></td>
                         <td class="oe_th_150px"><button class= "oe_btn_width" name="open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
                         <td class="oe_th_150px"><button class= "oe_btn_width" name="hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
@@ -100,10 +100,10 @@
                         <tr>
                         <th class="oe_border_right">Total</th>
                         <td width="10px"></td>
-                        <td class="oe_amount_center oe_th_110px oe_border_top"><field name="est_total" nolabel="1"/></td>
-                        <td class="oe_amount_center oe_th_110px oe_border_top"><field name="invoiced_total" nolabel="1"/></td>
-                        <td class="oe_amount_center oe_th_110px oe_border_right oe_border_top"><field name="remaining_total" nolabel="1"/></td>
-                        <td class="oe_amount_center oe_th_110px oe_border_top"><field name="toinvoice_total" nolabel="1"/></td>
+                        <td class="oe_th_110px oe_border_top"><field name="est_total" nolabel="1"/></td>
+                        <td class="oe_th_110px oe_border_top"><field name="invoiced_total" nolabel="1"/></td>
+                        <td class="oe_th_110px oe_border_right oe_border_top"><field name="remaining_total" nolabel="1"/></td>
+                        <td class="oe_th_110px oe_border_top"><field name="toinvoice_total" nolabel="1"/></td>
                         </tr>
                     </table>
                 </xpath>
-- 
cgit v1.2.3


From 48ce06b78cd001a0468177c451b13917884a3fc5 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 7 Jun 2012 12:45:09 +0530
Subject: [IMP]:border=0

bzr revid: apa@tinyerp.com-20120607071509-xgh4ngj5mhlfkubq
---
 addons/account_analytic_analysis/account_analytic_analysis_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 704759c0239..c50915a5629 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -52,7 +52,7 @@
                 </xpath>
                 <xpath expr='//field[@name="pricelist_id"]' position='before'>
                     <separator colspan="4" string="Invoicing" name="invoicing"/>
-                    <table border="1" colspan="4">
+                    <table border="0" colspan="4">
                         <tr>
                         <th class="oe_th_155px" height="20px"></th>
                         <th width="10px"></th>
-- 
cgit v1.2.3


From 263f03336b606d1af4cf8fbed0da372bf7d04a00 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 7 Jun 2012 12:58:22 +0530
Subject: [IMP]:improved css

bzr revid: apa@tinyerp.com-20120607072822-o8yf42zh883t5pu7
---
 .../account_analytic_analysis_view.xml               | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index c50915a5629..9434348e600 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -52,17 +52,17 @@
                 </xpath>
                 <xpath expr='//field[@name="pricelist_id"]' position='before'>
                     <separator colspan="4" string="Invoicing" name="invoicing"/>
-                    <table border="0" colspan="4">
+                    <table border="1" colspan="4">
                         <tr>
-                        <th class="oe_th_155px" height="20px"></th>
+                        <th class="oe_th_160px" height="20px"></th>
                         <th width="10px"></th>
                         <th class="oe_th_110px">Est.Tot</th>
                         <th class="oe_th_110px">Invoiced</th>
                         <th class="oe_th_110px">Remaining</th>
                         <th class="oe_th_110px">Ready To Invoice</th>
                         <th width="10px"></th>
-                        <th class="oe_th_150px"></th>
-                        <th class="oe_th_150px"></th>
+                        <th></th>
+                        <th></th>
                         </tr>
                         <tr>
                         <th class="oe_border_right">Fix Price Invoices</th>
@@ -72,8 +72,8 @@
                         <td class="oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
                         <td class="oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
                         <td width="10px"></td>
-                        <td class="oe_th_150px"><button class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                        <td class="oe_th_150px"><button class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                        <td><button class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                        <td><button class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
                         </tr>
                         <tr>
                         <th class="oe_border_right">Invoice On Timesheets</th>
@@ -83,8 +83,8 @@
                         <td class="oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
                         <td class="oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
                         <td width="10px"></td>
-                        <td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                        <td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                        <td><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                        <td><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
                         </tr>
                         <tr>
                         <th class="oe_border_right">Charge Expenses</th>
@@ -94,8 +94,8 @@
                         <td class="oe_th_110px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
                         <td class="oe_th_110px"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
                         <td width="10px"></td>
-                        <td class="oe_th_150px"><button class= "oe_btn_width" name="open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                        <td class="oe_th_150px"><button class= "oe_btn_width" name="hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                        <td><button class= "oe_btn_width" name="open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+                        <td><button class= "oe_btn_width" name="hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
                         </tr>
                         <tr>
                         <th class="oe_border_right">Total</th>
-- 
cgit v1.2.3


From 26231a214a4afa5c94d6139b1f93cfd9014eeeab Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 7 Jun 2012 12:59:11 +0530
Subject: [IMP]:border=0

bzr revid: apa@tinyerp.com-20120607072911-tjv04tlssk1nbsu1
---
 addons/account_analytic_analysis/account_analytic_analysis_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 9434348e600..f5c7cae99fa 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -52,7 +52,7 @@
                 </xpath>
                 <xpath expr='//field[@name="pricelist_id"]' position='before'>
                     <separator colspan="4" string="Invoicing" name="invoicing"/>
-                    <table border="1" colspan="4">
+                    <table border="0" colspan="4">
                         <tr>
                         <th class="oe_th_160px" height="20px"></th>
                         <th width="10px"></th>
-- 
cgit v1.2.3


From 1fbf26f48f8ab9d10123b959a10f28067a7cbf10 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 7 Jun 2012 13:09:28 +0530
Subject: [IMP]:improved contract data tab in project

bzr revid: apa@tinyerp.com-20120607073928-hrstvq39z1hsqex2
---
 .../account_analytic_analysis_view.xml             | 224 +++++++++++----------
 1 file changed, 113 insertions(+), 111 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index f5c7cae99fa..e33acaaadd5 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -54,56 +54,56 @@
                     <separator colspan="4" string="Invoicing" name="invoicing"/>
                     <table border="0" colspan="4">
                         <tr>
-                        <th class="oe_th_160px" height="20px"></th>
-                        <th width="10px"></th>
-                        <th class="oe_th_110px">Est.Tot</th>
-                        <th class="oe_th_110px">Invoiced</th>
-                        <th class="oe_th_110px">Remaining</th>
-                        <th class="oe_th_110px">Ready To Invoice</th>
-                        <th width="10px"></th>
-                        <th></th>
-                        <th></th>
+			    <th class="oe_th_160px" height="20px"></th>
+			    <th width="10px"></th>
+			    <th class="oe_th_110px">Est.Tot</th>
+			    <th class="oe_th_110px">Invoiced</th>
+			    <th class="oe_th_110px">Remaining</th>
+			    <th class="oe_th_110px">Ready To Invoice</th>
+			    <th width="10px"></th>
+			    <th></th>
+			    <th></th>
                         </tr>
                         <tr>
-                        <th class="oe_border_right">Fix Price Invoices</th>
-                        <td><field name="fix_price_invoices" nolabel="1"/></td>
-                        <td><field class="oe_th_110px" name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                        <td class="oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                        <td class="oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                        <td class="oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                        <td width="10px"></td>
-                        <td><button class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                        <td><button class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+			    <th class="oe_border_right">Fix Price Invoices</th>
+			    <td><field name="fix_price_invoices" nolabel="1"/></td>
+			    <td><field class="oe_th_110px" name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+			    <td class="oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+			    <td class="oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+			    <td class="oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+			    <td width="10px"></td>
+			    <td><button class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+			    <td><button class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
                         </tr>
                         <tr>
-                        <th class="oe_border_right">Invoice On Timesheets</th>
-                        <td><field name="invoice_on_timesheets" nolabel="1"/></td>
-                        <td><field class="oe_th_110px" name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                        <td class="oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                        <td class="oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                        <td class="oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                        <td width="10px"></td>
-                        <td><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                        <td><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+			    <th class="oe_border_right">Invoice On Timesheets</th>
+			    <td><field name="invoice_on_timesheets" nolabel="1"/></td>
+			    <td><field class="oe_th_110px" name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+			    <td class="oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+			    <td class="oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+			    <td class="oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+			    <td width="10px"></td>
+			    <td><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+			    <td><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
                         </tr>
                         <tr>
-                        <th class="oe_border_right">Charge Expenses</th>
-                        <td><field name="charge_expenses" nolabel="1"/></td>
-                        <td><field class="oe_th_110px" name="expense_max" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                        <td class="oe_th_110px"><field name="expense_invoiced" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                        <td class="oe_th_110px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                        <td class="oe_th_110px"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                        <td width="10px"></td>
-                        <td><button class= "oe_btn_width" name="open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                        <td><button class= "oe_btn_width" name="hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+			    <th class="oe_border_right">Charge Expenses</th>
+			    <td><field name="charge_expenses" nolabel="1"/></td>
+			    <td><field class="oe_th_110px" name="expense_max" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+			    <td class="oe_th_110px"><field name="expense_invoiced" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+			    <td class="oe_th_110px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+			    <td class="oe_th_110px"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+			    <td width="10px"></td>
+			    <td><button class= "oe_btn_width" name="open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+			    <td><button class= "oe_btn_width" name="hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
                         </tr>
                         <tr>
-                        <th class="oe_border_right">Total</th>
-                        <td width="10px"></td>
-                        <td class="oe_th_110px oe_border_top"><field name="est_total" nolabel="1"/></td>
-                        <td class="oe_th_110px oe_border_top"><field name="invoiced_total" nolabel="1"/></td>
-                        <td class="oe_th_110px oe_border_right oe_border_top"><field name="remaining_total" nolabel="1"/></td>
-                        <td class="oe_th_110px oe_border_top"><field name="toinvoice_total" nolabel="1"/></td>
+			    <th class="oe_border_right">Total</th>
+			    <td width="10px"></td>
+			    <td class="oe_th_110px oe_border_top"><field name="est_total" nolabel="1"/></td>
+			    <td class="oe_th_110px oe_border_top"><field name="invoiced_total" nolabel="1"/></td>
+			    <td class="oe_th_110px oe_border_right oe_border_top"><field name="remaining_total" nolabel="1"/></td>
+			    <td class="oe_th_110px oe_border_top"><field name="toinvoice_total" nolabel="1"/></td>
                         </tr>
                     </table>
                 </xpath>
@@ -119,76 +119,78 @@
             <field name="arch" type="xml">
                 <xpath expr='//page[@name="team"]' position='after'>
                     <page string="Contract Data">
-                        <group colspan="2" col= "2" class="oe_form_group_label_border">
-                            <separator colspan="2" string="Validity"/>
-                            <field name="date_start"/>
-                            <field name="date"/>
-                        </group>
-            <group colspan="2" col= "2" class="oe_form_group_label_border">
-                            <separator colspan="2" string="Invoice Rate"/>
-                            <field name="pricelist_id" attrs="{'invisible': ['|',('invoice_on_timesheets','=',0),('charge_expenses','=',0)]}"/>
-                <field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-                        </group> 
-            <group col="6" colspan="2" class="oe_form_group_label_border">
+			<group col="4" colspan="4">
+			    <group colspan="2" col= "2" class="oe_form_group_label_border">
+				<separator colspan="2" string="Validity"/>
+				<field name="date_start"/>
+				<field name="date"/>
+			    </group>
+			    <group colspan="2" col= "2" class="oe_form_group_label_border" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}">
+				<separator colspan="2" string="Invoice Rate"/>
+				<field name="pricelist_id" />
+				<field name="to_invoice" widget="selection" />
+			    </group>
+			</group>
+			<group col="6" colspan="2" class="oe_form_group_label_border">
                             <field name="quantity_max"/><field name="company_uom_id" nolabel="1" readonly="1"/><field name="remaining_hours" string="/ Remaining"/>
                         </group>
-                <separator colspan="4" string="Invoicing"/>
-                <group col="1" colspan="4">
-                <table border="0">
-                <tr>
-                    <th class="oe_th_137px" height="20px"></th>
-                    <th width="10px"></th>
-                    <th class="oe_th_110px">Est.Tot</th>
-                    <th class="oe_th_110px">Invoiced</th>
-                    <th class="oe_th_110px">Remaining</th>
-                    <th class="oe_th_110px">Ready To Invoice</th>
-                    <th width="10px"></th>
-                    <th class="oe_th_150px"></th>
-                    <th class="oe_th_150px"></th>
-                </tr>
-                <tr>
-                    <th class="oe_border_right">Fix Price Invoices</th>
-                    <td><field name="fix_price_invoices" nolabel="1"/></td>
-                    <td class="oe_amount_center oe_th_110px"><field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                    <td class="oe_amount_center oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                    <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                    <td class="oe_amount_center oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                    <td width="10px"></td>
-                    <td class="oe_th_150px"><button class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                    <td class="oe_th_150px"><button class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                </tr>
-                <tr>
-                    <th class="oe_border_right">Inv. On Timesheets</th>
-                    <td><field name="invoice_on_timesheets" nolabel="1"/></td>
-                    <td class="oe_amount_center oe_th_110px"><field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                    <td class="oe_amount_center oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                    <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                    <td class="oe_amount_center oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                    <td width="10px"></td>
-                    <td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                    <td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                </tr>
-                <tr>
-                    <th class="oe_border_right">Charge Expenses</th>
-                    <td><field name="charge_expenses" nolabel="1"/></td>
-                    <td class="oe_amount_center oe_th_110px"><field name="expense_max" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                    <td class="oe_amount_center oe_th_110px"><field name="expense_invoiced" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                    <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                    <td class="oe_amount_center oe_th_110px"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                    <td width="10px"></td>
-                    <td class="oe_th_150px"><button class= "oe_btn_width" name="open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                    <td class="oe_th_150px"><button class= "oe_btn_width" name="hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                </tr>
-                <tr>
-                    <th class="oe_border_right">Total</th>
-                    <td width="10px"></td>
-                    <td class="oe_amount_center oe_th_110px oe_border_top"><field name="est_total" nolabel="1"/></td>
-                    <td class="oe_amount_center oe_th_110px oe_border_top"><field name="invoiced_total" nolabel="1"/></td>
-                    <td class="oe_amount_center oe_th_110px oe_border_right oe_border_top"><field name="remaining_total" nolabel="1"/></td>
-                    <td class="oe_amount_center oe_th_110px oe_border_top"><field name="toinvoice_total" nolabel="1"/></td>
-                </tr>
-                </table>
-            </group>
+			<separator colspan="4" string="Invoicing"/>
+			<group col="1" colspan="4">
+			<table border="0">
+			    <tr>
+				<th class="oe_th_160px" height="20px"></th>
+				<th width="10px"></th>
+				<th class="oe_th_110px">Est.Tot</th>
+				<th class="oe_th_110px">Invoiced</th>
+				<th class="oe_th_110px">Remaining</th>
+				<th class="oe_th_110px">Ready To Invoice</th>
+				<th width="10px"></th>
+				<th></th>
+				<th></th>
+			    </tr>
+			    <tr>
+				<th class="oe_border_right">Fix Price Invoices</th>
+				<td><field name="fix_price_invoices" nolabel="1"/></td>
+				<td><field class="oe_th_110px" name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td class="oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td class="oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td class="oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td width="10px"></td>
+				<td><button class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+				<td><button class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+			    </tr>
+			    <tr>
+				<th class="oe_border_right">Invoice On Timesheets</th>
+				<td><field name="invoice_on_timesheets" nolabel="1"/></td>
+				<td><field class="oe_th_110px" name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td class="oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td class="oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td class="oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td width="10px"></td>
+				<td><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+				<td><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+			    </tr>
+			    <tr>
+				<th class="oe_border_right">Charge Expenses</th>
+				<td><field name="charge_expenses" nolabel="1"/></td>
+				<td><field class="oe_th_110px" name="expense_max" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+				<td class="oe_th_110px"><field name="expense_invoiced" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+				<td class="oe_th_110px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+				<td class="oe_th_110px"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+				<td width="10px"></td>
+				<td><button class= "oe_btn_width" name="open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+				<td><button class= "oe_btn_width" name="hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+			    </tr>
+			    <tr>
+				<th class="oe_border_right">Total</th>
+				<td width="10px"></td>
+				<td class="oe_th_110px oe_border_top"><field name="est_total" nolabel="1"/></td>
+				<td class="oe_th_110px oe_border_top"><field name="invoiced_total" nolabel="1"/></td>
+				<td class="oe_th_110px oe_border_right oe_border_top"><field name="remaining_total" nolabel="1"/></td>
+				<td class="oe_th_110px oe_border_top"><field name="toinvoice_total" nolabel="1"/></td>
+			    </tr>
+			</table>
+		    </group>
                     </page>
                 </xpath>
             </field>
@@ -224,7 +226,7 @@
         </record>
         
         <record id="template_of_contract_action" model="ir.actions.act_window">
-            <field name="name">Template Of Contract</field>
+            <field name="name">Template of Contract</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
-- 
cgit v1.2.3


From 8f4cb2dfc95b0d630cecfbb9aad81daad481e903 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 7 Jun 2012 11:24:05 +0200
Subject: [IMP] analytic: usability changes in contract form view

bzr revid: qdp-launchpad@openerp.com-20120607092405-gwqzw9s71nb90r0b
---
 addons/account_analytic_analysis/account_analytic_analysis_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index e33acaaadd5..fed9fee8725 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -42,7 +42,7 @@
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
-                <xpath expr='//field[@name="partner_id"]' position='after'>
+                <xpath expr='//field[@name="type"]' position='after'>
                     <field name="template_id" on_change="on_change_template(template_id)"  domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
                 </xpath>
                 <xpath expr='//field[@name="date"]' position="after">
-- 
cgit v1.2.3


From 15b9557943168342022dbc7002fac4ec2b98e0de Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 7 Jun 2012 15:53:51 +0530
Subject: [IMP]:improved contract view in project module

bzr revid: apa@tinyerp.com-20120607102351-8mqh6e93ecjqxb8f
---
 .../account_analytic_analysis_view.xml                 | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index fed9fee8725..79df7de3703 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -117,23 +117,25 @@
             <field name="inherit_id" ref="project.edit_project"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
-                <xpath expr='//page[@name="team"]' position='after'>
+                <xpath expr='//page[@name="team"]' position='before'>
                     <page string="Contract Data">
 			<group col="4" colspan="4">
 			    <group colspan="2" col= "2" class="oe_form_group_label_border">
 				<separator colspan="2" string="Validity"/>
 				<field name="date_start"/>
 				<field name="date"/>
+				<group col="6" colspan="2" class="oe_form_group_label_border">
+                    <field name="quantity_max"/><field name="company_uom_id" nolabel="1" readonly="1"/><field name="remaining_hours" string="/ Remaining"/>
+                </group>
 			    </group>
-			    <group colspan="2" col= "2" class="oe_form_group_label_border" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}">
+			    <group colspan="2" col= "2" class="oe_form_group_label_border">
 				<separator colspan="2" string="Invoice Rate"/>
-				<field name="pricelist_id" />
-				<field name="to_invoice" widget="selection" />
+				<field name="manager_id" />
+				<field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
+				<field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
 			    </group>
 			</group>
-			<group col="6" colspan="2" class="oe_form_group_label_border">
-                            <field name="quantity_max"/><field name="company_uom_id" nolabel="1" readonly="1"/><field name="remaining_hours" string="/ Remaining"/>
-                        </group>
+			
 			<separator colspan="4" string="Invoicing"/>
 			<group col="1" colspan="4">
 			<table border="0">
@@ -191,6 +193,8 @@
 			    </tr>
 			</table>
 		    </group>
+			<separator string="Terms and Conditions" colspan="4" name="description"/>
+            <field colspan="4" name="description" nolabel="1"/>
                     </page>
                 </xpath>
             </field>
-- 
cgit v1.2.3


From 4457f2618a7337c0996d53a4406d7a70b04a3b98 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 7 Jun 2012 18:12:01 +0530
Subject: [ADD]:added new module analytic_contract_project.

bzr revid: apa@tinyerp.com-20120607124201-bjmupfhjfecr8h90
---
 .../account_analytic_analysis_view.xml             | 90 ----------------------
 1 file changed, 90 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 79df7de3703..8d888527f28 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -110,96 +110,6 @@
             </field>
         </record>
 
-        <record id="project_account_analytic_account_form" model="ir.ui.view">
-            <field name="name">project.project.form.inherit</field>
-            <field name="model">project.project</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="project.edit_project"/>
-            <field eval="18" name="priority"/>
-            <field name="arch" type="xml">
-                <xpath expr='//page[@name="team"]' position='before'>
-                    <page string="Contract Data">
-			<group col="4" colspan="4">
-			    <group colspan="2" col= "2" class="oe_form_group_label_border">
-				<separator colspan="2" string="Validity"/>
-				<field name="date_start"/>
-				<field name="date"/>
-				<group col="6" colspan="2" class="oe_form_group_label_border">
-                    <field name="quantity_max"/><field name="company_uom_id" nolabel="1" readonly="1"/><field name="remaining_hours" string="/ Remaining"/>
-                </group>
-			    </group>
-			    <group colspan="2" col= "2" class="oe_form_group_label_border">
-				<separator colspan="2" string="Invoice Rate"/>
-				<field name="manager_id" />
-				<field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-				<field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-			    </group>
-			</group>
-			
-			<separator colspan="4" string="Invoicing"/>
-			<group col="1" colspan="4">
-			<table border="0">
-			    <tr>
-				<th class="oe_th_160px" height="20px"></th>
-				<th width="10px"></th>
-				<th class="oe_th_110px">Est.Tot</th>
-				<th class="oe_th_110px">Invoiced</th>
-				<th class="oe_th_110px">Remaining</th>
-				<th class="oe_th_110px">Ready To Invoice</th>
-				<th width="10px"></th>
-				<th></th>
-				<th></th>
-			    </tr>
-			    <tr>
-				<th class="oe_border_right">Fix Price Invoices</th>
-				<td><field name="fix_price_invoices" nolabel="1"/></td>
-				<td><field class="oe_th_110px" name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				<td class="oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				<td class="oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				<td class="oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				<td width="10px"></td>
-				<td><button class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-				<td><button class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-			    </tr>
-			    <tr>
-				<th class="oe_border_right">Invoice On Timesheets</th>
-				<td><field name="invoice_on_timesheets" nolabel="1"/></td>
-				<td><field class="oe_th_110px" name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				<td class="oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				<td class="oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				<td class="oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				<td width="10px"></td>
-				<td><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-				<td><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-			    </tr>
-			    <tr>
-				<th class="oe_border_right">Charge Expenses</th>
-				<td><field name="charge_expenses" nolabel="1"/></td>
-				<td><field class="oe_th_110px" name="expense_max" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-				<td class="oe_th_110px"><field name="expense_invoiced" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-				<td class="oe_th_110px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-				<td class="oe_th_110px"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-				<td width="10px"></td>
-				<td><button class= "oe_btn_width" name="open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-				<td><button class= "oe_btn_width" name="hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-			    </tr>
-			    <tr>
-				<th class="oe_border_right">Total</th>
-				<td width="10px"></td>
-				<td class="oe_th_110px oe_border_top"><field name="est_total" nolabel="1"/></td>
-				<td class="oe_th_110px oe_border_top"><field name="invoiced_total" nolabel="1"/></td>
-				<td class="oe_th_110px oe_border_right oe_border_top"><field name="remaining_total" nolabel="1"/></td>
-				<td class="oe_th_110px oe_border_top"><field name="toinvoice_total" nolabel="1"/></td>
-			    </tr>
-			</table>
-		    </group>
-			<separator string="Terms and Conditions" colspan="4" name="description"/>
-            <field colspan="4" name="description" nolabel="1"/>
-                    </page>
-                </xpath>
-            </field>
-        </record>
-
         <!-- Add information on Account analytic list for the project management -->
         <record id="view_account_analytic_account_tree_c2c_2" model="ir.ui.view">
             <field name="name">account.analytic.account.tree</field>
-- 
cgit v1.2.3


From c23de40df650df25e45a1586d6e62b450d287c14 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 7 Jun 2012 14:36:41 +0200
Subject: [ADD] analytic_contract_hr_expense: split of features of
 account_analytic_analysis and creation of a new module to contain all the
 stuff related to hr_expense (in order to keep clean dependancies)

bzr revid: qdp-launchpad@openerp.com-20120607123641-kjzynx1wwi4282lu
---
 .../account_analytic_analysis_view.xml             | 39 +++-------------------
 1 file changed, 4 insertions(+), 35 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 8d888527f28..bf451215578 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -4,30 +4,9 @@
 
         <!--
         Analytic Account form
+        -->
+
 
-        Remove information on Account data => because they move on analysis sheet
-        create a page with invoicing informations
-       
-        <record id="account_analytic_account_invoice_stat_form" model="ir.ui.view">
-            <field name="name">account.analytic.account.invoice.stat.form.inherit</field>
-            <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr_timesheet_invoice.account_analytic_account_form_form"/>
-            <field eval="18" name="priority"/>
-            <field name="arch" type="xml">
-                <group name="invoice_stats" position="inside">
-                    <field name="hours_qtt_non_invoiced" attrs="{'invisible': [('to_invoice','=',0)]}"/>
-                    <field name="ca_to_invoice" attrs="{'invisible': [('to_invoice','=',0)]}"/>
-                    <label string="" colspan="1"/>
-                    <button
-                        name="%(hr_timesheet_invoice.action_hr_timesheet_invoice_create_final)d"
-                        string="Create Invoice"
-                        type="action"
-                        attrs="{'readonly':[('ca_to_invoice','=',0.0)], 'invisible': [('to_invoice','=',0)]}"
-                        icon="gtk-go-forward"/>
-                </group>
-            </field>
-        </record> -->
         <act_window
             id="action_sales_order_line"
             name="Sales Order Lines"
@@ -78,7 +57,7 @@
                         <tr>
 			    <th class="oe_border_right">Invoice On Timesheets</th>
 			    <td><field name="invoice_on_timesheets" nolabel="1"/></td>
-			    <td><field class="oe_th_110px" name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+			    <td><field class="oe_th_110px" name="hours_qtt_est" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 			    <td class="oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 			    <td class="oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 			    <td class="oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
@@ -86,17 +65,7 @@
 			    <td><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 			    <td><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
                         </tr>
-                        <tr>
-			    <th class="oe_border_right">Charge Expenses</th>
-			    <td><field name="charge_expenses" nolabel="1"/></td>
-			    <td><field class="oe_th_110px" name="expense_max" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-			    <td class="oe_th_110px"><field name="expense_invoiced" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-			    <td class="oe_th_110px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-			    <td class="oe_th_110px"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-			    <td width="10px"></td>
-			    <td><button class= "oe_btn_width" name="open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-			    <td><button class= "oe_btn_width" name="hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                        </tr>
+                        <div name="end_of_tabl_hook"/>
                         <tr>
 			    <th class="oe_border_right">Total</th>
 			    <td width="10px"></td>
-- 
cgit v1.2.3


From d30d000ae3a74b73ecacb337291db616812a2f6c Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 8 Jun 2012 12:50:54 +0530
Subject: [IMP]:added icons on buttons.

bzr revid: apa@tinyerp.com-20120608072054-lrcr5jhnpg9jgyil
---
 .../account_analytic_analysis/account_analytic_analysis_view.xml  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index bf451215578..4a4c9a2004f 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -51,8 +51,8 @@
 			    <td class="oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
 			    <td class="oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
 			    <td width="10px"></td>
-			    <td><button class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-			    <td><button class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+			    <td><button icon="terp-check" class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+			    <td><button icon="terp-dolar_ok!" class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
                         </tr>
                         <tr>
 			    <th class="oe_border_right">Invoice On Timesheets</th>
@@ -62,8 +62,8 @@
 			    <td class="oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 			    <td class="oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 			    <td width="10px"></td>
-			    <td><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-			    <td><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+			    <td><button icon="terp-go-week" class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+			    <td><button icon="terp-dolar" class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
                         </tr>
                         <div name="end_of_tabl_hook"/>
                         <tr>
-- 
cgit v1.2.3


From 0400ae4047b8a4763a6ea6c37340de69169b1eb4 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 12 Jun 2012 15:00:20 +0530
Subject: [IMP]:pass the context parameter in onchange

bzr revid: apa@tinyerp.com-20120612093020-019ycc7wmn03gczz
---
 addons/account_analytic_analysis/account_analytic_analysis_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 4a4c9a2004f..1df015600b2 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -22,7 +22,7 @@
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
                 <xpath expr='//field[@name="type"]' position='after'>
-                    <field name="template_id" on_change="on_change_template(template_id)"  domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
+                    <field name="template_id" on_change="on_change_template(template_id,context)"  domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
                 </xpath>
                 <xpath expr='//field[@name="date"]' position="after">
                     <group col="6" colspan="2" class="oe_form_group_label_border">
-- 
cgit v1.2.3


From 2c1d31f4e57145d4be2a3ffc1eca23c62c504fff Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 12 Jun 2012 18:30:56 +0530
Subject: [IMP]improve view in contract

bzr revid: sgo@tinyerp.com-20120612130056-vjryu1lo5l9v5cq4
---
 .../account_analytic_analysis_view.xml             | 50 +++++++++++-----------
 1 file changed, 26 insertions(+), 24 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 4a4c9a2004f..91a312c138d 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -35,44 +35,46 @@
                         <tr>
 			    <th class="oe_th_160px" height="20px"></th>
 			    <th width="10px"></th>
-			    <th class="oe_th_110px">Est.Tot</th>
-			    <th class="oe_th_110px">Invoiced</th>
-			    <th class="oe_th_110px">Remaining</th>
+			    <th class="oe_th_90px">Est.Tot</th>
+			    <th class="oe_th_90px">Invoiced</th>
+			    <th class="oe_th_90px">Remaining</th>
 			    <th class="oe_th_110px">Ready To Invoice</th>
 			    <th width="10px"></th>
 			    <th></th>
 			    <th></th>
                         </tr>
                         <tr>
-			    <th class="oe_border_right">Fix Price Invoices</th>
-			    <td><field name="fix_price_invoices" nolabel="1"/></td>
-			    <td><field class="oe_th_110px" name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-			    <td class="oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-			    <td class="oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-			    <td class="oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-			    <td width="10px"></td>
-			    <td><button icon="terp-check" class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-			    <td><button icon="terp-dolar_ok!" class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+			    <th class="oe_th_160px oe_border_right">Fix Price Invoices</th>
+			    <td><field width="10px" name="fix_price_invoices" nolabel="1"/></td>
+			    <group attrs="{'invisible': [('fix_price_invoices','=',0)]}">
+    			    <td><field class="oe_th_90px" name="amount_max" nolabel="1" /></td>
+    			    <td ><field class="oe_th_90px" name="ca_invoiced" nolabel="1" /></td>
+    			    <td ><field class="oe_th_90px oe_border_right" name="remaining_ca" nolabel="1" /></td>
+    			    <td ><field class="oe_th_110px" name="ca_to_invoice" nolabel="1" /></td>
+    			    <td width="10px"></td>
+    			    <td><button icon="terp-check" class= "oe_btn_width_120px" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+    			    <td><button icon="terp-dolar_ok!" class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+			    </group>
                         </tr>
                         <tr>
-			    <th class="oe_border_right">Invoice On Timesheets</th>
-			    <td><field name="invoice_on_timesheets" nolabel="1"/></td>
-			    <td><field class="oe_th_110px" name="hours_qtt_est" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-			    <td class="oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-			    <td class="oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-			    <td class="oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+			    <th class="oe_th_160px oe_border_right">Invoice On Timesheets</th>
+			    <td><field width="10px" name="invoice_on_timesheets" nolabel="1"/></td>
+			    <td><field class="oe_th_90px" name="hours_qtt_est" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+			    <td ><field class="oe_th_90px" name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+			    <td ><field class="oe_th_90px oe_border_right" name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+			    <td ><field class="oe_th_110px" name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 			    <td width="10px"></td>
-			    <td><button icon="terp-go-week" class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+			    <td><button icon="terp-go-week" class= "oe_btn_width_120px" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 			    <td><button icon="terp-dolar" class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
                         </tr>
                         <div name="end_of_tabl_hook"/>
                         <tr>
-			    <th class="oe_border_right">Total</th>
+			    <th class="oe_th_160px oe_border_right">Total</th>
 			    <td width="10px"></td>
-			    <td class="oe_th_110px oe_border_top"><field name="est_total" nolabel="1"/></td>
-			    <td class="oe_th_110px oe_border_top"><field name="invoiced_total" nolabel="1"/></td>
-			    <td class="oe_th_110px oe_border_right oe_border_top"><field name="remaining_total" nolabel="1"/></td>
-			    <td class="oe_th_110px oe_border_top"><field name="toinvoice_total" nolabel="1"/></td>
+			    <td ><field class="oe_th_90px oe_border_top" name="est_total" nolabel="1"/></td>
+			    <td ><field class="oe_th_90px oe_border_top" name="invoiced_total" nolabel="1"/></td>
+			    <td ><field class="oe_th_90px oe_border_right oe_border_top" name="remaining_total" nolabel="1"/></td>
+			    <td ><field class="oe_th_110px oe_border_top" name="toinvoice_total" nolabel="1"/></td>
                         </tr>
                     </table>
                 </xpath>
-- 
cgit v1.2.3


From 0fd300caf4d114a2e5779afdf2a17438af6be688 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 13 Jun 2012 11:05:25 +0200
Subject: [IMP] account_analytic_analysis: the 'remaining hours to invoice' is
 different than the 'remaining hours to work'

bzr revid: qdp-launchpad@openerp.com-20120613090525-o5r4b84dfz5r2h6e
---
 addons/account_analytic_analysis/account_analytic_analysis_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 1df015600b2..74a3e4f2665 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -59,7 +59,7 @@
 			    <td><field name="invoice_on_timesheets" nolabel="1"/></td>
 			    <td><field class="oe_th_110px" name="hours_qtt_est" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 			    <td class="oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-			    <td class="oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+			    <td class="oe_th_110px oe_border_right"><field name="remaining_hours_to_invoice" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 			    <td class="oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 			    <td width="10px"></td>
 			    <td><button icon="terp-go-week" class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-- 
cgit v1.2.3


From 56ffb32517c4041ddc46b4762aac83687c3591c2 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 14 Jun 2012 15:37:53 +0530
Subject: [IMP]:contract,analytic_project,analytic_hr_expense: improve whole
 contract view use group instead of table and improve view

bzr revid: sgo@tinyerp.com-20120614100753-giewe8jay1xx04wb
---
 .../account_analytic_analysis_view.xml             | 96 +++++++++++-----------
 1 file changed, 48 insertions(+), 48 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 91a312c138d..d7249131d5b 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -29,55 +29,55 @@
                         <field name="quantity_max"/><label string="/"/> <label string="Remaining"/> <field name="remaining_hours" nolabel="1"/>
                     </group>
                 </xpath>
-                <xpath expr='//field[@name="pricelist_id"]' position='before'>
+                <xpath expr='//group[@name="toinvoice"]' position='before'>
                     <separator colspan="4" string="Invoicing" name="invoicing"/>
-                    <table border="0" colspan="4">
-                        <tr>
-			    <th class="oe_th_160px" height="20px"></th>
-			    <th width="10px"></th>
-			    <th class="oe_th_90px">Est.Tot</th>
-			    <th class="oe_th_90px">Invoiced</th>
-			    <th class="oe_th_90px">Remaining</th>
-			    <th class="oe_th_110px">Ready To Invoice</th>
-			    <th width="10px"></th>
-			    <th></th>
-			    <th></th>
-                        </tr>
-                        <tr>
-			    <th class="oe_th_160px oe_border_right">Fix Price Invoices</th>
-			    <td><field width="10px" name="fix_price_invoices" nolabel="1"/></td>
-			    <group attrs="{'invisible': [('fix_price_invoices','=',0)]}">
-    			    <td><field class="oe_th_90px" name="amount_max" nolabel="1" /></td>
-    			    <td ><field class="oe_th_90px" name="ca_invoiced" nolabel="1" /></td>
-    			    <td ><field class="oe_th_90px oe_border_right" name="remaining_ca" nolabel="1" /></td>
-    			    <td ><field class="oe_th_110px" name="ca_to_invoice" nolabel="1" /></td>
-    			    <td width="10px"></td>
-    			    <td><button icon="terp-check" class= "oe_btn_width_120px" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-    			    <td><button icon="terp-dolar_ok!" class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-			    </group>
-                        </tr>
-                        <tr>
-			    <th class="oe_th_160px oe_border_right">Invoice On Timesheets</th>
-			    <td><field width="10px" name="invoice_on_timesheets" nolabel="1"/></td>
-			    <td><field class="oe_th_90px" name="hours_qtt_est" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-			    <td ><field class="oe_th_90px" name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-			    <td ><field class="oe_th_90px oe_border_right" name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-			    <td ><field class="oe_th_110px" name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-			    <td width="10px"></td>
-			    <td><button icon="terp-go-week" class= "oe_btn_width_120px" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-			    <td><button icon="terp-dolar" class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                        </tr>
-                        <div name="end_of_tabl_hook"/>
-                        <tr>
-			    <th class="oe_th_160px oe_border_right">Total</th>
-			    <td width="10px"></td>
-			    <td ><field class="oe_th_90px oe_border_top" name="est_total" nolabel="1"/></td>
-			    <td ><field class="oe_th_90px oe_border_top" name="invoiced_total" nolabel="1"/></td>
-			    <td ><field class="oe_th_90px oe_border_right oe_border_top" name="remaining_total" nolabel="1"/></td>
-			    <td ><field class="oe_th_110px oe_border_top" name="toinvoice_total" nolabel="1"/></td>
-                        </tr>
-                    </table>
-                </xpath>
+                    <group colspan="4" col="6">
+                        <!-- header -->
+                        <div class="oe_field_label" colspan="2"/>
+                        <group colspan="4" col="6">
+                            <div class="oe_field_label_bold">Est.Tot</div>
+                            <div class="oe_field_label_bold">Invoiced</div>
+                            <div class="oe_field_label_bold">Remaining</div>
+                            <div class="oe_field_label_bold">To Invoice</div>
+                            <div class="oe_btn_width_small"/>
+                            <div class="oe_btn_width"/>
+                        </group>
+                        
+                        <!-- center -->
+                        
+                        <field class="oe_field_label" name="fix_price_invoices" />
+                        <group colspan="4" col="6" attrs="{'invisible': [('fix_price_invoices','=',False)]}">
+                            <field class="oe_float_field" name="amount_max" nolabel="1"   />
+                            <field class="oe_float_field" name="ca_invoiced" nolabel="1"   />
+                            <field class="oe_float_field" name="remaining_ca" nolabel="1"   />
+                            <field class="oe_float_field" name="ca_to_invoice" nolabel="1"   />
+                            <div><button class="oe_btn_width_small" icon="terp-check" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}"/></div>
+                            <div><button class="oe_btn_width" icon="terp-dolar_ok!" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}"/></div>
+                        </group>
+                        
+                        <field class="oe_field_label" name="invoice_on_timesheets"/>
+                         <group colspan="4" col="6" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
+                            <field class="oe_float_field" name="hours_qtt_est" nolabel="1" />
+                            <field class="oe_float_field" name="hours_qtt_invoiced" nolabel="1"/>
+                            <field class="oe_float_field" name="remaining_hours" nolabel="1" />
+                            <field class="oe_float_field" name="hours_qtt_non_invoiced" nolabel="1" />
+                            <div><button class="oe_btn_width_small" icon="terp-go-week" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" /></div>
+                            <div><button class="oe_btn_width" icon="terp-dolar" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action"/></div>
+                        </group>
+                        
+                        <!-- footer -->
+                        
+                        <div name="total" class="oe_field_label" style="max-width:200px;" colspan="2">Total  </div>
+                        <group colspan="4" col="6" >
+                            <field name="est_total" nolabel="1" class="oe_float_field oe_border_top"/>
+                            <field name="invoiced_total" nolabel="1" class="oe_float_field oe_border_top"/>
+                            <field name="remaining_total" nolabel="1" class="oe_float_field oe_border_top"/>
+                            <field name="toinvoice_total" nolabel="1" class="oe_float_field oe_border_top"/>
+                            <div class="oe_btn_width_small"/>
+                            <div class="oe_btn_width"/>
+                        </group>
+                      </group>
+                 </xpath>
             </field>
         </record>
 
-- 
cgit v1.2.3


From 66c3093feef8df9c21f34fa1aea402087dd3c7ea Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 10:12:54 +0200
Subject: [IMP] contract management: misc improvements

bzr revid: qdp-launchpad@openerp.com-20120615081254-rhh9nwmz3bqn7e9d
---
 .../account_analytic_analysis_view.xml             | 29 +++++++---------------
 1 file changed, 9 insertions(+), 20 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 7dd9b13b4d3..9ab7234b7a1 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -23,23 +23,14 @@
                 <xpath expr='//field[@name="type"]' position='after'>
                     <field name="template_id" on_change="on_change_template(template_id,context)"  domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
                 </xpath>
-                <xpath expr='//field[@name="date"]' position="after">
-                    <group col="6" colspan="2" class="oe_form_group_label_border">
-                        <field name="quantity_max"/><label string="/"/> <label string="Remaining"/> <field name="remaining_hours" nolabel="1"/>
-                    </group>
+                <xpath expr='//field[@name="date"]' position="after" version="7.0">
+                    <field name="quantity_max" class="oe_form_inline"/> / Remaining
+                    <field name="remaining_hours" class="oe_form_inline"/>
                 </xpath>
-				<xpath expr='//group[@name="toinvoice"]' position='replace'>
-					<group class="oe_form_group_label_border" name="toinvoice" col="4" colspan="4" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
-						<field name="pricelist_id"/>
-						<field name="to_invoice"/>
-					</group>
-				</xpath>
-                <xpath expr='//group[@name="toinvoice"]' position='before'>
-                    <separator colspan="4" string="Invoicing" name="invoicing"/>
+                <xpath expr='//group[@name="toinvoice"]' position='replace'>
+                    <group name="toinvoice" string="Invoicing" colspan="4">
+                        <div class="oe_field_label" />
                     <group colspan="4" col="6">
-                        <!-- header -->
-                        <div class="oe_field_label" colspan="2"/>
-                        <group colspan="4" col="6">
                             <div class="oe_field_label_bold">Est.Tot</div>
                             <div class="oe_field_label_bold">Invoiced</div>
                             <div class="oe_field_label_bold">Remaining</div>
@@ -48,9 +39,7 @@
                             <div class="oe_btn_width"/>
                         </group>
                         
-                        <!-- center -->
-                        <!--<group class="oe_group">-->
-                        <field class="oe_field_label" name="fix_price_invoices" />
+                -        <field class="oe_field_label" name="fix_price_invoices" />
                         <group colspan="4" col="6" attrs="{'invisible': [('fix_price_invoices','=',False)]}">
                             <field class="oe_float_field" name="amount_max" nolabel="1"   />
                             <field class="oe_float_field" name="ca_invoiced" nolabel="1"   />
@@ -70,7 +59,6 @@
                             <div><button class="oe_btn_width" icon="terp-dolar" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action"/></div>
                         </group>
                         
-                        <!-- footer -->
                         
                         <div name="total" class="oe_field_label" colspan="2">Total  </div>
                         <group colspan="4" col="6" >
@@ -81,7 +69,8 @@
                             <div class="oe_btn_width_small"/>
                             <div class="oe_btn_width"/>
                         </group>
-						<!--</group>-->
+                        <field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                        <field name="to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                       </group>
                  </xpath>
             </field>
-- 
cgit v1.2.3


From df29917965e635db681b9f20ddcb529d15ca1cc8 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 15 Jun 2012 10:44:24 +0200
Subject: [IMP] change

bzr revid: fp@tinyerp.com-20120615084424-fkbi7gg98erdf8fg
---
 .../account_analytic_analysis_view.xml             | 114 ++++++++++++---------
 1 file changed, 68 insertions(+), 46 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 9ab7234b7a1..011d9741692 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -24,53 +24,75 @@
                     <field name="template_id" on_change="on_change_template(template_id,context)"  domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
                 </xpath>
                 <xpath expr='//field[@name="date"]' position="after" version="7.0">
-                    <field name="quantity_max" class="oe_form_inline"/> / Remaining
-                    <field name="remaining_hours" class="oe_form_inline"/>
+                    <label for="quantity_max"/>
+                    <div>
+                        <field name="quantity_max" class="oe_form_inline"/> / Remaining:
+                        <field name="remaining_hours" class="oe_form_inline"/>
+                    </div>
                 </xpath>
-                <xpath expr='//group[@name="toinvoice"]' position='replace'>
-                    <group name="toinvoice" string="Invoicing" colspan="4">
-                        <div class="oe_field_label" />
-                    <group colspan="4" col="6">
-                            <div class="oe_field_label_bold">Est.Tot</div>
-                            <div class="oe_field_label_bold">Invoiced</div>
-                            <div class="oe_field_label_bold">Remaining</div>
-                            <div class="oe_field_label_bold">To Invoice</div>
-                            <div class="oe_btn_width_small"/>
-                            <div class="oe_btn_width"/>
-                        </group>
-                        
-                -        <field class="oe_field_label" name="fix_price_invoices" />
-                        <group colspan="4" col="6" attrs="{'invisible': [('fix_price_invoices','=',False)]}">
-                            <field class="oe_float_field" name="amount_max" nolabel="1"   />
-                            <field class="oe_float_field" name="ca_invoiced" nolabel="1"   />
-                            <field class="oe_float_field" name="remaining_ca" nolabel="1"   />
-                            <field class="oe_float_field" name="ca_to_invoice" nolabel="1"   />
-                            <div><button class="oe_btn_width_small" icon="terp-check" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}"/></div>
-                            <div><button class="oe_btn_width" icon="terp-dolar_ok!" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}"/></div>
-                        </group>
-                        
-                        <field class="oe_field_label" name="invoice_on_timesheets"/>
-                         <group colspan="4" col="6" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
-                            <field class="oe_float_field" name="hours_qtt_est" nolabel="1" />
-                            <field class="oe_float_field" name="hours_qtt_invoiced" nolabel="1"/>
-                            <field class="oe_float_field" name="remaining_hours_to_invoice" nolabel="1" />
-                            <field class="oe_float_field" name="hours_qtt_non_invoiced" nolabel="1" />
-                            <div><button class="oe_btn_width_small" icon="terp-go-week" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" /></div>
-                            <div><button class="oe_btn_width" icon="terp-dolar" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action"/></div>
-                        </group>
-                        
-                        
-                        <div name="total" class="oe_field_label" colspan="2">Total  </div>
-                        <group colspan="4" col="6" >
-                            <field name="est_total" nolabel="1" class="oe_field_label_bold oe_border_top"/>
-                            <field name="invoiced_total" nolabel="1" class="oe_field_label_bold oe_border_top"/>
-                            <field name="remaining_total" nolabel="1" class="oe_field_label_bold oe_border_top"/>
-                            <field name="toinvoice_total" nolabel="1" class="oe_field_label_bold oe_border_top"/>
-                            <div class="oe_btn_width_small"/>
-                            <div class="oe_btn_width"/>
-                        </group>
-                        <field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                        <field name="to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                <xpath expr='//group[@name="master"]' position='after'>
+                    <separator name="toinvoice" string="Invoicing">
+                    <table>
+                        <tr>
+                            <th></th>
+                            <th></th>
+                            <th><label string="Est.Tot"/></th>
+                            <th><label string="Invoiced"/></th>
+                            <th><label string="Remaining"/></th>
+                            <th><label string="To Invoice"/></th>
+                            <th></th>
+                        </tr><tr>
+                            <td>
+                                <label for="fix_price_invoices"/>
+                            </td><td>
+                                <field for="fix_price_invoices"/>
+                            </td><td>
+                                <field class="oe_float_field" name="amount_max"   />
+                            </td><td>
+                                <field class="oe_float_field" name="ca_invoiced"   />
+                            </td><td>
+                                <field class="oe_float_field" name="remaining_ca"   />
+                            </td><td>
+                                <field class="oe_float_field" name="ca_to_invoice"   />
+                            </td><td>
+                                <button class="oe_btn_width_small" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}"/>
+                                <button class="oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}"/>
+                        </tr><tr>
+                            <td>
+                                <label for="invoice_on_timesheets"/>
+                            </td><td>
+                                <field for="invoice_on_timesheets"/>
+                            </td><td>
+                                <field class="oe_float_field" name="hours_qtt_est"  attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_float_field" name="hours_qtt_invoiced"/>
+                            </td><td>
+                                <field class="oe_float_field" name="remaining_hours_to_invoice" />
+                            </td><td>
+                                <field class="oe_float_field" name="hours_qtt_non_invoiced" />
+                            </td><td>
+                                <button class="oe_btn_width_small" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" />
+                                <button class="oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action"/>
+                            </td>
+                        </tr><tr>
+                            <td>
+                                <label string="Total"/>
+                            </td><td>
+                            </td><td>
+                                <field name="est_total" class="oe_field_label_bold oe_border_top" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td><td>
+                                <field name="invoiced_total" class="oe_field_label_bold oe_border_top"/>
+                            </td><td>
+                                <field name="remaining_total" class="oe_field_label_bold oe_border_top"/>
+                            </td><td>
+                                <field name="toinvoice_total" class="oe_field_label_bold oe_border_top"/>
+                            </td><td>
+                            </td>
+                        </tr>
+                    </table>
+                      <group col="4" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
+                        <field name="pricelist_id"/>
+                        <field name="to_invoice"/>
                       </group>
                  </xpath>
             </field>
-- 
cgit v1.2.3


From 522f48a3ee3fcb12a87f94f974956cbd6e115221 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 10:49:44 +0200
Subject: [FIX] account_analytic_anlysis: fixed tag mismatch

bzr revid: qdp-launchpad@openerp.com-20120615084944-53o2ko3nsi5r7m17
---
 .../account_analytic_analysis/account_analytic_analysis_view.xml  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 011d9741692..63ba4c01f91 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -31,7 +31,7 @@
                     </div>
                 </xpath>
                 <xpath expr='//group[@name="master"]' position='after'>
-                    <separator name="toinvoice" string="Invoicing">
+                    <separator name="toinvoice" string="Invoicing"/>
                     <table>
                         <tr>
                             <th></th>
@@ -45,7 +45,7 @@
                             <td>
                                 <label for="fix_price_invoices"/>
                             </td><td>
-                                <field for="fix_price_invoices"/>
+                                <field name="fix_price_invoices"/>
                             </td><td>
                                 <field class="oe_float_field" name="amount_max"   />
                             </td><td>
@@ -56,12 +56,12 @@
                                 <field class="oe_float_field" name="ca_to_invoice"   />
                             </td><td>
                                 <button class="oe_btn_width_small" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}"/>
-                                <button class="oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}"/>
+                                <button class="oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}"/></td>
                         </tr><tr>
                             <td>
                                 <label for="invoice_on_timesheets"/>
                             </td><td>
-                                <field for="invoice_on_timesheets"/>
+                                <field name="invoice_on_timesheets"/>
                             </td><td>
                                 <field class="oe_float_field" name="hours_qtt_est"  attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
-- 
cgit v1.2.3


From 24bef785975fc9bcc724eec253f6b20f7dd9fdc6 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 10:57:06 +0200
Subject: [FIX] account_analytic_anlysis: fixed view inheritancies

bzr revid: qdp-launchpad@openerp.com-20120615085706-eshlyfxh3wbotq6t
---
 addons/account_analytic_analysis/account_analytic_analysis_view.xml | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 63ba4c01f91..06e7cc9c1e4 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -90,10 +90,6 @@
                             </td>
                         </tr>
                     </table>
-                      <group col="4" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
-                        <field name="pricelist_id"/>
-                        <field name="to_invoice"/>
-                      </group>
                  </xpath>
             </field>
         </record>
-- 
cgit v1.2.3


From 79616c6efd5a0fe71dd5e4aa507bfd9dca210c28 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 11:07:38 +0200
Subject: [IMP] account_analytic_analysis: view cleanup

bzr revid: qdp-launchpad@openerp.com-20120615090738-vo37gv277qxob3io
---
 .../account_analytic_analysis_view.xml             | 40 +++++++++++-----------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 06e7cc9c1e4..ad284ae46bc 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -32,7 +32,7 @@
                 </xpath>
                 <xpath expr='//group[@name="master"]' position='after'>
                     <separator name="toinvoice" string="Invoicing"/>
-                    <table>
+                    <table width="100%%">
                         <tr>
                             <th></th>
                             <th></th>
@@ -45,47 +45,47 @@
                             <td>
                                 <label for="fix_price_invoices"/>
                             </td><td>
-                                <field name="fix_price_invoices"/>
+                                <field name="fix_price_invoices" class="oe_form_inline"/>
                             </td><td>
-                                <field class="oe_float_field" name="amount_max"   />
+                                <field class="oe_form_inline" name="amount_max"   />
                             </td><td>
-                                <field class="oe_float_field" name="ca_invoiced"   />
+                                <field class="oe_form_inline" name="ca_invoiced"   />
                             </td><td>
-                                <field class="oe_float_field" name="remaining_ca"   />
+                                <field class="oe_form_inline" name="remaining_ca"   />
                             </td><td>
-                                <field class="oe_float_field" name="ca_to_invoice"   />
+                                <field class="oe_form_inline" name="ca_to_invoice"   />
                             </td><td>
-                                <button class="oe_btn_width_small" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}"/>
-                                <button class="oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}"/></td>
+                                <button name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}"/>
+                                <button name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}"/></td>
                         </tr><tr>
                             <td>
                                 <label for="invoice_on_timesheets"/>
                             </td><td>
                                 <field name="invoice_on_timesheets"/>
                             </td><td>
-                                <field class="oe_float_field" name="hours_qtt_est"  attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                <field class="oe_form_inline" name="hours_qtt_est"  attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
-                                <field class="oe_float_field" name="hours_qtt_invoiced"/>
+                                <field class="oe_form_inline" name="hours_qtt_invoiced"/>
                             </td><td>
-                                <field class="oe_float_field" name="remaining_hours_to_invoice" />
+                                <field class="oe_form_inline" name="remaining_hours_to_invoice" />
                             </td><td>
-                                <field class="oe_float_field" name="hours_qtt_non_invoiced" />
+                                <field class="oe_form_inline" name="hours_qtt_non_invoiced" />
                             </td><td>
-                                <button class="oe_btn_width_small" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" />
-                                <button class="oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action"/>
+                                <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" />
+                                <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action"/>
                             </td>
                         </tr><tr>
-                            <td>
+                            <th>
                                 <label string="Total"/>
+                            </th><td>
                             </td><td>
+                                <field name="est_total" class="oe_form_inline" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
-                                <field name="est_total" class="oe_field_label_bold oe_border_top" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td>
-                                <field name="invoiced_total" class="oe_field_label_bold oe_border_top"/>
+                                <field name="invoiced_total" class="oe_form_inline"/>
                             </td><td>
-                                <field name="remaining_total" class="oe_field_label_bold oe_border_top"/>
+                                <field name="remaining_total" class="oe_form_inline"/>
                             </td><td>
-                                <field name="toinvoice_total" class="oe_field_label_bold oe_border_top"/>
+                                <field name="toinvoice_total" class="oe_form_inline"/>
                             </td><td>
                             </td>
                         </tr>
-- 
cgit v1.2.3


From 35b9881553f30490ddbb16118652172d854a763d Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 11:31:44 +0200
Subject: [IMP] account_analytic_analysis: attrs on cells

bzr revid: qdp-launchpad@openerp.com-20120615093144-v9p23b24ox871148
---
 .../account_analytic_analysis_view.xml             | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index ad284ae46bc..e4e4deecc39 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -12,7 +12,7 @@
             res_model="sale.order.line"
             src_model="account.analytic.account"
             />
-            
+
         <record id="account_analytic_account_form_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form.inherit</field>
             <field name="model">account.analytic.account</field>
@@ -47,32 +47,32 @@
                             </td><td>
                                 <field name="fix_price_invoices" class="oe_form_inline"/>
                             </td><td>
-                                <field class="oe_form_inline" name="amount_max"   />
+                                <field class="oe_form_inline" name="amount_max" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="ca_invoiced"   />
+                                <field class="oe_form_inline" name="ca_invoiced" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="remaining_ca"   />
+                                <field class="oe_form_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="ca_to_invoice"   />
+                                <field class="oe_form_inline" name="ca_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
-                                <button name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}"/>
-                                <button name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}"/></td>
-                        </tr><tr>
+                                <button name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                <button name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/></td>
+                        </tr><tr attrs="{'invisible':[('use_timesheets','=',False)]}">
                             <td>
                                 <label for="invoice_on_timesheets"/>
                             </td><td>
                                 <field name="invoice_on_timesheets"/>
                             </td><td>
-                                <field class="oe_form_inline" name="hours_qtt_est"  attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                <field class="oe_form_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="hours_qtt_invoiced"/>
+                                <field class="oe_form_inline" name="hours_qtt_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="remaining_hours_to_invoice" />
+                                <field class="oe_form_inline" name="remaining_hours_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="hours_qtt_non_invoiced" />
+                                <field class="oe_form_inline" name="hours_qtt_non_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
-                                <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" />
-                                <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action"/>
+                                <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                                <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td>
                         </tr><tr>
                             <th>
-- 
cgit v1.2.3


From 24e1e04e1d8d0858b7d91e39565bba72b8a2021e Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 11:38:45 +0200
Subject: [IMP] account_analytic_analysis: usability imp

bzr revid: qdp-launchpad@openerp.com-20120615093845-eqh9k27iy3je59ot
---
 .../account_analytic_analysis/account_analytic_analysis_view.xml  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index e4e4deecc39..f02e6c88950 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -18,7 +18,7 @@
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
-            <field eval="18" name="priority"/>
+            <field eval="40" name="priority"/>
             <field name="arch" type="xml">
                 <xpath expr='//field[@name="type"]' position='after'>
                     <field name="template_id" on_change="on_change_template(template_id,context)"  domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
@@ -30,6 +30,12 @@
                         <field name="remaining_hours" class="oe_form_inline"/>
                     </div>
                 </xpath>
+                <xpath expr='//field[@name="pricelist_id"]' position='replace'>
+                    <field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                 </xpath>
+                <xpath expr='//field[@name="to_invoice"]' position='replace'>
+                    <field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                 </xpath>
                 <xpath expr='//group[@name="master"]' position='after'>
                     <separator name="toinvoice" string="Invoicing"/>
                     <table width="100%%">
-- 
cgit v1.2.3


From b6b21eb8117402ec1acf611fb07244db44901d1e Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 12:24:54 +0200
Subject: [IMP] account_analytic_account: shortcut buttons

bzr revid: qdp-launchpad@openerp.com-20120615102454-160481ggnhdhnsdq
---
 .../account_analytic_analysis_view.xml                         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index f02e6c88950..1fe2d82cf93 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -7,9 +7,9 @@
         -->
 
         <act_window
-            id="action_sales_order_line"
+            id="action_sales_order"
             name="Sales Order Lines"
-            res_model="sale.order.line"
+            res_model="sale.order"
             src_model="account.analytic.account"
             />
 
@@ -61,7 +61,7 @@
                             </td><td>
                                 <field class="oe_form_inline" name="ca_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
-                                <button name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                <button name="%(action_sales_order)d" string="All Sales" type="action" context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                                 <button name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/></td>
                         </tr><tr attrs="{'invisible':[('use_timesheets','=',False)]}">
                             <td>
@@ -77,8 +77,8 @@
                             </td><td>
                                 <field class="oe_form_inline" name="hours_qtt_non_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
-                                <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                                <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                                <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="All Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                                <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Timesheets to Invoice" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td>
                         </tr><tr>
                             <th>
-- 
cgit v1.2.3


From 56ef1d6dc2b8db12abce24a7f2c6401b1ee19f88 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 15 Jun 2012 17:55:48 +0530
Subject: [IMP]:pass context in timeshee

bzr revid: apa@tinyerp.com-20120615122548-725vywhybv413a34
---
 addons/account_analytic_analysis/account_analytic_analysis_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 1fe2d82cf93..f58b933f1e3 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -77,7 +77,7 @@
                             </td><td>
                                 <field class="oe_form_inline" name="hours_qtt_non_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
-                                <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="All Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                                <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="All Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" context="{'default_account_id': active_id,'search_default_account_id': active_id}"/>
                                 <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Timesheets to Invoice" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td>
                         </tr><tr>
-- 
cgit v1.2.3


From 41f2eba9fb2b1b8ca7bd90cee1f8c35ac237112c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 15:10:56 +0200
Subject: [IMP] contract management: misc code cleaning and improvements

bzr revid: qdp-launchpad@openerp.com-20120615131056-swbbcy7obbbjjo33
---
 addons/account_analytic_analysis/account_analytic_analysis_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index f58b933f1e3..da6618f490d 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -138,6 +138,6 @@
             <field name="domain">[('type','=','template')]</field>
             <field name="context">{'search_default_type':'template','default_type' : 'template'}</field>
         </record>
-        <menuitem action="template_of_contract_action" id="menu_template_of_contract_action" parent="base.menu_base_config" />
+        <menuitem action="template_of_contract_action" id="menu_template_of_contract_action" parent="base.menu_base_config"/>
     </data>
 </openerp>
-- 
cgit v1.2.3


From b9cbfb9a98b5b1187d92ca5b0f8e5d2d60017d3e Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 15 Jun 2012 19:06:39 +0530
Subject: [IMP]:improved sale to invoice

bzr revid: apa@tinyerp.com-20120615133639-aarxp5rn5ovirjug
---
 .../account_analytic_analysis/account_analytic_analysis_view.xml  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index da6618f490d..71958b02ddc 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -8,10 +8,10 @@
 
         <act_window
             id="action_sales_order"
-            name="Sales Order Lines"
+            name="Sales Orders"
             res_model="sale.order"
             src_model="account.analytic.account"
-            />
+        />
 
         <record id="account_analytic_account_form_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form.inherit</field>
@@ -61,8 +61,8 @@
                             </td><td>
                                 <field class="oe_form_inline" name="ca_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
-                                <button name="%(action_sales_order)d" string="All Sales" type="action" context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                                <button name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/></td>
+                                <button name="%(action_sales_order)d" string="All Sales" type="action" context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                <button name="open_sale_order_lines" string="Lines To Invoice" type="object" context="{'default_partner_id': [partner_id],'default_project_id': active_id,'search_default_uninvoiced': 1,'search_default_project_id': active_id,'search_default_partner_id': [partner_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/></td>
                         </tr><tr attrs="{'invisible':[('use_timesheets','=',False)]}">
                             <td>
                                 <label for="invoice_on_timesheets"/>
-- 
cgit v1.2.3


From a1467226e9846b36d0a928a359f380ed70718c95 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 18 Jun 2012 17:59:30 +0530
Subject: [IMP]:improved view for charge expenses

bzr revid: apa@tinyerp.com-20120618122930-9j53nfnc2n7vmmrw
---
 addons/account_analytic_analysis/account_analytic_analysis_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 71958b02ddc..b1693d03d17 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -80,7 +80,7 @@
                                 <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="All Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" context="{'default_account_id': active_id,'search_default_account_id': active_id}"/>
                                 <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Timesheets to Invoice" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td>
-                        </tr><tr>
+                        </tr><tr name='total'>
                             <th>
                                 <label string="Total"/>
                             </th><td>
-- 
cgit v1.2.3


From 7d7ba1515b79aff031812048f93b18fbb5fcb88c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 18 Jun 2012 15:10:22 +0200
Subject: [FIX] account_analytic_analysis: fixed amounts in billing table +
 [FIX] hr_timesheet_invoice: fixed filter 'to_invoice'

bzr revid: qdp-launchpad@openerp.com-20120618131022-a0sacqmlftg5wm22
---
 addons/account_analytic_analysis/account_analytic_analysis_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index b1693d03d17..58d74680ae9 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -59,7 +59,7 @@
                             </td><td>
                                 <field class="oe_form_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="ca_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                <field class="oe_form_inline" name="fix_price_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
                                 <button name="%(action_sales_order)d" string="All Sales" type="action" context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                                 <button name="open_sale_order_lines" string="Lines To Invoice" type="object" context="{'default_partner_id': [partner_id],'default_project_id': active_id,'search_default_uninvoiced': 1,'search_default_project_id': active_id,'search_default_partner_id': [partner_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/></td>
@@ -71,11 +71,11 @@
                             </td><td>
                                 <field class="oe_form_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="hours_qtt_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                                <field class="oe_form_inline" name="timesheet_ca_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
                                 <field class="oe_form_inline" name="remaining_hours_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="hours_qtt_non_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                                <field class="oe_form_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
                                 <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="All Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" context="{'default_account_id': active_id,'search_default_account_id': active_id}"/>
                                 <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Timesheets to Invoice" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-- 
cgit v1.2.3


From 015f03776e03384cfa6fe477ef51ef26896a4178 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 19 Jun 2012 14:21:28 +0200
Subject: [IMP] contract management: improved usability, mostly in
 account.analytic.account form view

bzr revid: qdp-launchpad@openerp.com-20120619122128-axj9zn61ahalgg98
---
 .../account_analytic_analysis_view.xml             | 32 ++++++----------------
 1 file changed, 8 insertions(+), 24 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 58d74680ae9..a607643f1ec 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -30,12 +30,12 @@
                         <field name="remaining_hours" class="oe_form_inline"/>
                     </div>
                 </xpath>
-                <xpath expr='//field[@name="pricelist_id"]' position='replace'>
-                    <field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                 </xpath>
-                <xpath expr='//field[@name="to_invoice"]' position='replace'>
-                    <field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                 </xpath>
+                <xpath expr='//group[@name="invoice_on_timesheets"]' position="replace">
+                    <group name='invoice_on_timesheets' string="Invoice on Timesheets Options" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" col="4">
+                        <field name="pricelist_id" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                        <field name="to_invoice" widget="selection" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                    </group>
+                </xpath>
                 <xpath expr='//group[@name="master"]' position='after'>
                     <separator name="toinvoice" string="Invoicing"/>
                     <table width="100%%">
@@ -100,22 +100,6 @@
             </field>
         </record>
 
-        <!-- Add information on Account analytic list for the project management -->
-        <record id="view_account_analytic_account_tree_c2c_2" model="ir.ui.view">
-            <field name="name">account.analytic.account.tree</field>
-            <field name="model">account.analytic.account</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_list"/>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <field name="quantity" position="replace">
-                    <field name="hours_quantity"/>
-                    <field name="hours_qtt_non_invoiced"/>
-                    <field name="remaining_hours"/>
-                    <field name="quantity_max"/>
-                </field>
-            </field>
-        </record>
-
         <record id="view_account_analytic_account_tree_c2c_3" model="ir.ui.view">
             <field name="name">account.analytic.account.tree</field>
             <field name="model">account.analytic.account</field>
@@ -124,11 +108,11 @@
             <field name="arch" type="xml">
                 <field name="date" position="before">
                     <field name="last_invoice_date"/>
-                    <field name="ca_to_invoice"/>
+                    <field name="toinvoice_total"/>
                 </field>
             </field>
         </record>
-        
+
         <record id="template_of_contract_action" model="ir.actions.act_window">
             <field name="name">Template of Contract</field>
             <field name="type">ir.actions.act_window</field>
-- 
cgit v1.2.3


From 95cd61d1f560885bf3161ed49c9779e172fe8643 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 22 Jun 2012 14:40:08 +0530
Subject: [IMP]improve view of contract and open chatter notification added
 when state changed

bzr revid: sgo@tinyerp.com-20120622091008-uy805uph0hz4vk0h
---
 addons/account_analytic_analysis/account_analytic_analysis_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index a607643f1ec..70f4d49440f 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -23,7 +23,7 @@
                 <xpath expr='//field[@name="type"]' position='after'>
                     <field name="template_id" on_change="on_change_template(template_id,context)"  domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
                 </xpath>
-                <xpath expr='//field[@name="date"]' position="after" version="7.0">
+                <xpath expr='//div[@name="duration"]' position="after" version="7.0">
                     <label for="quantity_max"/>
                     <div>
                         <field name="quantity_max" class="oe_form_inline"/> / Remaining:
-- 
cgit v1.2.3


From 352e054068d74c296475c285361964bfb86b4e32 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 25 Jun 2012 10:37:53 +0530
Subject: [IMP]change the place of fields for better view and add note for
 details

bzr revid: sgo@tinyerp.com-20120625050753-lhe0p8xnp5r2g6zp
---
 .../account_analytic_analysis_view.xml                    | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 70f4d49440f..cc1d674ca0a 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -30,14 +30,21 @@
                         <field name="remaining_hours" class="oe_form_inline"/>
                     </div>
                 </xpath>
-                <xpath expr='//group[@name="invoice_on_timesheets"]' position="replace">
-                    <group name='invoice_on_timesheets' string="Invoice on Timesheets Options" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" col="4">
-                        <field name="pricelist_id" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
-                        <field name="to_invoice" widget="selection" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                 <xpath expr="//field[@name='use_timesheets']" position="replace">
+                    <group colspan="2" col="4">
+                        <field name="use_timesheets" on_change="on_change_use_timesheets(use_timesheets, context)"/>
+                        <field name="to_invoice" attrs="{'required': [('invoice_on_timesheets', '=', True)],'invisible': [('invoice_on_timesheets','=',False)]}"/>
                     </group>
                 </xpath>
+                <xpath expr="//group[@name='invoice_on_timesheets']" position="replace"/>
                 <xpath expr='//group[@name="master"]' position='after'>
                     <separator name="toinvoice" string="Invoicing"/>
+                    <group>
+                        <group>
+                            <field name="pricelist_id" attrs="{'required': [('invoice_on_timesheets', '=', True)],'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                        </group>
+                        <group></group>
+                    </group>
                     <table width="100%%">
                         <tr>
                             <th></th>
-- 
cgit v1.2.3


From ea842f4554b41c7f8cadf250480ba364c25f7927 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 25 Jun 2012 17:55:40 +0200
Subject: [REF] code review

bzr revid: qdp-launchpad@openerp.com-20120625155540-n0e5lm0rhytsk22t
---
 .../account_analytic_analysis_view.xml                 | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index cc1d674ca0a..be7af1d4139 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -26,25 +26,17 @@
                 <xpath expr='//div[@name="duration"]' position="after" version="7.0">
                     <label for="quantity_max"/>
                     <div>
-                        <field name="quantity_max" class="oe_form_inline"/> / Remaining:
-                        <field name="remaining_hours" class="oe_form_inline"/>
+                        <field name="quantity_max" class="oe_form_inline"/> / Remaining: <field name="remaining_hours" class="oe_form_inline"/>
                     </div>
                 </xpath>
-                 <xpath expr="//field[@name='use_timesheets']" position="replace">
-                    <group colspan="2" col="4">
-                        <field name="use_timesheets" on_change="on_change_use_timesheets(use_timesheets, context)"/>
-                        <field name="to_invoice" attrs="{'required': [('invoice_on_timesheets', '=', True)],'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                <xpath expr='//group[@name="invoice_on_timesheets"]' position="replace">
+                    <group name='invoice_on_timesheets' string="Invoice on Timesheets Options" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" col="4">
+                        <field name="pricelist_id" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                        <field name="to_invoice" widget="selection" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
                     </group>
                 </xpath>
-                <xpath expr="//group[@name='invoice_on_timesheets']" position="replace"/>
                 <xpath expr='//group[@name="master"]' position='after'>
                     <separator name="toinvoice" string="Invoicing"/>
-                    <group>
-                        <group>
-                            <field name="pricelist_id" attrs="{'required': [('invoice_on_timesheets', '=', True)],'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                        </group>
-                        <group></group>
-                    </group>
                     <table width="100%%">
                         <tr>
                             <th></th>
-- 
cgit v1.2.3


From 266dbe297231d6b1bf1de9449bfdb3a5f116170d Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 26 Jun 2012 13:02:35 +0200
Subject: [IMP] contract management: oe_form_inline -> oe_inline

bzr revid: qdp-launchpad@openerp.com-20120626110235-et4y4m25k8u3fex4
---
 .../account_analytic_analysis_view.xml             | 31 +++++++++++-----------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'addons/account_analytic_analysis/account_analytic_analysis_view.xml')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index be7af1d4139..ead87c176e3 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -26,7 +26,7 @@
                 <xpath expr='//div[@name="duration"]' position="after" version="7.0">
                     <label for="quantity_max"/>
                     <div>
-                        <field name="quantity_max" class="oe_form_inline"/> / Remaining: <field name="remaining_hours" class="oe_form_inline"/>
+                        <field name="quantity_max" class="oe_inline"/> / Remaining: <field name="remaining_hours" class="oe_inline"/> 
                     </div>
                 </xpath>
                 <xpath expr='//group[@name="invoice_on_timesheets"]' position="replace">
@@ -50,31 +50,32 @@
                             <td>
                                 <label for="fix_price_invoices"/>
                             </td><td>
-                                <field name="fix_price_invoices" class="oe_form_inline"/>
+                                <field name="fix_price_invoices" class="oe_inline"/>
                             </td><td>
-                                <field class="oe_form_inline" name="amount_max" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                <field class="oe_inline" name="amount_max" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="ca_invoiced" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                <field class="oe_inline" name="ca_invoiced" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                <field class="oe_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="fix_price_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                <field class="oe_inline" name="fix_price_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
                                 <button name="%(action_sales_order)d" string="All Sales" type="action" context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                                <button name="open_sale_order_lines" string="Lines To Invoice" type="object" context="{'default_partner_id': [partner_id],'default_project_id': active_id,'search_default_uninvoiced': 1,'search_default_project_id': active_id,'search_default_partner_id': [partner_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/></td>
+                                <button name="open_sale_order_lines" string="Lines To Invoice" type="object" context="{'default_partner_id': [partner_id],'default_project_id': active_id,'search_default_uninvoiced': 1,'search_default_project_id': active_id,'search_default_partner_id': [partner_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td>
                         </tr><tr attrs="{'invisible':[('use_timesheets','=',False)]}">
                             <td>
                                 <label for="invoice_on_timesheets"/>
                             </td><td>
                                 <field name="invoice_on_timesheets"/>
                             </td><td>
-                                <field class="oe_form_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                                <field class="oe_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="timesheet_ca_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                                <field class="oe_inline" name="timesheet_ca_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="remaining_hours_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                                <field class="oe_inline" name="remaining_hours_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                                <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
                                 <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="All Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" context="{'default_account_id': active_id,'search_default_account_id': active_id}"/>
                                 <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Timesheets to Invoice" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
@@ -84,13 +85,13 @@
                                 <label string="Total"/>
                             </th><td>
                             </td><td>
-                                <field name="est_total" class="oe_form_inline" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                                <field name="est_total" class="oe_inline" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
-                                <field name="invoiced_total" class="oe_form_inline"/>
+                                <field name="invoiced_total" class="oe_inline"/>
                             </td><td>
-                                <field name="remaining_total" class="oe_form_inline"/>
+                                <field name="remaining_total" class="oe_inline"/>
                             </td><td>
-                                <field name="toinvoice_total" class="oe_form_inline"/>
+                                <field name="toinvoice_total" class="oe_inline"/>
                             </td><td>
                             </td>
                         </tr>
-- 
cgit v1.2.3