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: [PATCH 1/2] [IMP]:improved view for contract

bzr revid: apa@tinyerp.com-20120529054621-7eaa6o1meg8xwvk1
---
 .../account_analytic_analysis_view.xml         |  2 +-
 addons/analytic/analytic_view.xml              |  2 +-
 .../hr_timesheet_invoice_view.xml              | 18 ------------------
 3 files changed, 2 insertions(+), 20 deletions(-)

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" />
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index b005d364364..0b909d2c5c0 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -28,7 +28,7 @@
                                 <group colspan="2" col="2" name="project" class="oe_form_group_label_border">
                                     <separator colspan="2" string="Project" name="project_sep" invisible="1"/>
                                 </group>
-                                <separator string="Terms and Condition" colspan="4"/>
+                                <separator string="Terms and Condition" colspan="4" name="description"/>
                                 <field colspan="4" name="description" nolabel="1"/>
                             </page>
                         </notebook>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 03d5eb502c6..40475719197 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -7,24 +7,6 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
-                <xpath expr='//group[@name="contract"]' position='after'>
-		    <group colspan="2" col="2" name="project" class="oe_form_group_label_border">
-                        <separator colspan="2" string="Project" name="project_sep"/>
-			    <field name="use_timesheets" />
-		    </group>
-                </xpath>
-                <!-- <group name="contract" position="after">
-                    <group colspan="2" col="2" name="invoice_data">
-                        <separator colspan="2" string="Invoicing Data"/>
-                        <field name="to_invoice" widget="selection"/>
-                        <field name="pricelist_id" groups="product.group_sale_pricelist" domain="[('type','=','sale')]" attrs="{'required':[('to_invoice','!=',False)]}"/>
-                        <field name="amount_max"/>
-                    </group>
-                    <group colspan="2" col="2" name="invoice_stats">
-                        <separator colspan="4" string="Invoicing Statistics"/>
-                        <field name="amount_invoiced"/>
-                    </group>
-                </group> -->
                 <xpath expr="/form/sheet" position='before'>
                     <div class="oe_form_topbar">
                         <button name="set_pending" string="Pending" type="object" states="open"/>

From 65f31b90617ec8b08b0441d5efa1c2d13909f1b6 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 29 May 2012 12:30:00 +0530
Subject: [PATCH 2/2] [IMP]:added domain and default context while creating a
 account from timesheet line.

bzr revid: apa@tinyerp.com-20120529070000-k9p3j9th9e1abzny
---
 addons/hr_timesheet/hr_timesheet_view.xml                 | 2 +-
 addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml | 5 ++---
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml     | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 1ff966d62c4..90544842685 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -12,7 +12,7 @@
                     <field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
                     <field name="journal_id" invisible="1"/>
                     <field name="name"/>
-                    <field domain="[('type','=','normal')]" name="account_id"/>
+                    <field domain="[('type','=','normal'),('use_timesheets','=',1)]" name="account_id" context="{'default_use_timesheets': 1}"/>
                     <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]" invisible="1"/>
                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" sum="Total time" widget="float_time"/>
                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" invisible="1"/>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 40475719197..78245b8db99 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -43,7 +43,7 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
                 <field name="account_id" position="replace">
-                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)" select="1" context="{'search_default_use_timesheets': 1, 'default_use_timesheets': 1}"/>
+                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" select="1" context="{'default_use_timesheets': 1}"/>
                 </field>
             </field>
         </record>
@@ -66,9 +66,8 @@
             <field name="type">tree</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
             <field name="arch" type="xml">
-
                 <field name="account_id" position="replace">
-                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)" context="{'search_default_use_timesheets': 1, 'default_use_timesheets': 1}"/>
+                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" select="1" context="{'default_use_timesheets': 1}"/>
                 </field>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index aa815df5337..5290985096a 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -109,7 +109,7 @@
                             <field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
                                 <tree editable="top" string="Timesheet Lines">
                                     <field invisible="1" name="date"/>
-                                    <field domain="[('type','=','normal'), ('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
+                                    <field domain="[('type','=','normal'), ('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" context="{'default_use_timesheets': 1}"/>
                                     <field name="name"/>
                                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
                                     <field name="to_invoice" widget="selection"/>