[MERGE]: Merge with lp:~openerp-commiter/openobject-addons/trunk-addons-aag

bzr revid: rpa@tinyerp.com-20101221102828-c0ehvi44ud3jg1hk

addons/mrp/security/ir.model.access.csv

@@ -71,3 +71,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_salesman","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

addons/purchase/purchase_view.xml

@@ -11,13 +11,37 @@
         <menuitem id="menu_purchase_config_purchase" name="Configuration"
             parent="base.menu_purchase_root" sequence="100"/>
 
+        <menuitem 
+            id="menu_purchase_config_pricelist" name="Pricelists"
+            parent="menu_purchase_config_purchase" sequence="50"/>
+            
         <menuitem
             action="product.product_pricelist_action" id="menu_product_pricelist_action_purhase"
-            parent="menu_purchase_config_purchase" sequence="2"/>
+            parent="menu_purchase_config_pricelist" sequence="20"/>
 
         <menuitem
             action="product.product_pricelist_action2" id="menu_product_pricelist_action2_purchase"
-            parent="menu_purchase_config_purchase" sequence="1"/>
+            parent="menu_purchase_config_pricelist" sequence="10"/>
+
+        <menuitem 
+            id="menu_product_in_config_purchase" name="Product"
+            parent="menu_purchase_config_purchase" sequence="30"/>
+          
+        <menuitem
+            action="product.product_category_action_form" id="menu_product_category_config_purchase"
+            parent="purchase.menu_product_in_config_purchase" sequence="10"/>
+          
+        <menuitem 
+            id="menu_purchase_unit_measure_purchase" name="Units of Measure"
+            parent="purchase.menu_product_in_config_purchase"  sequence="20"/>
+            
+        <menuitem
+             action="product.product_uom_categ_form_action" id="menu_purchase_uom_categ_form_action"
+             parent="menu_purchase_unit_measure_purchase" sequence="30"/>
+             
+        <menuitem
+              action="product.product_uom_form_action" id="menu_purchase_uom_form_action"
+              parent="menu_purchase_unit_measure_purchase" sequence="30"/>
 
 
         <!--supplier addresses action-->
@@ -83,6 +107,10 @@
       <!--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="10"/>
+          
       <menuitem name="Products" id="menu_procurement_partner_contact_form" action="product.product_normal_action_puchased"
           parent="menu_procurement_management_product"/>
 
@@ -205,7 +233,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_ids','=', 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"/>

addons/stock/stock.py

@@ -1287,6 +1287,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 = {}
+        data_obj = self.pool.get('ir.model.data')
         for pick in self.browse(cr, uid, ids, context=context):
             msg=''
             if pick.auto_picking:
@@ -1296,6 +1299,11 @@ class stock_picking(osv.osv):
                 'in':_('Reception'),
                 'internal': _('Internal picking'),
             }
+            view_list = {
+                'out': 'view_picking_out_form',
+                'in': 'view_picking_in_form',
+                'internal': 'view_picking_form',
+            }
             message = type_list.get(pick.type, _('Document')) + " '" + (pick.name or '?') + "' "
             if pick.min_date:
                 msg= _(' for the ')+ datetime.strptime(pick.min_date, '%Y-%m-%d %H:%M:%S').strftime('%m/%d/%Y')
@@ -1306,8 +1314,10 @@ class stock_picking(osv.osv):
                 'done': _('is done.'),
                 'draft':_('is in draft state.'),
             }
+            res = data_obj.get_object_reference(cr, uid, 'stock', view_list.get(pick.type, 'view_picking_form'))
+            context.update({'view_id': res and res[1] or False})
             message += state_list[pick.state]
-            self.log(cr, uid, pick.id, message)
+            self.log(cr, uid, pick.id, message, context=context)
         return True
 
 stock_picking()

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="Product"
+            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_measure_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_measure_stock" sequence="0"/>
+         <menuitem
+              action="product.product_uom_form_action" id="menu_stock_uom_form_action"
+              parent="stock.menu_stock_unit_measure_stock" sequence="1"/>
 
         <record id="stock_inventory_line_tree" model="ir.ui.view">
             <field name="name">stock.inventory.line.tree</field>