From c4d177e87618e78ea46d22287819819c8cca1ebf Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 11 Sep 2012 13:55:24 +0530
Subject: [PATCH 1/4] [IMP] change wizard name of update link

bzr revid: fka@tinyerp.com-20120911082524-48z1ktn4d326yujr
---
 addons/product/product_view.xml                       | 2 +-
 addons/stock/wizard/stock_change_product_qty_view.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index ff9172d3917..6e080c7b125 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -105,7 +105,7 @@
                             <page string="Procurements" groups="base.group_user">
                                 <group name="procurement">
                                     <group>
-                                        <field name="procure_method" groups="base.group_user" attrs="{'invisible':[('type','=', 'service')]}"/>
+                                        <field name="procure_method" groups="base.group_user"/>
                                         <field name="cost_method" groups="product.group_costing_method"/>
                                         <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                                     </group>
diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml
index a533d9f837b..20114301ab2 100644
--- a/addons/stock/wizard/stock_change_product_qty_view.xml
+++ b/addons/stock/wizard/stock_change_product_qty_view.xml
@@ -5,8 +5,8 @@
             <field name="name">Change Product Quantity</field>
             <field name="model">stock.change.product.qty</field>
             <field name="arch" type="xml">
-                <form string="Change Product Quantity" version="7.0">
-                    <group string="Select Quantity">
+                <form string="Update Product Quantity" version="7.0">
+                    <group>
                         <field name="new_quantity" />
                         <field name="product_id" invisible="1"/>
                         <field name="location_id" groups="stock.group_locations"/>
@@ -22,7 +22,7 @@
         </record>
 
         <record id="action_view_change_product_quantity" model="ir.actions.act_window">
-            <field name="name">Change Product Quantity</field>
+            <field name="name">Update Product Quantity</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.change.product.qty</field>
             <field name="view_type">form</field>

From c7e790b97dfea60a511b1234f9c761a6305478ec Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 11 Sep 2012 14:19:29 +0530
Subject: [PATCH 2/4] [IMP] display product kanban view in purchases menu

bzr revid: fka@tinyerp.com-20120911084929-fb6pf0tv5hbh2g93
---
 addons/procurement/board_mrp_procurement_view.xml | 2 +-
 addons/product/product_view.xml                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/procurement/board_mrp_procurement_view.xml b/addons/procurement/board_mrp_procurement_view.xml
index a01ec168efa..d007af7fa91 100644
--- a/addons/procurement/board_mrp_procurement_view.xml
+++ b/addons/procurement/board_mrp_procurement_view.xml
@@ -15,7 +15,7 @@
             <field name="model">board.board</field>
             <field name="inherit_id" ref="stock.board_warehouse_form"/>
             <field name="arch" type="xml">
-              <xpath expr="/form/board/column/action[@string='Incoming Shipments']" position="before">
+              <xpath expr="/form/board/column/action[@string='Incoming Products']" position="before">
                 <action name="%(procurement_action_board)d" string="Procurements in Exception"/>
             </xpath>
             </field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 6e080c7b125..13474351744 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -291,9 +291,9 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">product.product</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,kanban</field>
+            <field name="view_mode">kanban,tree,form</field>
             <field name="context">{"search_default_filter_to_purchase":1}</field>
-            <field name="view_id" ref="product_product_tree_view"/>
+            <field name="view_id" ref="product_kanban_view"/>
             <field name="search_view_id" ref="product_search_form_view"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">

From b13a19b2291c36b9b72bbe6d8ec98f7871b1f6b5 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 11 Sep 2012 15:47:21 +0530
Subject: [PATCH 3/4] [IMP] display field supply_method when project_mrp
 installed & name change of procurement tab in warnning

bzr revid: fka@tinyerp.com-20120911101721-sgume435a3hb8zc7
---
 addons/product/product.py               |  2 +-
 addons/project_mrp/project_mrp_view.xml | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index c9345a22103..4988a0797c5 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -346,7 +346,7 @@ class product_template(osv.osv):
             for product in self.browse(cr, uid, ids, context=context):
                 old_uom = product.uom_po_id
                 if old_uom.category_id.id != new_uom.category_id.id:
-                    raise osv.except_osv(_('Unit of Measure categories Mismatch!'), _("New Unit of Measure '%s' must belong to same Unit of Measure category '%s' as of old Unit of Measure '%s'. If you need to change the unit of measure, you may deactivate this product from the 'Procurement & Locations' tab and create a new one.") % (new_uom.name, old_uom.category_id.name, old_uom.name,))
+                    raise osv.except_osv(_('Unit of Measure categories Mismatch!'), _("New Unit of Measure '%s' must belong to same Unit of Measure category '%s' as of old Unit of Measure '%s'. If you need to change the unit of measure, you may deactivate this product from the 'Procurements' tab and create a new one.") % (new_uom.name, old_uom.category_id.name, old_uom.name,))
         return super(product_template, self).write(cr, uid, ids, vals, context=context)
 
     _defaults = {
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index f9e761117b6..fdfefd10e30 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -31,6 +31,16 @@
                 </field>
             </field>
         </record>
+        <record id="view_product_form" model="ir.ui.view">
+            <field name="name">product.form.view</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <field name="uom_po_id" position="before">
+                    <field name="supply_method" />
+                </field>
+            </field>
+        </record>
     </data>
 </openerp>
 

From 4b198f56da60d89ea5c41fc9eb4d1e7ba9b4ee68 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 11 Sep 2012 18:18:48 +0530
Subject: [PATCH 4/4] [IMP] add access rights in purchase

bzr revid: fka@tinyerp.com-20120911124848-ybq1kh6bbttiqzlm
---
 addons/purchase/security/ir.model.access.csv | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 3c8d072c536..41ec925a651 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -22,11 +22,11 @@ access_product_product_purchase_user,product.product.purchase.user,product.model
 access_product_product_purchase_manager,product.product purchase_manager,product.model_product_product,purchase.group_purchase_manager,1,1,1,1
 access_product_template_purchase_user,product.template purchase_user,product.model_product_template,group_purchase_user,1,0,0,0
 access_product_template_purchase_manager,product.template purchase_manager,product.model_product_template,group_purchase_manager,1,0,0,0
-access_account_invoice_purchase,account_invoice purchase,account.model_account_invoice,group_purchase_user,1,1,1,1
-access_account_invoice_line_purchase,account_invoice.line purchase,account.model_account_invoice_line,group_purchase_user,1,1,1,1
+access_account_invoice_purchase,account_invoice purchase,account.model_account_invoice,group_purchase_user,1,0,0,0
+access_account_invoice_line_purchase,account_invoice.line purchase,account.model_account_invoice_line,group_purchase_user,1,0,0,0
 access_account_invoice_purchase_manager,account_invoice purchase manager,account.model_account_invoice,group_purchase_manager,1,0,0,0
 access_account_invoice_line_purchase_manager,account_invoice.line purchase manager,account.model_account_invoice_line,group_purchase_manager,1,0,0,0
-access_account_invoice_tax_purchase,account_invoice.tax purchase,account.model_account_invoice_tax,group_purchase_user,1,1,1,1
+access_account_invoice_tax_purchase,account_invoice.tax purchase,account.model_account_invoice_tax,group_purchase_user,1,0,0,0
 access_account_fiscal_position_purchase_user,account.fiscal.position purchase,account.model_account_fiscal_position,group_purchase_user,1,0,0,0
 access_account_sequence_fiscalyear_purchase_user,account.sequence.fiscalyear purchase,account.model_account_sequence_fiscalyear,group_purchase_user,1,1,1,1
 access_res_partner_purchase_user,res.partner purchase,base.model_res_partner,group_purchase_user,1,0,0,0