From 5c1a414983111a839f8da4f4b67343509234cb94 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Fri, 18 Jan 2013 17:02:12 +0530
Subject: [PATCH 1/6] [IMP] make changes of usablity in event and sale

bzr revid: rma@tinyerp.com-20130118113212-x0c1a21w9bledpot
---
 addons/event_sale/event_sale_view.xml | 2 +-
 addons/sale/sale_view.xml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index cc00365c980..9e131629e97 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -6,7 +6,7 @@
              <field name="model">product.product</field>
              <field name="inherit_id" ref="product.product_normal_form_view" />
              <field name="arch" type="xml">
-                <div name="options" position="inside">
+                <div name="options" position="after">
                     <field name="event_ok" on_change="onchange_event_ok(event_ok, context)"/>
                     <label for="event_ok"/>
                 </div>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 18fdb739923..06eea7a4d51 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -234,8 +234,8 @@
                                         groups="product.group_uom" options='{"no_open": True}'/>
                                     <field name="product_uos_qty" groups="product.group_uos" invisible="1"/>
                                     <field name="product_uos" string="UoS" groups="product.group_uos" invisible="1"/>
-                                    <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                     <field name="price_unit"/>
+                                    <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                     <field name="discount" groups="sale.group_discount_per_so_line"/>
                                     <field name="price_subtotal"/>
                                 </tree>

From 497b4a88e2af9249b50169499a8a88bece858e7c Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Fri, 18 Jan 2013 18:11:19 +0530
Subject: [PATCH 2/6] [IMP]improve the view of convert to opportunity

bzr revid: rma@tinyerp.com-20130118124119-ars1aqg2jg7y037o
---
 addons/crm/crm_lead.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 4455663ca9a..aef770e511a 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -872,7 +872,7 @@ class crm_lead(base_stage, format_address, osv.osv):
             'res_id': int(opportunity_id),
             'view_id': False,
             'views': [(form_view or False, 'form'),
-                      (tree_view or False, 'tree'),
+                      (tree_view or False, 'tree'),(False, 'kanban'),
                       (False, 'calendar'), (False, 'graph')],
             'type': 'ir.actions.act_window',
         }

From 2de1bf67d4ac35ec236c91888f5fcd4e23d5a8f0 Mon Sep 17 00:00:00 2001
From: "Ravish (Open ERP)" <rmu@tinyerp.com>
Date: Tue, 22 Jan 2013 11:11:19 +0530
Subject: [PATCH 3/6] feature_sale_crm

bzr revid: rmu@tinyerp.com-20130122054119-b00o7fwd9ja1d1va
---
 .../account_analytic_analysis.py                       | 10 ++++++++++
 .../account_analytic_analysis_view.xml                 |  4 ++--
 .../hr_timesheet_invoice/hr_timesheet_invoice_view.xml |  6 +++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 23d8faaffce..dbfd1b1947f 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -484,6 +484,16 @@ class account_analytic_account(osv.osv):
             res['value']['to_invoice'] = template.to_invoice.id
             res['value']['pricelist_id'] = template.pricelist_id.id
         return res
+        
+    def on_change_timesheets(self, cr, ids, uid, invoice_on_timesheets):
+        if invoice_on_timesheets == True:
+            return { 'value':{
+                'use_timesheets': True,
+                'to_invoice':1,
+            }}
+        else:
+            return { 'value':{'use_timesheets': False}}
+        
 account_analytic_account()
 
 class account_analytic_account_summary_user(osv.osv):
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index f8f718882af..bc64856c045 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -79,7 +79,7 @@
                             <td class="oe_timesheet_grey">
                                 <label for="invoice_on_timesheets"/>
                             </td><td class="oe_timesheet_grey">
-                                <field name="invoice_on_timesheets"/>
+                                <field name="invoice_on_timesheets" on_change="on_change_timesheets(invoice_on_timesheets)"/>
                             </td><td>
                                 <field class="oe_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
@@ -121,7 +121,7 @@
                             </td>
                         </tr>
                     </table>
-                    <group name='invoice_on_timesheets' attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
+                    <group name='invoice_on_timesheets'  attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
                         <p class="oe_grey oe_edit_only" colspan="2">
                             When invoicing on timesheet, OpenERP uses the
                             pricelist of the contract which uses the price
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 4b1751abc50..2295f1ff047 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -18,10 +18,10 @@
                 </xpath>
                 <xpath expr="/form/sheet" position='before'>
                     <header>
-                        <button name="set_pending" string="Pending" type="object" states="open" />
+                        <button name="set_pending" string="To Renew" type="object" states="open" />
                         <button name="set_close" string="Contract Finished" type="object" states="open,pending" />
-                        <button name="set_open" string="Re-open project" type="object" states="pending,close" />
-                        <button name="set_open" string="Re-open project" type="object" states="cancelled,draft"/>
+                        <button name="set_open" string="Set In Progress" type="object" states="pending,close" />
+                        <button name="set_open" string="Set In Progress" type="object" states="cancelled,draft"/>
                         <button name="set_cancel" string="Cancel Contract" type="object" states="open,pending"/>
                         <field name="state" readonly="1" widget="statusbar"
                             statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>

From 13ac97438dfabec6769b4256c5b490df2f743aee Mon Sep 17 00:00:00 2001
From: "Darshan Kalola (OpenERP Trainee)" <darshankalola@gmail.com>
Date: Fri, 14 Jun 2013 19:14:23 +0530
Subject: [PATCH 4/6] [IMP]make ratio null and untick timesheet  when untick
 invoice on timesheet option on contract

bzr revid: darshankalola@gmail.com-20130614134423-7itt49kbf09nq36t
---
 addons/account_analytic_analysis/account_analytic_analysis.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index b3dd2302a2f..15a7e0a5d49 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -621,7 +621,7 @@ class account_analytic_account(osv.osv):
 
     def onchange_invoice_on_timesheets(self, cr, uid, ids, invoice_on_timesheets, context=None):
         if not invoice_on_timesheets:
-            return {}
+            return {'value': {'use_timesheets':False, 'to_invoice':False}}
         result = {'value': {'use_timesheets': True}}
         try:
             to_invoice = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'hr_timesheet_invoice', 'timesheet_invoice_factor1')

From 1d85d13a73811470898a67c40e4d80a2ff265ce9 Mon Sep 17 00:00:00 2001
From: "Nimesh Contractor (OpenERP)" <nco@tinyerp.com>
Date: Thu, 11 Jul 2013 11:37:51 +0530
Subject: [PATCH 5/6] [IMP] when you uncheck the to_invoice at that time upper
 timesheet value is not uncheked.

bzr revid: nco@tinyerp.com-20130711060751-vllvxwpb0awptpom
---
 addons/account_analytic_analysis/account_analytic_analysis.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 15a7e0a5d49..422def483d2 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -621,7 +621,7 @@ class account_analytic_account(osv.osv):
 
     def onchange_invoice_on_timesheets(self, cr, uid, ids, invoice_on_timesheets, context=None):
         if not invoice_on_timesheets:
-            return {'value': {'use_timesheets':False, 'to_invoice':False}}
+            return {'value': {'to_invoice':False}}
         result = {'value': {'use_timesheets': True}}
         try:
             to_invoice = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'hr_timesheet_invoice', 'timesheet_invoice_factor1')

From 591d832b63e358f0e0ea04048a29bbcde64c6987 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 30 Aug 2013 12:21:37 +0530
Subject: [PATCH 6/6] [IMP]: Change close contract button string

bzr revid: atp@tinyerp.com-20130830065137-r1cg54a06c2myey2
---
 addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 2295f1ff047..fa49858c9ba 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -19,7 +19,7 @@
                 <xpath expr="/form/sheet" position='before'>
                     <header>
                         <button name="set_pending" string="To Renew" type="object" states="open" />
-                        <button name="set_close" string="Contract Finished" type="object" states="open,pending" />
+                        <button name="set_close" string="Close Contract" type="object" states="open,pending" />
                         <button name="set_open" string="Set In Progress" type="object" states="pending,close" />
                         <button name="set_open" string="Set In Progress" type="object" states="cancelled,draft"/>
                         <button name="set_cancel" string="Cancel Contract" type="object" states="open,pending"/>