From c6a13dd29349cd6d5767760c85c90eb18c40a998 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Thu, 4 Oct 2012 15:47:37 +0530
Subject: [PATCH 1/6] [IMP] Sale : remove traceback in oreder lines to invoice
 while click on graph view

bzr revid: rpr@tinyerp.com-20121004101737-764leznte7yg7vm6
---
 addons/sale/sale.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index c47bf1357c8..558fc9de002 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -700,7 +700,7 @@ class sale_order_line(osv.osv):
         'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price'), readonly=True, states={'draft': [('readonly', False)]}),
-        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account')),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal', store=True, digits_compute= dp.get_precision('Account')),
         'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft': [('readonly', False)]}),
         'address_allotment_id': fields.many2one('res.partner', 'Allotment Partner'),
         'product_uom_qty': fields.float('Quantity', digits_compute= dp.get_precision('Product UoS'), required=True, readonly=True, states={'draft': [('readonly', False)]}),

From f41c846d4a3bcb1376d763f8e84216ed1ba4e706 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Tue, 9 Oct 2012 10:55:59 +0530
Subject: [PATCH 2/6] [IMP] Sale : improved search view to select the specific
 category

bzr revid: rpr@tinyerp.com-20121009052559-l1921pge5bet3stc
---
 addons/product/product_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 8c19aee026f..29a2d475565 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -15,7 +15,7 @@
                    <filter name="filter_to_purchase" string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]"/>
                    <filter string="Can be Sold" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
                    <filter name="filter_to_purchase" string="Can be Purchased" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]"/>
-                   <field name="categ_id" operator="child_of"/>
+                   <field name="categ_id"/>
                    <group expand="0" string="Context...">
                        <field name="pricelist_id" context="{'pricelist': self}" groups="product.group_sale_pricelist"/>
                        <field name="company_id" groups="base.group_multi_company"/>

From 2ce5a08ef6209e885c5e6d33b33e295f9f92db55 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Fri, 12 Oct 2012 15:16:09 +0530
Subject: [PATCH 3/6] [IMP] Sale : graph view removed

bzr revid: rpr@tinyerp.com-20121012094609-yqhbv0ds2ty12y95
---
 addons/product/product_view.xml | 1 -
 addons/sale/sale_view.xml       | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 4e9615e391e..edec2ea8bc1 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -13,7 +13,6 @@
                    <filter string="Consumable" name="consumable" icon="terp-accessories-archiver" domain="[('type','=','consu')]" help="Consumable products"/>
                    <separator/>
                    <filter string="Can be Sold" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
-
                    <filter name="filter_to_purchase" string="Can be Purchased" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]"/>
                    <field name="categ_id"/>
                    <group expand="0" string="Context...">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 2ba00a7f0ae..97aed9069f7 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -440,7 +440,7 @@
             <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
 
-        <record id="view_order_line_graph" model="ir.ui.view">
+<!--        <record id="view_order_line_graph" model="ir.ui.view">
             <field name="name">sale.order.line.graph</field>
             <field name="model">sale.order.line</field>
             <field name="arch" type="xml">
@@ -449,7 +449,7 @@
                     <field name="price_subtotal" operator="+"/>
                 </graph>
             </field>
-        </record>
+        </record>    -->
 
         <record id="view_order_line_tree" model="ir.ui.view">
             <field name="name">sale.order.line.tree</field>
@@ -562,7 +562,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order.line</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,graph</field>
+            <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_sales_order_uninvoiced_line_filter"/>
             <field name="context">{"search_default_uninvoiced":1}</field>
             <field name="filter" eval="True"/>
@@ -581,7 +581,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order.line</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,graph</field>
+            <field name="view_mode">tree,form</field>
             <field name="domain">[('invoiced','&lt;&gt;', 1),('state','=','done')]</field>
             <field name="filter" eval="True"/>
         </record>

From c6b5a77ae8fa8f3074e0e10edda44dda1fa51026 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Fri, 12 Oct 2012 15:18:21 +0530
Subject: [PATCH 4/6] [IMP] Sale : store remove

bzr revid: rpr@tinyerp.com-20121012094821-jzps5yb1frhsp0jw
---
 addons/sale/sale.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 98db09970ed..09bb08d46f6 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -716,7 +716,7 @@ class sale_order_line(osv.osv):
         'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price'), readonly=True, states={'draft': [('readonly', False)]}),
-        'price_subtotal': fields.function(_amount_line, string='Subtotal', store=True, digits_compute= dp.get_precision('Account')),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account')),
         'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft': [('readonly', False)]}),
         'address_allotment_id': fields.many2one('res.partner', 'Allotment Partner'),
         'product_uom_qty': fields.float('Quantity', digits_compute= dp.get_precision('Product UoS'), required=True, readonly=True, states={'draft': [('readonly', False)]}),

From 1f6bf6a0d652f36f5a9ac91a77b3657cdac518e9 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Fri, 12 Oct 2012 15:50:19 +0530
Subject: [PATCH 5/6] [IMP] Sale : unwanted filter removed

bzr revid: rpr@tinyerp.com-20121012102019-o5znhn2alwxd4kbq
---
 addons/product/product_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index edec2ea8bc1..3c8873d669c 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -13,7 +13,6 @@
                    <filter string="Consumable" name="consumable" icon="terp-accessories-archiver" domain="[('type','=','consu')]" help="Consumable products"/>
                    <separator/>
                    <filter string="Can be Sold" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
-                   <filter name="filter_to_purchase" string="Can be Purchased" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]"/>
                    <field name="categ_id"/>
                    <group expand="0" string="Context...">
                        <field name="pricelist_id" context="{'pricelist': self}" groups="product.group_sale_pricelist"/>

From 2df086772b0c46df5f12fb4d8a49200700cb9fdd Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Mon, 15 Oct 2012 14:44:52 +0530
Subject: [PATCH 6/6] [IMP] crm_partner_assign : filter string changed for
 customer filter salesman to salesperson

bzr revid: rpr@tinyerp.com-20121015091452-6tvm8hqa2mp9frtp
---
 addons/crm_partner_assign/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index f5a1e9aad25..3b55c70f4c7 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -170,7 +170,7 @@
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_res_partner_filter"/>
             <field name="arch" type="xml">
-                <filter string="Salesman" position="after">
+                <filter string="Salesperson" position="after">
                     <filter string="Activation" context="{'group_by' : 'activation'}" domain="[]" icon="terp-personal" />
                 </filter>
             </field>