From 25c9549d31ca435cb5b44eccc9c9029ab70c843f Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Mon, 14 Oct 2013 18:40:52 +0530
Subject: [PATCH 01/13] [FIX] yml fix, need to update the system as it's not
 working in case of only service type of product in bom

bzr revid: psi@tinyerp.com-20131014131052-sil5acy3yez0f7gq
---
 .../mrp/test/bom_with_service_type_product.yml | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/addons/mrp/test/bom_with_service_type_product.yml b/addons/mrp/test/bom_with_service_type_product.yml
index dc434cabf73..550ab660679 100644
--- a/addons/mrp/test/bom_with_service_type_product.yml
+++ b/addons/mrp/test/bom_with_service_type_product.yml
@@ -20,7 +20,7 @@
   I make the production order using BoM having one service type product and one consumable product.
 -
   !record {model: mrp.production, id: mrp_production_servicetype_mo1}:
-    product_id: product.product_product_5
+    product_id: product.product_product_3
     product_qty: 1.0
     bom_id: mrp_bom_test1
     date_planned: !eval time.strftime('%Y-%m-%d %H:%M:%S')
@@ -36,21 +36,13 @@
 -
   !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_servicetype_mo1}
 -
-  I confirm the Consume Products.
+  I reserved the product.
 -
   !python {model: mrp.production}: |
     order = self.browse(cr, uid, ref("mrp_production_servicetype_mo1"))
     assert order.state == 'confirmed', "Production order should be confirmed."
-    for move_line in order.move_lines:
-        move_line.action_consume(move_line.product_qty)
--
-  I processed the Product Entirely.
--
-  !python {model: mrp.production}: |
-    order = self.browse(cr, uid, ref("mrp_production_servicetype_mo1"))
-    assert order.state == 'in_production', 'Production order should be in production State.'
-    for move_created in order.move_created_ids:
-        move_created.action_done()
+    self.force_production(cr, uid, [order.id])
+
 -
   I produce product.
 -
@@ -90,7 +82,7 @@
   I make the production order using BoM having two service type products.
 -
   !record {model: mrp.production, id: mrp_production_servicetype_2}:
-    product_id: product.product_product_5
+    product_id: product.product_product_3
     product_qty: 1.0
     bom_id: mrp_bom_test_2
     date_planned: !eval time.strftime('%Y-%m-%d %H:%M:%S')

From d74a5ff57e9b394c9bbc60ab44fff6811f860412 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Mon, 14 Oct 2013 19:13:56 +0530
Subject: [PATCH 02/13] [FIX] stock: use SUPERUSER_ID to create/copy quants

bzr revid: psi@tinyerp.com-20131014134356-hm7cxryjnbgs2j14
---
 addons/stock/stock.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 9888092f708..a20f392c7fa 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -840,8 +840,8 @@ class stock_picking(osv.osv):
         for picking in self.browse(cr, uid, picking_ids, context=context):
             for move in picking.move_lines:
                 ids_to_free += [quant.id for quant in move.reserved_quant_ids]
-        if ids_to_free:            
-            quant_obj.write(cr, uid, ids_to_free, {'reservation_id' : False, 'reservation_op_id': False }, context = context)
+        if ids_to_free:
+            quant_obj.write(cr, SUPERUSER_ID, ids_to_free, {'reservation_id' : False, 'reservation_op_id': False }, context = context)
     
     def _reserve_quants_ops_move(self, cr, uid, ops, move, qty, create=False, context=None):
         """
@@ -867,7 +867,7 @@ class stock_picking(osv.osv):
                 if quant[0]: #If quant can be reserved
                     res_qty -= quant[1]
             quant_obj.quants_reserve(cr, uid, quants, move, context=context)
-            quant_obj.write(cr, uid, [x[0].id for x in quants if x[0]], {'reservation_op_id': ops.id}, context=context)
+            quant_obj.write(cr, SUPERUSER_ID, [x[0].id for x in quants if x[0]], {'reservation_op_id': ops.id}, context=context)
             return res_qty
         
         

From e835e6a02b7dd6bbd7b555f4cb0a9625831b4e83 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Mon, 14 Oct 2013 19:19:29 +0530
Subject: [PATCH 03/13] [FIX] stock: use SUPERUSER_ID to create/copy
 move.putaway

bzr revid: psi@tinyerp.com-20131014134929-guotecza5stzrhyw
---
 addons/stock_location/stock_location.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py
index 0a7df282f55..04ab9a99400 100644
--- a/addons/stock_location/stock_location.py
+++ b/addons/stock_location/stock_location.py
@@ -823,7 +823,7 @@ class stock_move(osv.osv):
                 # Should call different methods here in later versions
                 # TODO: take care of lots
                 if putaway.method == 'fixed' and putaway.location_spec_id:
-                    moveputaway_obj.create(cr, uid, {'move_id': move.id,
+                    moveputaway_obj.create(cr, SUPERUSER_ID, {'move_id': move.id,
                                                      'location_id': putaway.location_spec_id.id,
                                                      'quantity': move.product_uom_qty}, context=context)
         return True

From 2a3f9e2fd93cfed203022ce8a7c39cc73a8d6739 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Mon, 14 Oct 2013 19:22:47 +0530
Subject: [PATCH 04/13] [MISC]

bzr revid: psi@tinyerp.com-20131014135247-ik597wypqph67bhk
---
 addons/stock_location/stock_location.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py
index 04ab9a99400..4cd932773d7 100644
--- a/addons/stock_location/stock_location.py
+++ b/addons/stock_location/stock_location.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from openerp.osv import fields, osv
+from openerp import SUPERUSER_ID
 from datetime import *
 from dateutil.relativedelta import relativedelta
 from openerp.tools.translate import _

From af84a5dbb5c6d018f58443f655f92349e18cc79b Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 14 Oct 2013 17:22:02 +0200
Subject: [PATCH 05/13] [FIX] stock_locations: access rights

bzr revid: qdp-launchpad@openerp.com-20131014152202-3202f74h8p45b9y5
---
 addons/stock_location/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/stock_location/security/ir.model.access.csv b/addons/stock_location/security/ir.model.access.csv
index e26ded0edab..6339ccf579a 100644
--- a/addons/stock_location/security/ir.model.access.csv
+++ b/addons/stock_location/security/ir.model.access.csv
@@ -11,4 +11,5 @@ access_stock_location_path,stock.location.path,model_stock_location_path,base.gr
 access_procurement_rule,procurement.rule.flow,model_procurement_rule,base.group_sale_salesman,1,0,0,0
 access_procurement_rule_internal,procurement.rule.flow internal,model_procurement_rule,base.group_user,1,0,0,0
 access_stock_putaway_all,stock.putaway all users,model_stock_move_putaway,base.group_user,1,0,0,0
+access_product_putaway_all,product.putaway all users,model_product_putaway,base.group_user,1,0,0,0
 access_stock_removal_all,product.removal all users,model_product_removal,base.group_user,1,0,0,0

From 93c4d0eae10ee968b15682ec781d544e684682cb Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 14 Oct 2013 17:38:22 +0200
Subject: [PATCH 06/13] [FIX] stock:typo

bzr revid: qdp-launchpad@openerp.com-20131014153822-tkmx0jlprx60gin6
---
 addons/stock/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 0b215c6f6af..783f274803a 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -397,7 +397,7 @@ class stock_quant(osv.osv):
             #solving_quant, dummy = self._reconcile_single_negative_quant(cr, uid, to_solve_quant, solving_quant, quant_neg, qty, context=context)
 
     def _price_update(self, cr, uid, ids, newprice, context=None):
-        self.write(cr, SUPERSER_ID, ids, {'cost': newprice}, context=context)
+        self.write(cr, SUPERUSER_ID, ids, {'cost': newprice}, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
         #We want to trigger the move with nothing on reserved_quant_ids for the store of the remaining quantity

From bf89cee4fe968bdc4a8a34a334f4007df94d1932 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 15 Oct 2013 11:28:17 +0200
Subject: [PATCH 07/13] [FIX] stock: usability improvements and bug fixed at
 the picking creatino time when no scheduled_date is given

bzr revid: qdp-launchpad@openerp.com-20131015092817-z4ss9yhjdz1z2kge
---
 addons/stock/stock.py       |  5 ++-
 addons/stock/stock_view.xml | 76 ++++++++++++++++++++-----------------
 2 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 783f274803a..f74e55d3af7 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -481,8 +481,9 @@ class stock_picking(osv.osv):
 
     def _set_min_date(self, cr, uid, id, field, value, arg, context=None):
         move_obj = self.pool.get("stock.move")
-        move_ids = [move.id for move in self.browse(cr, uid, id, context=context).move_lines]
-        move_obj.write(cr, uid, move_ids, {'date_expected': value}, context=context)
+        if value:
+            move_ids = [move.id for move in self.browse(cr, uid, id, context=context).move_lines]
+            move_obj.write(cr, uid, move_ids, {'date_expected': value}, context=context)
 
     def get_min_max_date(self, cr, uid, ids, field_name, arg, context=None):
         """ Finds minimum and maximum dates for picking.
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ae5b50e288f..3e4ab8bcc1c 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -591,7 +591,6 @@
                     <button name="action_assign" states="confirmed" string="Check Availability" type="object" class="oe_highlight" groups="base.group_user"/>
                     <button name="force_assign" states="confirmed" string="Force Availability" type="object" class="oe_highlight" groups="base.group_user"/>
                     <button name="do_partial" states="assigned" string="Transfer Done" groups="stock.group_stock_user" type="object" class="oe_highlight"/>
-                    <button name="do_rereserve" string="ReReserve from Operations" groups="stock.group_stock_user" type="object" attrs="{'invisible': ['|',('pack_operation_exist', '=', False),('state','!=','assigned')]}"/>
                     <button name="do_prepare_partial" string="Partial Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight" attrs="{'invisible': ['|',('pack_operation_exist', '=', True),('state','!=','assigned')]}"/>
                     <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" groups="base.group_user"/>
                     <button name="action_cancel" states="assigned,confirmed,draft" string="Cancel Transfer" groups="base.group_user" type="object"/>
@@ -610,16 +609,18 @@
                         </group>
                         <group>
                             <field name="date"/>
-                            <field name="min_date" attrs="{'invisible': [('min_date','=',False)]}"/>
+                            <field name="min_date"/>
                             <field name="origin" placeholder="e.g. PO0032" class="oe_inline"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Products">
+                            <separator string="Expected Quantities" attrs="{'invisible': [('pack_operation_exist', '=', False)]}"/>
+                            <field name="move_lines" context="{'address_in_id': partner_id, 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree', 'default_picking_type_id': picking_type_id}"/>
+                            <separator string="In Process Quantities" attrs="{'invisible': [('pack_operation_exist', '=', False)]}"/>
                             <field name="pack_operation_exist" invisible="1"/>
-                            <button name="action_pack" string="Create Package" type="object" attrs="{'invisible': ['|',('pack_operation_exist', '=', False),('state', 'not in', ('draft','assigned','confirmed'))]}"
-                                groups="stock.group_tracking_lot"/>
-                            <button name="do_split" string="Split" groups="base.group_no_one" type="object" attrs="{'invisible': ['|',('pack_operation_exist', '=', False),('state','!=','assigned')]}"/>
+                            <button name="action_pack" string="Create Package" type="object" attrs="{'invisible': ['|',('pack_operation_exist', '=', False),('state', 'not in', ('draft','assigned','confirmed'))]}"/>
+                            <button name="do_split" string="Create Draft Backorder" groups="base.group_no_one" type="object" attrs="{'invisible': ['|',('pack_operation_exist', '=', False),('state','!=','assigned')]}"/>
                             <field name="pack_operation_ids" attrs="{'invisible': [('pack_operation_exist', '=', False)]}">
                                 <tree editable="top">
                                     <field name="product_id"/>
@@ -631,8 +632,6 @@
                                     <field name="result_package_id" groups="stock.group_tracking_lot"/>
                                 </tree>
                             </field>
-                            <separator string="Expected Quantities"/>
-                            <field name="move_lines" context="{'address_in_id': partner_id, 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree', 'default_picking_type_id': picking_type_id}"/>
                             <field name="note" placeholder="Add an internal note..." class="oe_inline"/>
                         </page>
                         <page string="Additional Info">
@@ -869,7 +868,6 @@
                     <field name="scrapped" invisible="1"/>
                     <field name="location_dest_id" groups="stock.group_locations"/>
                     <field name="state"/>
-                    <field name="remaining_qty" attrs="{'invisible': [('state', '=', 'done')]}"/>
                 </tree>
             </field>
         </record>
@@ -889,38 +887,42 @@
                 </header>
                 <sheet>
                     <group>
-                        <group name="main_grp" string="Details">
-                            <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
-                            <field name="procure_method" attrs="{'readonly': [('state', '!=', 'draft')]}" groups="base.group_no_one"/>
-                            <field name="group_id"/>
-                            <label for="product_uom_qty"/>
-                            <div>
-                                <field name="product_uom_qty"
-                                    on_change="onchange_quantity(product_id, product_uom_qty, product_uom, product_uos)"
-                                    class="oe_inline"/>
-                                <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
-                                <button name="%(stock.move_scrap)d"
-                                        string="Scrap" type="action"
-                                        icon="terp-gtk-jump-to-ltr" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" colspan="1"/>
-                            </div>
-                            <label for="product_uos_qty" groups="product.group_uos"/>
-                            <div groups="product.group_uos">
-                                <field name="product_uos_qty"
-                                    on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"
-                                    class="oe_inline"/>
-                                <field name="product_uos" class="oe_inline"/>
-                            </div>
-                            <field name="name"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <group name="main_grp" string="Details" colspan="4">
+                            <group name="main_grp_col1">
+                                <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
+                                <label for="product_uom_qty"/>
+                                <div>
+                                    <field name="product_uom_qty"
+                                        on_change="onchange_quantity(product_id, product_uom_qty, product_uom, product_uos)"
+                                        class="oe_inline"/>
+                                    <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
+                                    <button name="%(stock.move_scrap)d"
+                                            string="Scrap" type="action"
+                                            icon="terp-gtk-jump-to-ltr" context="{'scrap': True}"
+                                            states="draft,waiting,confirmed,assigned" colspan="1"/>
+                                </div>
+                                <field name="name"/>
+                                <label for="product_uos_qty" groups="product.group_uos"/>
+                                <div groups="product.group_uos">
+                                    <field name="product_uos_qty"
+                                        on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"
+                                        class="oe_inline"/>
+                                    <field name="product_uos" class="oe_inline"/>
+                                </div>
+                            </group>
+                            <group name="main_grp_col1">
+                                <field name="picking_type_id"/>
+                                <field name="picking_priority"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            </group>
                         </group>
                         <group name="origin_grp" string="Origin">
                             <field name="origin"/>
-                            <field name="picking_id" domain="[('picking_type_id','=',picking_type_id)]"/>
-                            <field name="picking_type_id"/>
-                            <field name="picking_priority"/>
                             <field name="location_id" groups="stock.group_locations"/>
+                            <field name="picking_id" domain="[('picking_type_id','=',picking_type_id)]"/>
                             <field name="create_date" groups="base.group_no_one"/>
+                            <field name="procure_method" attrs="{'readonly': [('state', '!=', 'draft')]}" groups="base.group_no_one"/>
+                            <field name="group_id"/>
                         </group>
                         <group name="destination_grp" string="Destination">
                             <field name="location_dest_id" groups="stock.group_locations"/>
@@ -929,6 +931,9 @@
                             <field name="date_expected" on_change="onchange_date(date,date_expected)" attrs="{'invisible': [('state', '=', 'done')]}"/>
                             <field name="date" attrs="{'invisible': [('state', '!=', 'done')]}"/>
                         </group>
+                        <group name="quants_grp" string="Reserved Quants" colspan="4" groups="base.group_no_one">
+                            <field name="reserved_quant_ids"/>
+                        </group>
                     </group>
                 </sheet>
                 </form>
@@ -981,6 +986,7 @@
                                 <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
                                 <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
                             </group>
+                            <field name="reserved_quant_ids"/>
 
                     </group>
                 </form>

From 3f6875c815b14f672f2481336678506dfe10b1a7 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 15 Oct 2013 13:59:52 +0200
Subject: [PATCH 08/13] [FIX] stock: traceback when doing action_scrap() fixed

bzr revid: qdp-launchpad@openerp.com-20131015115952-je8w0hih74dy0rl5
---
 addons/stock/stock.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index f74e55d3af7..35763ffe5d9 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -884,8 +884,6 @@ class stock_picking(osv.osv):
             
         """
         quant_obj = self.pool.get("stock.quant")
-        move_obj = self.pool.get("stock.move")
-        op_obj = self.pool.get("stock.pack.operation")
         pack_obj = self.pool.get("stock.quant.package")
         res = {} # Qty still to do from ops
         res2 = {} #what is left from moves
@@ -1689,12 +1687,13 @@ class stock_move(osv.osv):
             if move.picking_id and move.picking_id.pack_operation_ids:
                 quants = quant_obj.quants_get(cr, uid, move.location_id, move.product_id, qty - move.remaining_qty, domain=dom, prefered_order = prefered_order, context=context)
                 quant_obj.quants_move(cr, uid, quants, move, context=context)
-                for negative_op in negatives[move.id].keys():
-                    ops = ops_obj.browse(cr, uid, negative_op, context=context)
-                    negatives[move.id][negative_op] = quant_obj.quants_move(cr, uid, [(None, negatives[move.id][negative_op])], move, 
-                                                                            lot_id = ops.lot_id and ops.lot_id.id or False, 
-                                                                            owner_id = ops.owner_id and ops.owner_id.id or False, 
-                                                                            package_id = ops.package_id and ops.package_id.id or False, context=context)
+                if negatives and move.id in negatives:
+                    for negative_op in negatives[move.id].keys():
+                        ops = ops_obj.browse(cr, uid, negative_op, context=context)
+                        negatives[move.id][negative_op] = quant_obj.quants_move(cr, uid, [(None, negatives[move.id][negative_op])], move, 
+                                                                                lot_id = ops.lot_id and ops.lot_id.id or False, 
+                                                                                owner_id = ops.owner_id and ops.owner_id.id or False, 
+                                                                                package_id = ops.package_id and ops.package_id.id or False, context=context)
                 #Packing:
                 reserved_ops = list(set([x.reservation_op_id.id for x in move.reserved_quant_ids]))
                 for ops in ops_obj.browse(cr, uid, reserved_ops, context=context):

From 5bce036a6a1b6fbcdaf1beccc06ce1d5758e829e Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Tue, 15 Oct 2013 14:22:16 +0200
Subject: [PATCH 09/13] Test on multiCompany updated + some other tiny bug

bzr revid: jke@openerp.com-20131015122216-m5itjbwouetc3loj
---
 addons/stock/product.py                       |  2 +-
 addons/stock/stock.py                         |  6 +-
 addons/stock/tests/__init__.py                | 28 ------
 addons/stock/tests/test_multicompany.py       | 86 -------------------
 .../stock/wizard/stock_change_product_qty.py  |  3 +-
 .../security/ir.model.access.csv              |  2 +
 addons/stock_location/stock_location.py       | 10 +--
 7 files changed, 13 insertions(+), 124 deletions(-)
 delete mode 100644 addons/stock/tests/__init__.py
 delete mode 100644 addons/stock/tests/test_multicompany.py

diff --git a/addons/stock/product.py b/addons/stock/product.py
index 9e436dd49c3..a4eae7f2c9d 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -141,7 +141,7 @@ class product_product(osv.osv):
 
         moves_in = dict(map(lambda x: (x['product_id'][0], x['product_qty']), moves_in))
         moves_out = dict(map(lambda x: (x['product_id'][0], x['product_qty']), moves_out))
-
+        
         res = {}
         for id in ids:
             res[id] = {
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 0b215c6f6af..6c394111d55 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -397,7 +397,7 @@ class stock_quant(osv.osv):
             #solving_quant, dummy = self._reconcile_single_negative_quant(cr, uid, to_solve_quant, solving_quant, quant_neg, qty, context=context)
 
     def _price_update(self, cr, uid, ids, newprice, context=None):
-        self.write(cr, SUPERSER_ID, ids, {'cost': newprice}, context=context)
+        self.write(cr, SUPERUSER_ID, ids, {'cost': newprice}, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
         #We want to trigger the move with nothing on reserved_quant_ids for the store of the remaining quantity
@@ -1327,7 +1327,7 @@ class stock_move(osv.osv):
         default['origin_returned_move_id'] = False
         default['state'] = 'draft'
         return super(stock_move, self).copy(cr, uid, id, default, context)
-
+    
     def _default_location_destination(self, cr, uid, context=None):
         context = context or {}
         if context.get('default_picking_type_id', False):
@@ -1335,7 +1335,7 @@ class stock_move(osv.osv):
             return pick_type.default_location_dest_id and pick_type.default_location_dest_id.id or False
         return False
 
-    def _default_location_source(self, cr, uid, context=None):
+    def _default_location_source(self, cr, uid, context=None):        
         context = context or {}
         if context.get('default_picking_type_id', False):
             pick_type = self.pool.get('stock.picking.type').browse(cr, uid, context['default_picking_type_id'], context=context)
diff --git a/addons/stock/tests/__init__.py b/addons/stock/tests/__init__.py
deleted file mode 100644
index a3f647212c5..00000000000
--- a/addons/stock/tests/__init__.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Business Applications
-#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-#from . import test_multicompany
-#
-#checks = [
-#    test_multicompany,
-#]
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/tests/test_multicompany.py b/addons/stock/tests/test_multicompany.py
deleted file mode 100644
index 3f76231492b..00000000000
--- a/addons/stock/tests/test_multicompany.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Business Applications
-#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.tests import common
-
-
-class TestStockMulticompany(common.TransactionCase):
-
-    def setUp(self):
-        super(TestStockMulticompany, self).setUp()
-        cr, uid = self.cr, self.uid
-
-        # Usefull models
-        self.ir_model_data = self.registry('ir.model.data')
-        self.res_users = self.registry('res.users')
-        self.stock_location = self.registry('stock.location')
-        self.stock_move = self.registry('stock.move')
-        self.stock_warehouse = self.registry('stock.warehouse')
-
-        model, group_user_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
-        model, group_stock_manager_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'stock', 'group_stock_manager')
-        model, company_2_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'stock', 'res_company_2')
-        self.multicompany_user_id = self.res_users.create(cr, uid,
-            {'name': 'multicomp', 'login': 'multicomp',
-             'groups_id': [(6, 0, [group_user_id, group_stock_manager_id])],
-             'company_id': company_2_id, 'company_ids': [(6,0,[company_2_id])]})
-
-    def test_00_multicompany_default_stock_move(self):
-        """check no error on getting default stock.move values in multicompany setting"""
-        cr, uid, context = self.cr, self.multicompany_user_id, {}
-        fields = ['location_id', 'location_dest_id']
-        for type in ('in', 'internal', 'out'):
-            context['picking_type'] = type
-            defaults = self.stock_move.default_get(cr, uid, ['location_id', 'location_dest_id', 'type'], context)
-            for field in fields:
-                if defaults.get(field):
-                    try:
-                        self.stock_location.check_access_rule(cr, uid, [defaults[field]], 'read', context)
-                    except Exception, exc:
-                        assert False, "unreadable location %s: %s" % (field, exc)
-            self.assertEqual(defaults['type'], type, "wrong move type")
-
-
-    def test_10_multicompany_onchange_move_type(self):
-        """check onchange_move_type does not return unreadable in multicompany setting"""
-        cr, uid, context = self.cr, self.multicompany_user_id, {}
-        fields = ['location_id', 'location_dest_id']
-        for type in ('in', 'internal', 'out'):
-            result = self.stock_move.onchange_move_type(cr, uid, [], type, context)['value']
-            for field in fields:
-                if result.get(field):
-                    try:
-                        self.stock_location.check_access_rule(cr, uid, [result[field]], 'read', context)
-                    except Exception, exc:
-                        assert False, "unreadable location %s: %s" % (field, exc)
-
-
-    def test_30_multicompany_default_warehouse_location(self):
-        """check default locations for warehouse in multicompany setting"""
-        cr, uid, context = self.cr, self.multicompany_user_id, {}
-        fields = ['lot_input_id', 'lot_stock_id', 'lot_output_id']
-        defaults = self.stock_warehouse.default_get(cr, uid, fields, context)
-        for field in fields:
-            if defaults.get(field):
-                try:
-                    self.stock_location.check_access_rule(cr, uid, [defaults[field]], 'read', context)
-                except Exception, exc:
-                    assert False, "unreadable default %s: %s" % (field, exc)
diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
index 8c601c7e101..243ea7304d8 100644
--- a/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -104,7 +104,8 @@ class stock_change_product_qty(osv.osv_memory):
             }
             inventry_line_obj.create(cr , uid, line_data, context=context)
 
-            inventry_obj.action_confirm(cr, uid, [inventory_id], context=context)
+            #doesn't exist
+            #inventry_obj.action_confirm(cr, uid, [inventory_id], context=context)
             inventry_obj.action_done(cr, uid, [inventory_id], context=context)
         return {}
 
diff --git a/addons/stock_location/security/ir.model.access.csv b/addons/stock_location/security/ir.model.access.csv
index 6339ccf579a..8e4217acec9 100644
--- a/addons/stock_location/security/ir.model.access.csv
+++ b/addons/stock_location/security/ir.model.access.csv
@@ -8,8 +8,10 @@ access_stock_location_path_internal_user,stock location path internal user,model
 access_stock_location_path_sale_manager,stock.location.path partner salemanager,model_stock_location_path,base.group_sale_manager,1,1,1,1
 access_stock_location_path_stock_user,stock.location.path stock user,model_stock_location_path,stock.group_stock_user,1,1,1,1
 access_stock_location_path,stock.location.path,model_stock_location_path,base.group_sale_salesman,1,0,0,0
+access_stock_location_route,stock.location.route,model_stock_location_route,stock.group_stock_manager,1,0,1,0
 access_procurement_rule,procurement.rule.flow,model_procurement_rule,base.group_sale_salesman,1,0,0,0
 access_procurement_rule_internal,procurement.rule.flow internal,model_procurement_rule,base.group_user,1,0,0,0
 access_stock_putaway_all,stock.putaway all users,model_stock_move_putaway,base.group_user,1,0,0,0
 access_product_putaway_all,product.putaway all users,model_product_putaway,base.group_user,1,0,0,0
 access_stock_removal_all,product.removal all users,model_product_removal,base.group_user,1,0,0,0
+
diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py
index 4cd932773d7..8126b089eb0 100644
--- a/addons/stock_location/stock_location.py
+++ b/addons/stock_location/stock_location.py
@@ -370,11 +370,11 @@ class stock_warehouse(osv.osv):
             vals[values['field']] = location_id
 
         #create new sequences
-        in_seq_id = seq_obj.create(cr, uid, values={'name': vals.get('name', '') + _(' Sequence in'), 'prefix': vals.get('code', '') + '\IN\\', 'padding': 5}, context=context)
-        out_seq_id = seq_obj.create(cr, uid, values={'name': vals.get('name', '') + _(' Sequence out'), 'prefix': vals.get('code', '') + '\OUT\\', 'padding': 5}, context=context)
-        pack_seq_id = seq_obj.create(cr, uid, values={'name': vals.get('name', '') + _(' Sequence packing'), 'prefix': vals.get('code', '') + '\PACK\\', 'padding': 5}, context=context)
-        pick_seq_id = seq_obj.create(cr, uid, values={'name': vals.get('name', '') + _(' Sequence picking'), 'prefix': vals.get('code', '') + '\PICK\\', 'padding': 5}, context=context)
-        int_seq_id = seq_obj.create(cr, uid, values={'name': vals.get('name', '') + _(' Sequence internal'), 'prefix': vals.get('code', '') + '\INT\\', 'padding': 5}, context=context)
+        in_seq_id = seq_obj.create(cr, SUPERUSER_ID, values={'name': vals.get('name', '') + _(' Sequence in'), 'prefix': vals.get('code', '') + '\IN\\', 'padding': 5}, context=context)
+        out_seq_id = seq_obj.create(cr, SUPERUSER_ID, values={'name': vals.get('name', '') + _(' Sequence out'), 'prefix': vals.get('code', '') + '\OUT\\', 'padding': 5}, context=context)
+        pack_seq_id = seq_obj.create(cr, SUPERUSER_ID, values={'name': vals.get('name', '') + _(' Sequence packing'), 'prefix': vals.get('code', '') + '\PACK\\', 'padding': 5}, context=context)
+        pick_seq_id = seq_obj.create(cr, SUPERUSER_ID, values={'name': vals.get('name', '') + _(' Sequence picking'), 'prefix': vals.get('code', '') + '\PICK\\', 'padding': 5}, context=context)
+        int_seq_id = seq_obj.create(cr, SUPERUSER_ID, values={'name': vals.get('name', '') + _(' Sequence internal'), 'prefix': vals.get('code', '') + '\INT\\', 'padding': 5}, context=context)
 
         #create WH
         new_id = super(stock_warehouse, self).create(cr, uid, vals=vals, context=context)

From c076e83b087381ea5af89d7d55c313044976fb83 Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Tue, 15 Oct 2013 14:23:00 +0200
Subject: [PATCH 10/13] move test en stock location -> add file

bzr revid: jke@openerp.com-20131015122300-7yay3o0ys2sn94qa
---
 addons/stock_location/tests/__init__.py       | 28 +++++++
 .../stock_location/tests/test_multicompany.py | 75 +++++++++++++++++++
 2 files changed, 103 insertions(+)
 create mode 100644 addons/stock_location/tests/__init__.py
 create mode 100644 addons/stock_location/tests/test_multicompany.py

diff --git a/addons/stock_location/tests/__init__.py b/addons/stock_location/tests/__init__.py
new file mode 100644
index 00000000000..39ebd5e451f
--- /dev/null
+++ b/addons/stock_location/tests/__init__.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import test_multicompany
+
+checks = [
+    test_multicompany,
+]
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_location/tests/test_multicompany.py b/addons/stock_location/tests/test_multicompany.py
new file mode 100644
index 00000000000..5f64d01c45e
--- /dev/null
+++ b/addons/stock_location/tests/test_multicompany.py
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.tests import common
+
+
+class TestStockMulticompany(common.TransactionCase):
+
+    def setUp(self):
+        super(TestStockMulticompany, self).setUp()
+        cr, uid = self.cr, self.uid
+
+        # Usefull models
+        self.ir_model_data = self.registry('ir.model.data')
+        self.res_users = self.registry('res.users')
+        self.stock_location = self.registry('stock.location')
+        self.stock_move = self.registry('stock.move')
+        self.stock_warehouse = self.registry('stock.warehouse')
+
+        model, group_user_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
+        model, group_stock_manager_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'stock', 'group_stock_manager')
+        model, company_2_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'stock', 'res_company_2')
+        self.company_2_id = company_2_id
+        self.multicompany_user_id = self.res_users.create(cr, uid,
+            {'name': 'multicomp', 'login': 'multicomp',
+             'groups_id': [(6, 0, [group_user_id, group_stock_manager_id])],
+             'company_id': company_2_id, 'company_ids': [(6,0,[company_2_id])]})
+
+    def test_00_multicompany_default_stock_move(self):
+        """check no error on getting default stock.move values in multicompany setting"""
+        cr, uid, context = self.cr, self.multicompany_user_id, {}
+        fields = ['location_id', 'location_dest_id']
+        
+        new_warehouse_id = self.registry('stock.warehouse').create(cr, uid, {'name':'DemoWH_MultiComp','reception_steps':'three_steps', 'delivery_steps' : 'pick_pack_ship', 'company_id':self.company_2_id,'code':'dmwh'}, context=context)
+        warehouse = self.registry('stock.warehouse').browse(cr, uid, new_warehouse_id, context=context)
+        
+        for type in ('in', 'int', 'out'):
+            
+            type_id = warehouse[type + '_type_id'].id
+            context['default_picking_type_id'] = type_id            
+            defaults = self.stock_move.default_get(cr, uid, ['location_id', 'location_dest_id','picking_type_id'], context=context)
+            if defaults and defaults['picking_type_id']:
+                def_type = self.registry('stock.picking.type').browse(cr,uid,defaults['picking_type_id'],context).code_id
+            else:
+                assert False, "Picking type undefined "
+           
+            for field in fields:
+                                                
+                if defaults.get(field):
+                    try:
+                        print("try : ",defaults[field])                                      
+                        self.stock_location.check_access_rule(cr, uid, [defaults[field]], 'read', context)
+                    except Exception, exc:
+                        print("catch : ",defaults[field])                        
+                        assert False, "unreadable location %s: %s" % (field, exc)
+                    
+            self.assertEqual(def_type[0:len(type)].lower(), type, "wrong move type")

From 94faa4ae11a9b23a2f74ad689b22427fd7571e91 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 15 Oct 2013 14:30:28 +0200
Subject: [PATCH 11/13] [FIX] stock, stock_account: access rights

bzr revid: qdp-launchpad@openerp.com-20131015123028-ku9u0fopcb1wgfii
---
 addons/stock/security/ir.model.access.csv | 1 +
 addons/stock_account/stock_account.py     | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 551c813e609..03690fe6cda 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -50,3 +50,4 @@ access_stock_quant_user,stock.quant user,model_stock_quant,stock.group_stock_use
 access_stock_quant_all,stock.quant all users,model_stock_quant,base.group_user,1,0,0,0
 access_stock_pack_operation_manager,stock.pack.operation manager,model_stock_pack_operation,stock.group_stock_manager,1,1,1,1
 access_stock_pack_operation_user,stock.pack.operation user,model_stock_pack_operation,stock.group_stock_user,1,1,1,1
+access_stock_pack_operation_all,stock.pack.operation all users,model_stock_pack_operation,base.group_user,1,0,0,0
diff --git a/addons/stock_account/stock_account.py b/addons/stock_account/stock_account.py
index 7fd892f10b2..cacef475eff 100644
--- a/addons/stock_account/stock_account.py
+++ b/addons/stock_account/stock_account.py
@@ -23,6 +23,7 @@ import time
 
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
+from openerp import SUPERUSER_ID
 import logging
 _logger = logging.getLogger(__name__)
 
@@ -242,7 +243,8 @@ class stock_move(osv.osv):
         for q in move.quant_ids:
             average_valuation_price += q.qty * q.cost
         average_valuation_price = average_valuation_price / move.product_qty
-        product_obj.write(cr, uid, move.product_id.id, {'standard_price': average_valuation_price}, context=context)
+        # Write the standard price, as SUPERUSER_ID because a warehouse manager may not have the right to write on products
+        product_obj.write(cr, SUPERUSER_ID, move.product_id.id, {'standard_price': average_valuation_price}, context=context)
         self.write(cr, uid, move.id, {'price_unit': average_valuation_price}, context=context)
 
     def product_price_update_before_done(self, cr, uid, ids, context=None):
@@ -260,8 +262,8 @@ class stock_move(osv.osv):
                     # Get the standard price
                     amount_unit = product.price_get('standard_price', context=ctx)[product.id]
                     new_std_price = ((amount_unit * product_avail) + (move.price_unit * move.product_qty)) / (product_avail + move.product_qty)
-                # Write the field according to price type field
-                product_obj.write(cr, uid, [product.id], {'standard_price': new_std_price}, context=context)
+                # Write the standard price, as SUPERUSER_ID because a warehouse manager may not have the right to write on products
+                product_obj.write(cr, SUPERUSER_ID, [product.id], {'standard_price': new_std_price}, context=context)
 
     def product_price_update_after_done(self, cr, uid, ids, context=None):
         '''

From 75a9f5323fedde00f7d5cc82cec47890b2621e56 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 15 Oct 2013 17:00:35 +0200
Subject: [PATCH 12/13] [FIX] sale, sale_stock: fixing problems and workflow
 related to the shipping_except state

bzr revid: qdp-launchpad@openerp.com-20131015150035-ccdbua7e881adwx7
---
 addons/sale/sale_workflow.xml                      | 2 +-
 addons/sale_stock/sale_stock.py                    | 9 +++++++++
 addons/sale_stock/test/cancel_order_sale_stock.yml | 7 -------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/addons/sale/sale_workflow.xml b/addons/sale/sale_workflow.xml
index 41794d60569..b8e29ac6b3c 100644
--- a/addons/sale/sale_workflow.xml
+++ b/addons/sale/sale_workflow.xml
@@ -263,7 +263,7 @@
         <record id="trans_ship_ship_except" model="workflow.transition">
             <field name="act_from" ref="act_ship"/>
             <field name="act_to" ref="act_ship_except"/>
-            <field name="condition">test_state('canceled')</field>
+            <field name="signal">ship_except</field>
         </record>
         
         <record id="trans_ship_except_ship" model="workflow.transition">
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index c7f0684d38e..8ba711becb0 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -395,6 +395,15 @@ class sale_order_line(osv.osv):
 class stock_move(osv.osv):
     _inherit = 'stock.move'
 
+    def action_cancel(self, cr, uid, ids, context=None):
+        sale_ids = []
+        for move in self.browse(cr, uid, ids, context=context):
+            if move.procurement_id and move.procurement_id.sale_line_id:
+                sale_ids.append(move.procurement_id.sale_line_id.order_id.id)
+        if sale_ids:
+            self.pool.get('sale.order').signal_ship_except(cr, uid, sale_ids)
+        return super(stock_move, self).action_cancel(cr, uid, ids, context=context)
+
     def _create_invoice_line_from_vals(self, cr, uid, move, invoice_line_vals, context=None):
         invoice_line_id = self.pool.get('account.invoice.line').create(cr, uid, invoice_line_vals, context=context)
         if move.procurement_id and move.procurement_id.sale_line_id:
diff --git a/addons/sale_stock/test/cancel_order_sale_stock.yml b/addons/sale_stock/test/cancel_order_sale_stock.yml
index 58779edc28c..9ea0ce3505c 100644
--- a/addons/sale_stock/test/cancel_order_sale_stock.yml
+++ b/addons/sale_stock/test/cancel_order_sale_stock.yml
@@ -39,13 +39,6 @@
   !python {model: stock.picking}: |
     picks = self.search(cr, uid, [('origin','=','Test/001'),('backorder_id','<>',False)])
     self.action_cancel(cr, uid, picks)
--
-  I invoice from order.
--
-  Only Stock User can change data related warehouse therefore test with that user which have stcok user rights,
--
-  !context
-    uid: 'res_stock_user'
 -
   I run the scheduler.
 -

From 18a9318cfd01b52594fc0d658c105b3aea25b50e Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Wed, 16 Oct 2013 09:12:09 +0200
Subject: [PATCH 13/13] [FIX] mrp: removed picking_id field on mrp.production

bzr revid: jke@openerp.com-20131016071209-pryay03jucyezjje
---
 addons/mrp/mrp.py                     | 12 ++++++------
 addons/mrp/mrp_view.xml               |  3 +--
 addons/mrp/test/cancel_order.yml      |  6 ------
 addons/mrp/tests/test_multicompany.py |  3 +--
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 27cb2d09583..da8a9e4b99c 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -511,8 +511,8 @@ class mrp_production(osv.osv):
             help="Bill of Materials allow you to define the list of required raw materials to make a finished product."),
         'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', readonly=True, states={'draft':[('readonly',False)]},
             help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."),
-        'picking_id': fields.many2one('stock.picking', 'Picking List', readonly=True, ondelete="restrict",
-            help="This is the Internal Picking List that brings the finished product to the production plan"),
+#         'picking_id': fields.many2one('stock.picking', 'Picking List', readonly=True, ondelete="restrict",
+#             help="This is the Internal Picking List that brings the finished product to the production plan"),
         'move_prod_id': fields.many2one('stock.move', 'Product Move', readonly=True),
         'move_lines': fields.one2many('stock.move', 'raw_material_production_id', 'Products to Consume',
             domain=[('state','not in', ('done', 'cancel'))], readonly=True, states={'draft':[('readonly',False)]}),
@@ -717,10 +717,10 @@ class mrp_production(osv.osv):
             context = {}
         move_obj = self.pool.get('stock.move')
         for production in self.browse(cr, uid, ids, context=context):
-            if production.state == 'confirmed' and production.picking_id.state not in ('draft', 'cancel'):
-                raise osv.except_osv(
-                    _('Cannot cancel manufacturing order!'),
-                    _('You must first cancel related internal picking attached to this manufacturing order.'))
+            if production.state == 'confirmed': #and production.picking_id.state not in ('draft', 'cancel'):
+                 raise osv.except_osv(
+                     _('Cannot cancel manufacturing order!'),
+                     _('You must first cancel related internal picking attached to this manufacturing order.'))                 
             if production.move_created_ids:
                 move_obj.action_cancel(cr, uid, [x.id for x in production.move_created_ids])
             move_obj.action_cancel(cr, uid, [x.id for x in production.move_lines])
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index e1ea16cdec9..010e9077bc6 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -788,8 +788,7 @@
                                     <field name="date_finished" invisible="1"/>
                                 </group>
                                 <group>
-                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                    <field name="picking_id"/>
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>                                    
                                     <field name="move_prod_id" groups="stock.group_locations"/>
                                 </group>
                             </group>
diff --git a/addons/mrp/test/cancel_order.yml b/addons/mrp/test/cancel_order.yml
index 2f721b6c653..17905906e3b 100644
--- a/addons/mrp/test/cancel_order.yml
+++ b/addons/mrp/test/cancel_order.yml
@@ -7,12 +7,6 @@
   I first confirm order for PC Assemble SC349.
 -
   !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_test1}
--
-  In order to cancel the production order, I first cancel its picking.
--
-  !function {model: stock.picking, name: action_cancel}:
-    - model: mrp.production
-      eval: "[obj(ref('mrp_production_test1')).picking_id.id]"
 -
   Now I cancel the production order.
 -
diff --git a/addons/mrp/tests/test_multicompany.py b/addons/mrp/tests/test_multicompany.py
index f38a31a70de..5d1a0a50bcb 100644
--- a/addons/mrp/tests/test_multicompany.py
+++ b/addons/mrp/tests/test_multicompany.py
@@ -47,8 +47,7 @@ class TestMrpMulticompany(common.TransactionCase):
         cr, uid, context = self.cr, self.multicompany_user_id, {}
         fields = ['location_src_id', 'location_dest_id']
         defaults = self.stock_location.default_get(cr, uid, ['location_id', 'location_dest_id', 'type'], context)
-        for field in fields:
-            print field, uid, defaults
+        for field in fields:            
             if defaults.get(field):
                 try:
                     self.stock_location.check_access_rule(cr, uid, [defaults[field]], 'read', context)