From 6bd5b4fb38e3bec20b75e522482d73b69b6896cd Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Mon, 6 Dec 2010 18:05:39 +0530
Subject: [PATCH 1/3] [IMP] Purchase:Improvement in Purchase order in pad

bzr revid: aag@tinyerp.co.in-20101206123539-jfp416d9xbjdrhlq
---
 addons/purchase/purchase_view.xml |  2 +-
 addons/stock/stock.py             | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index ce8923ed5cd..c69bc376543 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -189,7 +189,7 @@
                     <separator orientation="vertical"/>
                     <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" separator="1" help="Purchase order which are in the exception state"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-go-back-rtl" string="To be Invoiced" domain="[('invoiced','=',1)]" separator="1" help="Purchase order to be invoiced"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="No Invoice" domain="[('invoice_id','=',False)]" separator="1" help="Purchase order with No Invoice" groups="base.group_extended"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1" string="Reference"/>
                     <field name="partner_id" select="1"/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index d6f4a95bc9e..6fdd2f0a0fd 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1284,6 +1284,9 @@ class stock_picking(osv.osv):
         @param ids: List of Picking Ids
         @param context: A standard dictionary for contextual values
         """
+        if context is None:
+            context = {}
+        mob_obj = self.pool.get('ir.model.data')
         for pick in self.browse(cr, uid, ids, context=context):
             msg=''
             if pick.auto_picking:
@@ -1303,9 +1306,12 @@ class stock_picking(osv.osv):
                 'done': _('is done.'),
                 'draft':_('is in draft state.'),
             }
+            res = mob_obj.get_object_reference(cr, uid, 'stock', 'view_picking_in_form')
+            view_id = res and res[1] or False
+            context.update({'view_id': view_id})
             message += state_list[pick.state]
-            self.log(cr, uid, pick.id, message)
-        return True
+            self.log(cr, uid, pick.id, message,context=context)
+        return context
 
 stock_picking()
 

From 1f693e0200beff343a16c947b6d991729fc47c61 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 9 Dec 2010 16:34:55 +0530
Subject: [PATCH 2/3] [FIX]stock,purchase: add products menus in order in
 purchase and warehouse

lp bug: https://launchpad.net/bugs/687357 fixed

bzr revid: aag@tinyerp.co.in-20101209110455-10w52vdd8whrhygi
---
 addons/purchase/purchase_view.xml | 26 +++++++++++++++++++++++++-
 addons/stock/stock_view.xml       | 20 ++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index fce92eb5ad9..8330a91d7ff 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -19,6 +19,26 @@
             action="product.product_pricelist_action2" id="menu_product_pricelist_action2_purchase"
             parent="menu_purhase_config_purchase" sequence="1"/>
 
+        <menuitem 
+            id="menu_product_in_config_purchase" name="Products"
+            parent="purchase.menu_purhase_config_purchase" sequence="3"/>
+          
+        <menuitem
+            action="product.product_category_action_form" id="menu_product_category_config_purchase"
+            parent="purchase.menu_product_in_config_purchase" sequence="0"/>
+          
+        <menuitem 
+            id="menu_purchase_unit_meauser_purchase" name="Units of Measure"
+            parent="purchase.menu_product_in_config_purchase"  sequence="1"/>
+            
+        <menuitem
+             action="product.product_uom_categ_form_action" id="menu_purchase_uom_categ_form_action"
+             parent="purchase.menu_purchase_unit_meauser_purchase" sequence="0"/>
+             
+        <menuitem
+              action="product.product_uom_form_action" id="menu_purchase_uom_form_action"
+              parent="purchase.menu_purchase_unit_meauser_purchase" sequence="1"/>
+
 
         <!--supplier addresses action-->
         <record id="action_supplier_address_form" model="ir.actions.act_window">
@@ -83,8 +103,12 @@
       <!--product menu-->
       <menuitem id="menu_procurement_management_product" name="Products"
           parent="base.menu_purchase_root" sequence="8"/>
+          
+      <menuitem name="Products by Category" id="menu_product_by_category_purchase_form" action="product.product_category_action"
+           parent="menu_procurement_management_product" sequence="0"/>     
+          
       <menuitem name="Products" id="menu_procurement_partner_contact_form" action="product.product_normal_action_puchased"
-          parent="menu_procurement_management_product"/>
+          parent="menu_procurement_management_product" sequence="1"/>
 
        <record model="ir.ui.view" id="purchase_order_calendar">
             <field name="name">purchase.order.calendar</field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index feb7cc178fe..9cb5a63b21c 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -9,10 +9,30 @@
         <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1" groups="base.group_extended"/>
         <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2"/>
         <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
+        <menuitem name="Products by Category" id="menu_product_by_category_stock_form" action="product.product_category_action"
+           parent="stock.menu_stock_product" sequence="0"/> 
         <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
         <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="group_stock_manager"/>
         <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1" groups="group_stock_manager"/>
         <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
+        <menuitem 
+            id="menu_product_in_config_stock" name="Products"
+            parent="stock.menu_stock_configuration" sequence="2"/>
+        <menuitem
+            action="product.product_category_action_form" id="menu_product_category_config_stock"
+            parent="stock.menu_product_in_config_stock" sequence="0"/>
+        <menuitem
+            action="product.product_ul_form_action" groups="base.group_extended"
+            id="menu_product_packaging_stock_action" parent="stock.menu_product_in_config_stock" sequence="1"/>
+         <menuitem 
+            id="menu_stock_unit_meauser_stock" name="Units of Measure"
+            parent="stock.menu_product_in_config_stock"  sequence="2"/>
+         <menuitem
+             action="product.product_uom_categ_form_action" id="menu_stock_uom_categ_form_action"
+             parent="stock.menu_stock_unit_meauser_stock" sequence="0"/>
+         <menuitem
+              action="product.product_uom_form_action" id="menu_stock_uom_form_action"
+              parent="stock.menu_stock_unit_meauser_stock" sequence="1"/>
 
         <record id="stock_inventory_line_tree" model="ir.ui.view">
             <field name="name">stock.inventory.line.tree</field>

From a0987a0162bd2ca0d9d206b2523c685ef38a310f Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 14 Dec 2010 13:03:17 +0530
Subject: [PATCH 3/3] [FIX] mrp:Manufacturing/ Manager able to define a bill of
 material was fixed lp:689669

lp bug: https://launchpad.net/bugs/689669 fixed

bzr revid: aag@tinyerp.co.in-20101214073317-s98bxozeiy6vet3d
---
 addons/mrp/security/ir.model.access.csv | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index dcbf6c866b4..c3c9b79bbaf 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -12,7 +12,7 @@
 "access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_manager",1,0,0,0
 "access_mrp_routing_manager","mrp.routing.manager","model_mrp_routing","mrp.group_mrp_manager",1,1,1,1
 "access_mrp_routing_workcenter_manager","mrp.routing.workcenter.manager","model_mrp_routing_workcenter","mrp.group_mrp_manager",1,1,1,1
-"access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,0,0,1
+"access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,1,1,1
 "access_mrp_bom_revision_manager","mrp.bom.revision.manager","model_mrp_bom_revision","mrp.group_mrp_manager",1,1,1,1
 "access_stock_location_mrp_worker","stock.location mrp_worker","stock.model_stock_location","mrp.group_mrp_user",1,0,0,0
 "access_stock_move_mrp_worker","stock.move mrp_worker","stock.model_stock_move","mrp.group_mrp_user",1,1,1,0
@@ -68,3 +68,5 @@
 "access_report_mrp_inout_user","report.mrp.inout user","model_report_mrp_inout","mrp.group_mrp_user",1,0,0,0
 "access_report_workcenter_load_user","report.workcenter.load.user","model_report_workcenter_load","mrp.group_mrp_user",1,0,0,0
 "access_mrp_bom","mrp.bom","model_mrp_bom","base.group_sale_salesman",1,0,0,0
+"access_stock_warehouse_mrp_manager","stock.warehouse.mrp.manager","stock.model_stock_warehouse","mrp.group_mrp_manager",1,0,0,0
+"access_stock_location_mrp_manager","stock.location.mrp.manager","stock.model_stock_location","mrp.group_mrp_manager",1,0,0,0