From 0f7ca6e784b51abac7d32094fcc634aa8bd39394 Mon Sep 17 00:00:00 2001
From: "Jitendra Prajapati (OpenERP)" <prajapatijitendra7969@gmail.com>
Date: Mon, 20 Jan 2014 12:22:22 +0530
Subject: [PATCH 01/29] [FIX]mrp_repair:set unique constraint on name

bzr revid: prajapatijitendra7969@gmail.com-20140120065222-05hw8t0ca05mq7r4
---
 addons/mrp_repair/mrp_repair.py       | 4 ++++
 addons/mrp_repair/mrp_repair_demo.yml | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index b178d4e12a4..c287bbff56d 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -186,6 +186,10 @@ class mrp_repair(osv.osv):
         'pricelist_id': lambda self, cr, uid,context : self.pool.get('product.pricelist').search(cr, uid, [('type','=','sale')])[0]
     }
 
+    _sql_constraints = [
+        ('name', 'unique (name)', 'The name of the Repair Order must be unique!'),
+    ]
+
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
diff --git a/addons/mrp_repair/mrp_repair_demo.yml b/addons/mrp_repair/mrp_repair_demo.yml
index 1299cbfb6d2..93fc19a1f91 100644
--- a/addons/mrp_repair/mrp_repair_demo.yml
+++ b/addons/mrp_repair/mrp_repair_demo.yml
@@ -20,7 +20,6 @@
     location_id: stock.stock_location_14
     picking_type_id: stock.picking_type_out
     move_id: 'stock_move_pcbasicpc0'
-    name: RMA00004
     operations:
       - location_dest_id: stock.location_production
         location_id: stock.stock_location_stock
@@ -62,7 +61,6 @@
     location_id: stock.stock_location_14
     picking_type_id: stock.picking_type_out
     move_id: 'stock.stock_move_stockmvmrp1'
-    name: RMA-00007
     operations:
       - location_dest_id: stock.location_production
         location_id: stock.stock_location_stock
@@ -104,7 +102,6 @@
     location_id: stock.stock_location_14
     picking_type_id: stock.picking_type_out
     move_id: 'stock.stock_move_stockmvmrp2'
-    name: RMA-00011
     operations:
       - location_dest_id: stock.location_production
         location_id: stock.stock_location_stock

From 49104e91081adef130424db0414d0a51f2f9f0d3 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Mon, 20 Jan 2014 11:30:48 +0100
Subject: [PATCH 02/29] [FIX]add PO name to origin field when generating
 picking from PO

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

bzr revid: csn@openerp.com-20140120103048-ebb2ow8rutn2gs21
---
 addons/purchase/purchase.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 235b9d6c2bd..8f3ecbc05ce 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -694,6 +694,7 @@ class purchase_order(osv.osv):
             'picking_type_id': order.picking_type_id.id,
             'group_id': group_id,
             'procurement_id': order_line.procurement_ids and order_line.procurement_ids[0].id or False,
+            'origin': order.name,
             'route_ids': order.picking_type_id.warehouse_id and [(6, 0, [x.id for x in order.picking_type_id.warehouse_id.route_ids])] or [],
         }]
         #if the order line has a bigger quantity than the procurement it was for (manually changed or minimal quantity), then

From fbd144c9e7e6f78556fbdc1b91eea66e36384f39 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Wed, 22 Jan 2014 13:31:59 +0100
Subject: [PATCH 03/29] [WIP] Start changing move to quant

bzr revid: jco@openerp.com-20140122123159-v9tvkzrry61a6n39
---
 addons/mrp_repair/mrp_repair.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index b178d4e12a4..9fd49d5840f 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -139,7 +139,7 @@ class mrp_repair(osv.osv):
             \n* The \'Cancelled\' status is used when user cancel repair order.'),
         'location_id': fields.many2one('stock.location', 'Current Location', select=True, readonly=True, states={'draft':[('readonly',False)], 'confirmed':[('readonly',True)]}),
         'location_dest_id': fields.many2one('stock.location', 'Delivery Location', readonly=True, states={'draft':[('readonly',False)], 'confirmed':[('readonly',True)]}),
-        'move_id': fields.many2one('stock.move', 'Move',required=True, domain="[('product_id','=',product_id)]", readonly=True, states={'draft':[('readonly',False)]}),
+        'quant_id': fields.many2one('stock.quant', 'Quant',required=True, domain="[('product_id','=',product_id)]", readonly=True, states={'draft':[('readonly',False)]}),
         'guarantee_limit': fields.date('Warranty Expiration', help="The warranty expiration limit is computed as: last move date + warranty defined on selected product. If the current date is below the warranty expiration limit, each operation and fee you will add will be set as 'not to invoiced' by default. Note that you can change manually afterwards.", states={'confirmed':[('readonly',True)]}),
         'operations' : fields.one2many('mrp.repair.line', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', help='Pricelist of the selected partner.'),
@@ -205,25 +205,26 @@ class mrp_repair(osv.osv):
         @return: Dictionary of values.
         """
         return {'value': {
-                    'move_id': False,
+                    'quant_id': False,
                     'guarantee_limit' :False,
                     'location_id':  False,
                     'location_dest_id': False,
                 }
         }
 
-    def onchange_move_id(self, cr, uid, ids, prod_id=False, move_id=False):
+    def onchange_quant_id(self, cr, uid, ids, prod_id=False, quant_id=False):
         """ On change of move id sets values of guarantee limit, source location,
         destination location, partner and partner address.
         @param prod_id: Id of product in current record.
-        @param move_id: Changed move.
+        @param quant_id: Quant to handle
         @return: Dictionary of values.
         """
         data = {}
         data['value'] = {'guarantee_limit': False, 'location_id': False, 'partner_id': False}
-        if not prod_id:
+        if prod_id and 
+        if not prod_id and not quant_id:
             return data
-        if move_id:
+        if quant_id:
             move =  self.pool.get('stock.move').browse(cr, uid, move_id)
             product = self.pool.get('product.product').browse(cr, uid, prod_id)
             limit = datetime.strptime(move.date_expected, '%Y-%m-%d %H:%M:%S') + relativedelta(months=int(product.warranty))

From e086290eb047966f2e05959009ccaab1ef047ac4 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Wed, 22 Jan 2014 14:04:11 +0100
Subject: [PATCH 04/29] [FIX]inventory adjustment: should not show negative qty
 at start and prevent user should not input negative qty

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

bzr revid: csn@openerp.com-20140122130411-vab09j3bo5r7ks0f
---
 addons/stock/stock.py       | 5 +++++
 addons/stock/stock_view.xml | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 91feb16bca5..66e40e8df5b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2018,6 +2018,7 @@ class stock_inventory(osv.osv):
         'date': fields.datetime('Inventory Date', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Inventory Create Date."),
         'date_done': fields.datetime('Date done', help="Inventory Validation Date."),
         'line_ids': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', readonly=False, states={'done': [('readonly', True)]}, help="Inventory Lines."),
+        'line_view_ids': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', readonly=False, domain=['|',('th_qty', '>=', 0),('th_qty', '=', False)], states={'done': [('readonly', True)]}, help="Inventory Lines."),
         'move_ids': fields.one2many('stock.move', 'inventory_id', 'Created Moves', help="Inventory Moves."),
         'state': fields.selection([('draft', 'Draft'), ('cancel', 'Cancelled'), ('confirm', 'In Progress'), ('done', 'Validated')], 'Status', readonly=True, select=True),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}),
@@ -2073,6 +2074,10 @@ class stock_inventory(osv.osv):
             context = {}
         move_obj = self.pool.get('stock.move')
         for inv in self.browse(cr, uid, ids, context=context):
+            if inv.line_ids:
+                for inventory_line in inv.line_ids:
+                    if inventory_line.product_qty < 0 and inventory_line.th_qty >= 0:
+                        raise osv.except_osv(_('Warning'),_('You cannot have a negative product quantity in an inventory line'))
             if not inv.move_ids:
                 self.action_check(cr, uid, [inv.id], context=context)
             inv.refresh()
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 7ba08b1a6f1..bd77f6f40c9 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -119,7 +119,7 @@
                     <notebook attrs="{'invisible':[('state','=','draft')]}">
                         <page string="Inventory Details" >
                             <button name="set_checked_qty" states="confirm" string="⇒ Set quantities to 0" type="object" class="oe_link oe_right" groups="stock.group_stock_user"/>
-                            <field name="line_ids" string="Inventory Details" context="{'default_location_id': location_id,  'default_product_id': product_id, 'default_prod_lot_id': lot_id, 'default_package_id': package_id, 'default_partner_id': partner_id}">
+                            <field name="line_view_ids" string="Inventory Details" context="{'default_location_id': location_id,  'default_product_id': product_id, 'default_prod_lot_id': lot_id, 'default_package_id': package_id, 'default_partner_id': partner_id}">
                                 <tree string="Inventory Details" editable="bottom" colors="blue: product_qty != th_qty">
                                     <field context="{'location':location_id, 'uom':product_uom_id, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom_id,partner_id,prod_lot_id,package_id)" domain="[('type','=','product')]"/>
                                     <field name="product_uom_id" groups="product.group_uom" on_change="on_change_product_id(location_id,product_id,product_uom_id,partner_id,prod_lot_id,package_id)"/>

From 8eff4a3af825e692cc0fc6a63deedf4d304d751d Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Wed, 22 Jan 2014 14:27:30 +0100
Subject: [PATCH 05/29] [FIX]inventory adjustment: move_ids should be readonly
 once inventory has been validated

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

bzr revid: csn@openerp.com-20140122132730-x0oiddxio1nkiwo3
---
 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 66e40e8df5b..2896bed07ee 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2019,7 +2019,7 @@ class stock_inventory(osv.osv):
         'date_done': fields.datetime('Date done', help="Inventory Validation Date."),
         'line_ids': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', readonly=False, states={'done': [('readonly', True)]}, help="Inventory Lines."),
         'line_view_ids': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', readonly=False, domain=['|',('th_qty', '>=', 0),('th_qty', '=', False)], states={'done': [('readonly', True)]}, help="Inventory Lines."),
-        'move_ids': fields.one2many('stock.move', 'inventory_id', 'Created Moves', help="Inventory Moves."),
+        'move_ids': fields.one2many('stock.move', 'inventory_id', 'Created Moves', help="Inventory Moves.", states={'done': [('readonly', True)]}),
         'state': fields.selection([('draft', 'Draft'), ('cancel', 'Cancelled'), ('confirm', 'In Progress'), ('done', 'Validated')], 'Status', readonly=True, select=True),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}),
         'location_id': fields.many2one('stock.location', 'Location', required=True, readonly=True, states={'draft': [('readonly', False)]}),

From f7d2d9e9189e9874652b88f8b61820e01ff0d56a Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Wed, 22 Jan 2014 15:11:23 +0100
Subject: [PATCH 06/29] [FIX]remove setting for stock_no_autopicking that has
 been removed

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

bzr revid: csn@openerp.com-20140122141123-wbxk3exizay9cgf9
---
 addons/mrp/res_config.py       | 6 ------
 addons/mrp/res_config_view.xml | 4 ----
 2 files changed, 10 deletions(-)

diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py
index e7da0ee82fb..71635cc9e6e 100644
--- a/addons/mrp/res_config.py
+++ b/addons/mrp/res_config.py
@@ -44,12 +44,6 @@ class mrp_config_settings(osv.osv_memory):
                  'Without this module: A + B + C -> D.\n'
                  'With this module: A + B + C -> D + E.\n'
                  '-This installs the module mrp_byproduct.'),
-        'module_stock_no_autopicking': fields.boolean("Manage manual picking to fulfill manufacturing orders ",
-            help='This module allows an intermediate picking process to provide raw materials to production orders.\n'
-                 'For example to manage production made by your suppliers (sub-contracting).\n'
-                 'To achieve this, set the assembled product which is sub-contracted to "No Auto-Picking" '
-                 'and put the location of the supplier in the routing of the assembly operation.\n'
-                 '-This installs the module stock_no_autopicking.'),
         'group_mrp_routings': fields.boolean("Manage routings and work orders ",
             implied_group='mrp.group_mrp_routings',
             help='Routings allow you to create and manage the manufacturing operations that should be followed '
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 25f3e0b0931..97301e60bf8 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -35,10 +35,6 @@
                                 <field name="module_mrp_repair" class="oe_inline"/>
                                 <label for="module_mrp_repair"/>
                             </div>
-                             <div>
-                                 <field name="module_stock_no_autopicking" class="oe_inline"/>
-                                 <label for="module_stock_no_autopicking" />
-                            </div>
                         </div>
                     </group>
                     <group >

From a173b17ce3e96fb0e97bc7337a8bf8cf0d8af70a Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Wed, 22 Jan 2014 15:39:51 +0100
Subject: [PATCH 07/29] [IMP] Use quant instead of move

bzr revid: jco@openerp.com-20140122143951-vywil9totup32kib
---
 addons/mrp_repair/mrp_repair.py       | 58 +++++----------------------
 addons/mrp_repair/mrp_repair_view.xml |  4 +-
 2 files changed, 13 insertions(+), 49 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 9fd49d5840f..45db1cb4ede 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -139,7 +139,7 @@ class mrp_repair(osv.osv):
             \n* The \'Cancelled\' status is used when user cancel repair order.'),
         'location_id': fields.many2one('stock.location', 'Current Location', select=True, readonly=True, states={'draft':[('readonly',False)], 'confirmed':[('readonly',True)]}),
         'location_dest_id': fields.many2one('stock.location', 'Delivery Location', readonly=True, states={'draft':[('readonly',False)], 'confirmed':[('readonly',True)]}),
-        'quant_id': fields.many2one('stock.quant', 'Quant',required=True, domain="[('product_id','=',product_id)]", readonly=True, states={'draft':[('readonly',False)]}),
+        'quant_id': fields.many2one('stock.quant', 'Quant',required=True, domain="[('product_id','=',product_id), ('qty', '>', 0.0)]", readonly=True, states={'draft':[('readonly',False)]}),
         'guarantee_limit': fields.date('Warranty Expiration', help="The warranty expiration limit is computed as: last move date + warranty defined on selected product. If the current date is below the warranty expiration limit, each operation and fee you will add will be set as 'not to invoiced' by default. Note that you can change manually afterwards.", states={'confirmed':[('readonly',True)]}),
         'operations' : fields.one2many('mrp.repair.line', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', help='Pricelist of the selected partner.'),
@@ -221,22 +221,16 @@ class mrp_repair(osv.osv):
         """
         data = {}
         data['value'] = {'guarantee_limit': False, 'location_id': False, 'partner_id': False}
-        if prod_id and 
         if not prod_id and not quant_id:
             return data
         if quant_id:
-            move =  self.pool.get('stock.move').browse(cr, uid, move_id)
-            product = self.pool.get('product.product').browse(cr, uid, prod_id)
-            limit = datetime.strptime(move.date_expected, '%Y-%m-%d %H:%M:%S') + relativedelta(months=int(product.warranty))
+            quant =  self.pool.get('stock.quant').browse(cr, uid, quant_id)
+            product = quant.product_id
+            data['value']['product_id'] = product.id
+            limit = quant.in_date and datetime.strptime(quant.in_date, '%Y-%m-%d %H:%M:%S') or datetime.strptime(quant.create_date, '%Y-%m-%d %H:%M:%S') + relativedelta(months=int(product.warranty))
             data['value']['guarantee_limit'] = limit.strftime('%Y-%m-%d')
-            data['value']['location_id'] = move.location_dest_id.id
-            data['value']['location_dest_id'] = move.location_dest_id.id
-            if move.partner_id:
-                data['value']['partner_id'] = move.partner_id.id
-            else:
-                data['value']['partner_id'] = False
-            d = self.onchange_partner_id(cr, uid, ids, data['value']['partner_id'], data['value']['partner_id'])
-            data['value'].update(d['value'])
+            data['value']['location_id'] = quant.location_id.id
+            data['value']['location_dest_id'] = quant.location_id.id
         return data
 
     def button_dummy(self, cr, uid, ids, context=None):
@@ -268,39 +262,6 @@ class mrp_repair(osv.osv):
                 }
         }
 
-    def onchange_lot_id(self, cr, uid, ids, lot, product_id):
-        """ On change of Serial Number sets the values of source location,
-        destination location, move and guarantee limit.
-        @param lot: Changed id of Serial Number.
-        @param product_id: Product id from current record.
-        @return: Dictionary of values.
-        """
-        move_obj = self.pool.get('stock.move')
-        data = {}
-        data['value'] = {
-            'location_id': False,
-            'location_dest_id': False,
-            'move_id': False,
-            'guarantee_limit': False
-        }
-
-        if not lot:
-            return data
-
-        if not len(move_ids):
-            return data
-
-        def get_last_move(lst_move):
-            while lst_move.move_dest_id and lst_move.move_dest_id.state == 'done':
-                lst_move = lst_move.move_dest_id
-            return lst_move
-
-        move_id = move_ids[0]
-        move = get_last_move(move_obj.browse(cr, uid, move_id))
-        data['value']['move_id'] = move.id
-        d = self.onchange_move_id(cr, uid, ids, product_id, move.id)
-        data['value'].update(d['value'])
-        return data
 
     def action_cancel_draft(self, cr, uid, ids, *args):
         """ Cancels repair order when it is in 'Draft' state.
@@ -544,6 +505,9 @@ class mrp_repair(osv.osv):
                     'state': 'assigned',
                 })
                 pick_obj.signal_button_confirm(cr, uid, [picking])
+                quants = [(repair.quant_id, repair.quant_id.qty)]
+                move = move_obj.browse(cr, uid, move_id, context=context)
+                self.pool.get("stock.quant").quants_reserve(cr, uid, quants, move, context=context)
                 self.write(cr, uid, [repair.id], {'state': 'done', 'picking_id': picking})
                 res[repair.id] = picking
             else:
@@ -609,7 +573,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
 
     def copy_data(self, cr, uid, id, default=None, context=None):
         if not default: default = {}
-        default.update( {'invoice_line_id': False, 'move_id': False, 'invoiced': False, 'state': 'draft'})
+        default.update( {'invoice_line_id': False, 'quant_id': False, 'invoiced': False, 'state': 'draft'})
         return super(mrp_repair_line, self).copy_data(cr, uid, id, default, context)
 
     def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 4e799ff8709..0a1578104fa 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -9,7 +9,7 @@
             <tree string="Repairs order" colors="gray:state in ('done','cancel');black:state not in ('done','cancel');blue:state=='draft'">
                 <field name="name" />
                 <field name="product_id" />
-                <field name="move_id"/>
+                <field name="quant_id"/>
                 <field name="partner_id"/>
                 <field name="address_id"/>
                 <field name="location_id" groups="stock.group_locations"/>
@@ -47,7 +47,7 @@
                             <field name="product_id" on_change="onchange_product_id(product_id)" domain="[('type','!=','service')]"/>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id,address_id)" attrs="{'required':[('invoice_method','!=','none')]}"/>
                             <field name="address_id" groups="sale.group_delivery_invoice_address"/>
-                            <field name="move_id" on_change="onchange_move_id(product_id, move_id)" context="{'default_product_id':product_id}"/>
+                            <field name="quant_id" on_change="onchange_quant_id(product_id, quant_id)" context="{'default_product_id':product_id}"/>
                             <field name="location_id" attrs="{'required':[('deliver_bool','=', True)]}" groups="stock.group_locations"/>
                         </group>
                         <group>

From 2213f6f102f06a0045cd157d613085006d5f3a4b Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Wed, 22 Jan 2014 16:35:19 +0100
Subject: [PATCH 08/29] [IMP] Add lot on mrp_repair operations

bzr revid: jco@openerp.com-20140122153519-zs2062b653l16qb5
---
 addons/mrp_repair/mrp_repair.py       | 2 ++
 addons/mrp_repair/mrp_repair_view.xml | 1 +
 2 files changed, 3 insertions(+)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 45db1cb4ede..d6c45ca6733 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -471,6 +471,7 @@ class mrp_repair(osv.osv):
                 move_id = move_obj.create(cr, uid, {
                     'name': move.name,
                     'product_id': move.product_id.id,
+                    'restrict_lot_id': move.lot_id.id,
                     'product_uom_qty': move.product_uom_qty,
                     'product_uom': move.product_uom.id,
                     'partner_id': repair.address_id and repair.address_id.id or False,
@@ -606,6 +607,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
         'location_id': fields.many2one('stock.location', 'Source Location', required=True, select=True),
         'location_dest_id': fields.many2one('stock.location', 'Dest. Location', required=True, select=True),
         'move_id': fields.many2one('stock.move', 'Inventory Move', readonly=True),
+        'lot_id': fields.many2one('stock.production.lot', 'Lot'),
         'state': fields.selection([
                     ('draft','Draft'),
                     ('confirmed','Confirmed'),
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 0a1578104fa..cf4236743ce 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -94,6 +94,7 @@
                                 <field name="type" on_change="onchange_operation_type(type,parent.guarantee_limit,parent.company_id,context)"/>
                                 <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)"/>
                                 <field name='name'/>
+                                <field name="lot_id" domain="[('product_id', '=', product_id)]" context="{'default_product_id': product_id}" groups="stock.group_tracking_lot"/>
                                 <field name="location_id" groups="stock.group_locations"/>
                                 <field name="location_dest_id" groups="stock.group_locations"/>
                                 <field name="product_uom_qty" string="Quantity"/>

From 74315dabf9e7ecd5fe9fb92d90a13496be16d595 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Thu, 23 Jan 2014 11:23:04 +0100
Subject: [PATCH 09/29] [FIX]prevent doing an inventory when one product is in
 negative qty

bzr revid: csn@openerp.com-20140123102304-l1ytvax5eqlqzky1
---
 addons/stock/stock.py       | 12 ++++++++++--
 addons/stock/stock_view.xml |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 2896bed07ee..306b028f934 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2018,7 +2018,6 @@ class stock_inventory(osv.osv):
         'date': fields.datetime('Inventory Date', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Inventory Create Date."),
         'date_done': fields.datetime('Date done', help="Inventory Validation Date."),
         'line_ids': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', readonly=False, states={'done': [('readonly', True)]}, help="Inventory Lines."),
-        'line_view_ids': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', readonly=False, domain=['|',('th_qty', '>=', 0),('th_qty', '=', False)], states={'done': [('readonly', True)]}, help="Inventory Lines."),
         'move_ids': fields.one2many('stock.move', 'inventory_id', 'Created Moves', help="Inventory Moves.", states={'done': [('readonly', True)]}),
         'state': fields.selection([('draft', 'Draft'), ('cancel', 'Cancelled'), ('confirm', 'In Progress'), ('done', 'Validated')], 'Status', readonly=True, select=True),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}),
@@ -2076,7 +2075,7 @@ class stock_inventory(osv.osv):
         for inv in self.browse(cr, uid, ids, context=context):
             if inv.line_ids:
                 for inventory_line in inv.line_ids:
-                    if inventory_line.product_qty < 0 and inventory_line.th_qty >= 0:
+                    if inventory_line.product_qty < 0:
                         raise osv.except_osv(_('Warning'),_('You cannot have a negative product quantity in an inventory line'))
             if not inv.move_ids:
                 self.action_check(cr, uid, [inv.id], context=context)
@@ -2185,17 +2184,26 @@ class stock_inventory(osv.osv):
            GROUP BY product_id, location_id, lot_id, package_id, partner_id
         ''', args)
         vals = []
+        negative_product_ids = []
         for product_line in cr.dictfetchall():
             #replace the None the dictionary by False, because falsy values are tested later on
             for key, value in product_line.items():
                 if not value:
                     product_line[key] = False
+            if product_line['product_qty'] < 0:
+                negative_product_ids.append(product_line['product_id'])
             product_line['inventory_id'] = inventory.id
             product_line['th_qty'] = product_line['product_qty']
             if product_line['product_id']:
                 product = product_obj.browse(cr, uid, product_line['product_id'], context=context)
                 product_line['product_uom_id'] = product.uom_id.id
             vals.append(product_line)
+
+        if negative_product_ids:
+            summary = ''
+            for product in self.pool.get('product.product').browse(cr, uid, negative_product_ids, context=context):
+                summary += '- '+product.name+'\n'
+            raise osv.except_osv(_('Warning'),_('These products have a negative qty, please fix them before doing an inventory\n%s' % (summary)))
         return vals
 
 class stock_inventory_line(osv.osv):
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index bd77f6f40c9..7ba08b1a6f1 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -119,7 +119,7 @@
                     <notebook attrs="{'invisible':[('state','=','draft')]}">
                         <page string="Inventory Details" >
                             <button name="set_checked_qty" states="confirm" string="⇒ Set quantities to 0" type="object" class="oe_link oe_right" groups="stock.group_stock_user"/>
-                            <field name="line_view_ids" string="Inventory Details" context="{'default_location_id': location_id,  'default_product_id': product_id, 'default_prod_lot_id': lot_id, 'default_package_id': package_id, 'default_partner_id': partner_id}">
+                            <field name="line_ids" string="Inventory Details" context="{'default_location_id': location_id,  'default_product_id': product_id, 'default_prod_lot_id': lot_id, 'default_package_id': package_id, 'default_partner_id': partner_id}">
                                 <tree string="Inventory Details" editable="bottom" colors="blue: product_qty != th_qty">
                                     <field context="{'location':location_id, 'uom':product_uom_id, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom_id,partner_id,prod_lot_id,package_id)" domain="[('type','=','product')]"/>
                                     <field name="product_uom_id" groups="product.group_uom" on_change="on_change_product_id(location_id,product_id,product_uom_id,partner_id,prod_lot_id,package_id)"/>

From 386f7c1212705a9cc3b2e73731bfcc4ca447dfbf Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Thu, 23 Jan 2014 18:27:41 +0100
Subject: [PATCH 10/29] [WIP] Change repair orders not to use quants, but
 always to create move that splits quant from a certain location and lot

bzr revid: jco@openerp.com-20140123172741-cjgzps1twsvv0n76
---
 addons/mrp_repair/mrp_repair.py       | 99 ++++++++-------------------
 addons/mrp_repair/mrp_repair_view.xml | 10 +--
 2 files changed, 33 insertions(+), 76 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index d6c45ca6733..4fc9007b034 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -25,7 +25,6 @@ from dateutil.relativedelta import relativedelta
 from openerp.tools.translate import _
 import openerp.addons.decimal_precision as dp
 
-# TODO: replace move_id by quant_id everywhere
 
 class mrp_repair(osv.osv):
     _name = 'mrp.repair'
@@ -137,9 +136,9 @@ class mrp_repair(osv.osv):
             \n* The \'To be Invoiced\' status is used to generate the invoice before or after repairing done. \
             \n* The \'Done\' status is set when repairing is completed.\
             \n* The \'Cancelled\' status is used when user cancel repair order.'),
-        'location_id': fields.many2one('stock.location', 'Current Location', select=True, readonly=True, states={'draft':[('readonly',False)], 'confirmed':[('readonly',True)]}),
-        'location_dest_id': fields.many2one('stock.location', 'Delivery Location', readonly=True, states={'draft':[('readonly',False)], 'confirmed':[('readonly',True)]}),
-        'quant_id': fields.many2one('stock.quant', 'Quant',required=True, domain="[('product_id','=',product_id), ('qty', '>', 0.0)]", readonly=True, states={'draft':[('readonly',False)]}),
+        'location_id': fields.many2one('stock.location', 'Current Location', select=True, required = True, readonly=True, states={'draft':[('readonly',False)], 'confirmed':[('readonly',True)]}),
+        'location_dest_id': fields.many2one('stock.location', 'Delivery Location', readonly=True, required = True, states={'draft':[('readonly',False)], 'confirmed':[('readonly',True)]}),
+        'lot_id': fields.many2one('stock.production.lot', 'Lot', domain="[('product_id','=', product_id)]", help="Lot chosen"),
         'guarantee_limit': fields.date('Warranty Expiration', help="The warranty expiration limit is computed as: last move date + warranty defined on selected product. If the current date is below the warranty expiration limit, each operation and fee you will add will be set as 'not to invoiced' by default. Note that you can change manually afterwards.", states={'confirmed':[('readonly',True)]}),
         'operations' : fields.one2many('mrp.repair.line', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', help='Pricelist of the selected partner.'),
@@ -151,13 +150,11 @@ class mrp_repair(osv.osv):
            ], "Invoice Method",
             select=True, required=True, states={'draft':[('readonly',False)]}, readonly=True, help='Selecting \'Before Repair\' or \'After Repair\' will allow you to generate invoice before or after the repair is done respectively. \'No invoice\' means you don\'t want to generate invoice for this repair order.'),
         'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
-        'picking_id': fields.many2one('stock.picking', 'Picking',readonly=True),
+        'move_id': fields.many2one('stock.move', 'Move',readonly=True),
         'fees_lines': fields.one2many('mrp.repair.fee', 'repair_id', 'Fees Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'internal_notes': fields.text('Internal Notes'),
         'quotation_notes': fields.text('Quotation Notes'),
         'company_id': fields.many2one('res.company', 'Company'),
-        'deliver_bool': fields.boolean('Deliver', help="Check this box if you want to manage the delivery once the product is repaired and create a picking with selected product. Note that you can select the locations in the Info tab, if you have the extended view.", states={'confirmed':[('readonly',True)]}),
-        'picking_type_id': fields.many2one('stock.picking.type', 'Picking Type'),
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'repaired': fields.boolean('Repaired', readonly=True),
         'amount_untaxed': fields.function(_amount_untaxed, string='Untaxed Amount',
@@ -175,15 +172,16 @@ class mrp_repair(osv.osv):
                 'mrp.repair': (lambda self, cr, uid, ids, c={}: ids, ['operations'], 10),
                 'mrp.repair.line': (_get_lines, ['price_unit', 'price_subtotal', 'product_id', 'tax_id', 'product_uom_qty', 'product_uom'], 10),
             }),
+        'product_qty': fields.integer('Quantity', help='Product Qty'), 
     }
 
     _defaults = {
         'state': lambda *a: 'draft',
-        'deliver_bool': lambda *a: True,
         'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'mrp.repair'),
         'invoice_method': lambda *a: 'none',
         'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.repair', context=context),
-        'pricelist_id': lambda self, cr, uid,context : self.pool.get('product.pricelist').search(cr, uid, [('type','=','sale')])[0]
+        'pricelist_id': lambda self, cr, uid,context : self.pool.get('product.pricelist').search(cr, uid, [('type','=','sale')])[0],
+        'product_qty': 1.0, 
     }
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -194,7 +192,7 @@ class mrp_repair(osv.osv):
             'repaired':False,
             'invoiced':False,
             'invoice_id': False,
-            'picking_id': False,
+            'move_id': False,
             'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.repair'),
         })
         return super(mrp_repair, self).copy(cr, uid, id, default, context)
@@ -205,33 +203,15 @@ class mrp_repair(osv.osv):
         @return: Dictionary of values.
         """
         return {'value': {
-                    'quant_id': False,
                     'guarantee_limit' :False,
-                    'location_id':  False,
-                    'location_dest_id': False,
+                    'lot_id': False,
                 }
         }
-
-    def onchange_quant_id(self, cr, uid, ids, prod_id=False, quant_id=False):
-        """ On change of move id sets values of guarantee limit, source location,
-        destination location, partner and partner address.
-        @param prod_id: Id of product in current record.
-        @param quant_id: Quant to handle
-        @return: Dictionary of values.
+        
+    def onchange_location_id(self, cr, uid, ids, location_id=None):
+        """ On change of location
         """
-        data = {}
-        data['value'] = {'guarantee_limit': False, 'location_id': False, 'partner_id': False}
-        if not prod_id and not quant_id:
-            return data
-        if quant_id:
-            quant =  self.pool.get('stock.quant').browse(cr, uid, quant_id)
-            product = quant.product_id
-            data['value']['product_id'] = product.id
-            limit = quant.in_date and datetime.strptime(quant.in_date, '%Y-%m-%d %H:%M:%S') or datetime.strptime(quant.create_date, '%Y-%m-%d %H:%M:%S') + relativedelta(months=int(product.warranty))
-            data['value']['guarantee_limit'] = limit.strftime('%Y-%m-%d')
-            data['value']['location_id'] = quant.location_id.id
-            data['value']['location_dest_id'] = quant.location_id.id
-        return data
+        return {'value': {'location_dest_id': location_id}}
 
     def button_dummy(self, cr, uid, ids, context=None):
         return True
@@ -459,13 +439,12 @@ class mrp_repair(osv.osv):
         return True
 
     def action_repair_done(self, cr, uid, ids, context=None):
-        """ Creates stock move and picking for repair order.
-        @return: Picking ids.
+        """ Creates stock move for operation and stock move for final product of repair order.
+        @return: Move ids of final products
         """
         res = {}
         move_obj = self.pool.get('stock.move')
         repair_line_obj = self.pool.get('mrp.repair.line')
-        pick_obj = self.pool.get('stock.picking')
         for repair in self.browse(cr, uid, ids, context=context):
             for move in repair.operations:
                 move_id = move_obj.create(cr, uid, {
@@ -481,38 +460,20 @@ class mrp_repair(osv.osv):
                 })
                 move_obj.action_done(cr, uid, [move_id], context=context)
                 repair_line_obj.write(cr, uid, [move.id], {'move_id': move_id, 'state': 'done'}, context=context)
-            if repair.deliver_bool:
-                if not repair.picking_type_id:
-                    raise osv.except_osv(_('Warning!'), _('No picking type set.'))
-                pick_name = self.pool.get('ir.sequence').get_id(cr, uid, repair.picking_type_id.sequence_id.id, 'id', context=context)
-                picking = pick_obj.create(cr, uid, {
-                    'name': pick_name,
-                    'origin': repair.name,
-                    'state': 'draft',
-                    'move_type': 'one',
-                    'partner_id': repair.address_id and repair.address_id.id or False,
-                    'note': repair.internal_notes,
-                    'invoice_state': 'none',
-                    'picking_type_id': repair.picking_type_id.id,
-                })
-                move_id = move_obj.create(cr, uid, {
-                    'name': repair.name,
-                    'picking_id': picking,
-                    'product_id': repair.product_id.id,
-                    'product_uom': repair.product_id.uom_id.id,
-                    'partner_id': repair.address_id and repair.address_id.id or False,
-                    'location_id': repair.location_id.id,
-                    'location_dest_id': repair.location_dest_id.id,
-                    'state': 'assigned',
-                })
-                pick_obj.signal_button_confirm(cr, uid, [picking])
-                quants = [(repair.quant_id, repair.quant_id.qty)]
-                move = move_obj.browse(cr, uid, move_id, context=context)
-                self.pool.get("stock.quant").quants_reserve(cr, uid, quants, move, context=context)
-                self.write(cr, uid, [repair.id], {'state': 'done', 'picking_id': picking})
-                res[repair.id] = picking
-            else:
-                self.write(cr, uid, [repair.id], {'state': 'done'})
+            move_id = move_obj.create(cr, uid, {
+                'name': repair.name,
+                'product_id': repair.product_id.id,
+                'product_uom': repair.product_id.uom_id.id,
+                'partner_id': repair.address_id and repair.address_id.id or False,
+                'location_id': repair.location_id.id,
+                'location_dest_id': repair.location_dest_id.id,
+                'restrict_lot_id': repair.lot_id.id,
+                'product_qty': repair.product_qty, 
+            })
+            move_obj.signal_button_confirm(cr, uid, [move_id])
+            move_obj.action_done(cr, uid, [move_id], context=context)
+            self.write(cr, uid, [repair.id], {'state': 'done', 'move_id': move_id}, context=context)
+            res[repair.id] = move_id
         return res
 
 
@@ -574,7 +535,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
 
     def copy_data(self, cr, uid, id, default=None, context=None):
         if not default: default = {}
-        default.update( {'invoice_line_id': False, 'quant_id': False, 'invoiced': False, 'state': 'draft'})
+        default.update( {'invoice_line_id': False, 'move_id': False, 'invoiced': False, 'state': 'draft'})
         return super(mrp_repair_line, self).copy_data(cr, uid, id, default, context)
 
     def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index cf4236743ce..7c973470403 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -9,7 +9,6 @@
             <tree string="Repairs order" colors="gray:state in ('done','cancel');black:state not in ('done','cancel');blue:state=='draft'">
                 <field name="name" />
                 <field name="product_id" />
-                <field name="quant_id"/>
                 <field name="partner_id"/>
                 <field name="address_id"/>
                 <field name="location_id" groups="stock.group_locations"/>
@@ -47,13 +46,10 @@
                             <field name="product_id" on_change="onchange_product_id(product_id)" domain="[('type','!=','service')]"/>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id,address_id)" attrs="{'required':[('invoice_method','!=','none')]}"/>
                             <field name="address_id" groups="sale.group_delivery_invoice_address"/>
-                            <field name="quant_id" on_change="onchange_quant_id(product_id, quant_id)" context="{'default_product_id':product_id}"/>
-                            <field name="location_id" attrs="{'required':[('deliver_bool','=', True)]}" groups="stock.group_locations"/>
+                            <field name="location_id" on_change="onchange_location_id(location_id)" groups="stock.group_locations"/>
                         </group>
                         <group>
                             <field name="guarantee_limit"/>
-                            <field name="deliver_bool"/>
-                            <field name="picking_type_id" attrs="{'invisible': [('deliver_bool','=', False)], 'required': [('deliver_bool', '=', True)]}"/>
                             <field name="repaired" groups="base.group_no_one"/>
                             <field name="invoiced" groups="base.group_no_one"/>
                         </group>
@@ -171,12 +167,12 @@
                     <page string="Extra Info">
                         <group>
                             <group>
-                                <field name="picking_id"/>
+                                <field name="move_id"/>
                                 <field name="invoice_id" context="{'form_view_ref': 'account.invoice_form'}"/>
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             </group>
                             <group>
-                                <field name="location_dest_id" attrs="{'required':[('deliver_bool','=', True)]}" groups="stock.group_locations"/>
+                                <field name="location_dest_id" groups="stock.group_locations"/>
                             </group>
                         </group>
                     </page>

From 01679750c020d41e5d8741d8bd4ae1230f0b4e6c Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Fri, 24 Jan 2014 11:35:01 +0100
Subject: [PATCH 11/29] [IMP] Add product qty and UoM to repair order

bzr revid: jco@openerp.com-20140124103501-jhz0v3l1pj68i8nb
---
 addons/mrp_repair/mrp_repair.py       | 27 ++++++++++++++++++++++-----
 addons/mrp_repair/mrp_repair_view.xml |  7 ++++++-
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 4fc9007b034..66325ee500c 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -117,6 +117,9 @@ class mrp_repair(osv.osv):
     _columns = {
         'name': fields.char('Repair Reference',size=24, required=True, states={'confirmed':[('readonly',True)]}),
         'product_id': fields.many2one('product.product', string='Product to Repair', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'product_qty': fields.float('Product Quantity', help='Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), 
+                                    required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'partner_id' : fields.many2one('res.partner', 'Partner', select=True, help='Choose partner for whom the order will be invoiced and delivered.', states={'confirmed':[('readonly',True)]}),
         'address_id': fields.many2one('res.partner', 'Delivery Address', domain="[('parent_id','=',partner_id)]", states={'confirmed':[('readonly',True)]}),
         'default_address_id': fields.function(_get_default_address, type="many2one", relation="res.partner"),
@@ -172,7 +175,6 @@ class mrp_repair(osv.osv):
                 'mrp.repair': (lambda self, cr, uid, ids, c={}: ids, ['operations'], 10),
                 'mrp.repair.line': (_get_lines, ['price_unit', 'price_subtotal', 'product_id', 'tax_id', 'product_uom_qty', 'product_uom'], 10),
             }),
-        'product_qty': fields.integer('Quantity', help='Product Qty'), 
     }
 
     _defaults = {
@@ -181,7 +183,7 @@ class mrp_repair(osv.osv):
         'invoice_method': lambda *a: 'none',
         'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.repair', context=context),
         'pricelist_id': lambda self, cr, uid,context : self.pool.get('product.pricelist').search(cr, uid, [('type','=','sale')])[0],
-        'product_qty': 1.0, 
+        'product_qty': 1.0,
     }
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -202,12 +204,27 @@ class mrp_repair(osv.osv):
         @param product_id: Changed product
         @return: Dictionary of values.
         """
+        product = False
+        if product_id:
+            product = self.pool.get("product.product").browse(cr, uid, product_id)
         return {'value': {
                     'guarantee_limit' :False,
                     'lot_id': False,
+                    'product_uom': product and product.uom_id.id or False,
                 }
         }
-        
+    
+    def onchange_product_uom(self, cr, uid, ids, product_id, product_uom, context=None):
+        res = {'value':{}}
+        if not product_uom or not product_id:
+            return res
+        product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+        uom = self.pool.get('product.uom').browse(cr, uid, product_uom, context=context)
+        if uom.category_id.id != product.uom_id.category_id.id:
+            res['warning'] = {'title': _('Warning'), 'message': _('The Product Unit of Measure you chose has a different category than in the product form.')}
+            res['value'].update({'product_uom': product.uom_id.id})
+        return res
+    
     def onchange_location_id(self, cr, uid, ids, location_id=None):
         """ On change of location
         """
@@ -463,12 +480,12 @@ class mrp_repair(osv.osv):
             move_id = move_obj.create(cr, uid, {
                 'name': repair.name,
                 'product_id': repair.product_id.id,
-                'product_uom': repair.product_id.uom_id.id,
+                'product_uom': repair.product_uom.id,
+                'product_qty': repair.product_qty,
                 'partner_id': repair.address_id and repair.address_id.id or False,
                 'location_id': repair.location_id.id,
                 'location_dest_id': repair.location_dest_id.id,
                 'restrict_lot_id': repair.lot_id.id,
-                'product_qty': repair.product_qty, 
             })
             move_obj.signal_button_confirm(cr, uid, [move_id])
             move_obj.action_done(cr, uid, [move_id], context=context)
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 7c973470403..972fef71c00 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -44,6 +44,11 @@
                     <group>
                         <group>
                             <field name="product_id" on_change="onchange_product_id(product_id)" domain="[('type','!=','service')]"/>
+                            <label for="product_qty"/>
+                            <div>
+                                <field name="product_qty" class="oe_inline"/> 
+                                <field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(product_id, product_uom)" class="oe_inline"/>
+                            </div>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id,address_id)" attrs="{'required':[('invoice_method','!=','none')]}"/>
                             <field name="address_id" groups="sale.group_delivery_invoice_address"/>
                             <field name="location_id" on_change="onchange_location_id(location_id)" groups="stock.group_locations"/>
@@ -56,7 +61,7 @@
                     </group>
                 <notebook>
                     <page string="Operations">
-                        <field name="operations">
+                        <field name="operations" context="{'default_product_uom_qty': product_qty}">
                             <form string="Operations" version="7.0">
                                 <notebook>
                                     <page string="Repair Line">

From 44f3e6de6674818ab42ff667bc1b066ed7d830c5 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Fri, 24 Jan 2014 13:30:36 +0100
Subject: [PATCH 12/29] [IMP] Adapt demo data and tests mrp repair

bzr revid: jco@openerp.com-20140124123036-w63uzmrkg08qoil0
---
 addons/mrp_repair/mrp_repair.py               |  2 +-
 addons/mrp_repair/mrp_repair_demo.yml         | 59 ++++---------------
 .../test/test_mrp_repair_noneinv.yml          |  7 +--
 3 files changed, 14 insertions(+), 54 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 66325ee500c..80882cd80ef 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -480,7 +480,7 @@ class mrp_repair(osv.osv):
             move_id = move_obj.create(cr, uid, {
                 'name': repair.name,
                 'product_id': repair.product_id.id,
-                'product_uom': repair.product_uom.id,
+                'product_uom': repair.product_uom.id or repair.product_id.uom_id.id,
                 'product_qty': repair.product_qty,
                 'partner_id': repair.address_id and repair.address_id.id or False,
                 'location_id': repair.location_id.id,
diff --git a/addons/mrp_repair/mrp_repair_demo.yml b/addons/mrp_repair/mrp_repair_demo.yml
index 1299cbfb6d2..f9f0eaf03f8 100644
--- a/addons/mrp_repair/mrp_repair_demo.yml
+++ b/addons/mrp_repair/mrp_repair_demo.yml
@@ -1,25 +1,13 @@
--
-  !record {model: stock.move, id: stock_move_pcbasicpc0}:
-    company_id: base.main_company
-    date: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
-    date_expected: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
-    location_dest_id: stock.stock_location_14
-    location_id: stock.stock_location_stock
-    name: '[PCSC234] PC Assemble SC234'
-    product_id: product.product_product_3
-    product_qty: 1.0
-    product_uom: product.product_uom_unit
-    product_uos_qty: 1.0
 -
   !record {model: mrp.repair, id: mrp_repair_rmrp1}:
     address_id: base.res_partner_address_1
     guarantee_limit: !eval datetime.today().strftime("%Y-%m-%d")
     invoice_method: 'none'
+    product_id: product.product_product_3
+    product_uom: product.product_uom_unit
     partner_invoice_id: base.res_partner_address_1
     location_dest_id: stock.stock_location_14
-    location_id: stock.stock_location_14
-    picking_type_id: stock.picking_type_out
-    move_id: 'stock_move_pcbasicpc0'
+    location_id: stock.stock_location_stock
     name: RMA00004
     operations:
       - location_dest_id: stock.location_production
@@ -39,29 +27,16 @@
         product_uom: product.product_uom_unit
         price_unit: 50.0
     partner_id: base.res_partner_9
-    product_id: product.product_product_3
--
-  !record {model: stock.move, id: stock.stock_move_stockmvmrp1}:
-    company_id: base.main_company
-    date: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
-    date_expected: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
-    location_dest_id: stock.stock_location_14
-    location_id: stock.stock_location_stock
-    name: '[PC-DEM] PC on Demand'
-    product_id: product.product_product_5
-    product_qty: 1.0
-    product_uom: product.product_uom_unit
-    product_uos_qty: 1.0
 -
   !record {model: mrp.repair, id: mrp_repair_rmrp0}:
+    product_id: product.product_product_5
+    product_uom: product.product_uom_unit
     address_id: base.res_partner_address_1
     guarantee_limit: !eval datetime.today().strftime("%Y-%m-%d")
     invoice_method: 'after_repair'
     partner_invoice_id: base.res_partner_address_1
     location_dest_id: stock.stock_location_14
-    location_id: stock.stock_location_14
-    picking_type_id: stock.picking_type_out
-    move_id: 'stock.stock_move_stockmvmrp1'
+    location_id: stock.stock_location_stock
     name: RMA-00007
     operations:
       - location_dest_id: stock.location_production
@@ -81,29 +56,16 @@
         product_uom: product.product_uom_unit
         price_unit: 50.0
     partner_id: base.res_partner_9
-    product_id: product.product_product_5
--
-  !record {model: stock.move, id: stock.stock_move_stockmvmrp2}:
-    company_id: base.main_company
-    date: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
-    date_expected: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
-    location_dest_id: stock.stock_location_14
-    location_id: stock.stock_location_stock
-    name: '[LCD15] 15” LCD Monitor'
-    product_id: product.product_product_6
-    product_qty: 1.0
-    product_uom: product.product_uom_unit
-    product_uos_qty: 1.0
 -
   !record {model: mrp.repair, id: mrp_repair_rmrp2}:
+    product_id: product.product_product_6
+    product_uom: product.product_uom_unit
     address_id: base.res_partner_address_1
     guarantee_limit: !eval datetime.today().strftime("%Y-%m-%d")
     invoice_method: 'b4repair'
     partner_invoice_id: base.res_partner_address_1
-    location_dest_id: stock.stock_location_14
+    location_dest_id: stock.stock_location_stock
     location_id: stock.stock_location_14
-    picking_type_id: stock.picking_type_out
-    move_id: 'stock.stock_move_stockmvmrp2'
     name: RMA-00011
     operations:
       - location_dest_id: stock.location_production
@@ -122,5 +84,4 @@
         product_uom_qty: 1.0
         product_uom: product.product_uom_unit
         price_unit: 50.0
-    partner_id: base.res_partner_9
-    product_id: product.product_product_6
+    partner_id: base.res_partner_9
\ No newline at end of file
diff --git a/addons/mrp_repair/test/test_mrp_repair_noneinv.yml b/addons/mrp_repair/test/test_mrp_repair_noneinv.yml
index 4485069dc01..53a392b6bee 100644
--- a/addons/mrp_repair/test/test_mrp_repair_noneinv.yml
+++ b/addons/mrp_repair/test/test_mrp_repair_noneinv.yml
@@ -8,7 +8,7 @@
 -
   !workflow {model: mrp.repair, action: repair_confirm, ref: mrp_repair_rmrp1}
 -
-  I start the repairing  process by clicking on "Start Repair" button for Invoice Method 'No Invoice'.
+  I start the repairing process by clicking on "Start Repair" button for Invoice Method 'No Invoice'.
 -
   !workflow {model: mrp.repair, action: repair_ready, ref: mrp_repair_rmrp1}
 -
@@ -22,9 +22,8 @@
   !workflow {model: mrp.repair, action: action_repair_end, ref: mrp_repair_rmrp1}
 -
   I define Invoice Method 'No Invoice' option in this repair order.
-  So, I check that Invoice should not be created for this repair order.
+  So, I check that Invoice has not been created for this repair order.
 -
   !python {model: mrp.repair}: |
      repair_id = self.browse(cr, uid, [ref('mrp_repair_rmrp1')], context=context)[0]
-     assert not repair_id.invoice_id.id, "Invoice should not exist for this repair order"
-
+     assert not repair_id.invoice_id.id, "Invoice should not exist for this repair order"
\ No newline at end of file

From 80cb45042dc7bcfbd03c2e4a3b989b1a61a2d761 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Fri, 24 Jan 2014 14:23:30 +0100
Subject: [PATCH 13/29] [IMP] Add lot in view

bzr revid: jco@openerp.com-20140124132330-hhoju51q871528h0
---
 addons/mrp_repair/mrp_repair_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 972fef71c00..a3c6ab012a1 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -49,6 +49,7 @@
                                 <field name="product_qty" class="oe_inline"/> 
                                 <field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(product_id, product_uom)" class="oe_inline"/>
                             </div>
+                            <field name="lot_id" domain="[('product_id','=',product_id]" context="{'default_product_id': product_id}" groups="stock.track_grouping_lot"/>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id,address_id)" attrs="{'required':[('invoice_method','!=','none')]}"/>
                             <field name="address_id" groups="sale.group_delivery_invoice_address"/>
                             <field name="location_id" on_change="onchange_location_id(location_id)" groups="stock.group_locations"/>

From 49d549bb392a37cd2d9e7b968a339a56ae4afd22 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Fri, 24 Jan 2014 17:30:32 +0100
Subject: [PATCH 14/29] [IMP] New traceability button instead of down/upstream
 buttons

bzr revid: jco@openerp.com-20140124163032-6g24pwusfla9z00n
---
 addons/stock/res_config.py  |  2 +-
 addons/stock/stock.py       | 39 +++++++++++++++++++++++++++++++++++++
 addons/stock/stock_data.xml |  2 +-
 addons/stock/stock_view.xml |  7 +++----
 4 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index 338e9728f66..952407f59b3 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -69,7 +69,7 @@ This installs the module product_expiry."""),
             help="""Allows you to create and manage your packaging dimensions and types you want to be maintained in your system."""),
         'group_stock_tracking_lot': fields.boolean("Track serial number on products",
             implied_group='stock.group_tracking_lot',
-            help="""This allows you to manage products by using serial numbers. When you select a serial number on product moves, you can get the upstream or downstream traceability of that product."""),
+            help="""This allows you to manage products by using serial numbers. When you select a serial number on product moves, you can get the traceability of that product."""),
         'group_stock_tracking_owner': fields.boolean("Manage owner on stock", 
             implied_group='stock.group_tracking_owner', 
             help="""This way you can receive products attributed to a certain owner. """), 
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 3e32eddd640..ae8db2950be 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1162,6 +1162,45 @@ class stock_production_lot(osv.osv):
         ('name_ref_uniq', 'unique (name, ref)', 'The combination of Serial Number and internal reference must be unique !'),
     ]
 
+    def action_traceability(self, cr, uid, ids, context=None):
+        """ It traces the information of a product
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: List of IDs selected
+        @param context: A standard dictionary
+        @return: A dictionary of values
+        """
+        if not ids or len(ids) == 0:
+            return False #TODO give warning instead
+        quant_obj = self.pool.get("stock.quant")
+        move_obj = self.pool.get("stock.move")
+        quants = quant_obj.search(cr, uid, [('lot_id', 'in', ids)], context=context)
+        moves = set()
+        for quant in quant_obj.browse(cr, uid, quants, context=context):
+            for move in quant.history_ids:
+                moves.add(move.id)
+#         import pdb
+#         pdb.set_trace()
+        if moves:
+#             ir_model_data = self.pool.get('ir.model.data')
+#             try: 
+#                 template_id = ir_model_data.get_object_reference(cr, uid, 'stock', 'view_move_tree')[1]
+#             except:
+#                 template_id = False
+            return { 
+                'domain': "[('id','in',["+','.join(map(str, list(moves)))+"])]",
+                'name': 'Traceability',
+                'view_mode': 'tree, form',
+                'view_type': 'tree',
+                'res_model': 'stock.move',
+                'type': 'ir.actions.act_window',
+                'nodestroy':True,
+                    }
+        else:
+            return False
+        
+
 
 # ----------------------------------------------------
 # Move
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index 432e015600a..332c2130d05 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -78,7 +78,7 @@
             <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Warehouse Management application installed!</field>
             <field name="body"><![CDATA[<p>Manage your product inventoy and stock locations: you can control stock moves history and planning,
-watch your stock valuation, and track production lots upstream and downstream (based on serial numbers).</p>]]></field>
+watch your stock valuation, and track production lots (based on serial numbers).</p>]]></field>
         </record>
 
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 9ec583f89ff..ff542762c38 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -191,8 +191,7 @@
             <field name="arch" type="xml">
                 <form string="Serial Number" version="7.0">
                     <div class="oe_button_box oe_right">
-                        <button name="action_traceability" string="Upstream Traceability" type="object"/>
-                        <button name="action_traceability" string="Downstream Traceability" type="object"/>
+                        <button name="action_traceability" string="Traceability" type="object"/>
                     </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
@@ -261,9 +260,9 @@
                 Click to add a serial number.
               </p><p>
                 This is the list of all the production lots you recorded. When
-                you select a lot, you can get the upstream or downstream
+                you select a lot, you can get the 
                 traceability of the products contained in lot. By default, the
-                list is filtred on the serial numbers that are available in
+                list is filtered on the serial numbers that are available in
                 your warehouse but you can uncheck the 'Available' button to
                 get all the lots you produced, received or delivered to
                 customers.

From 4d416e69a8b0da2fe5673190a246b25044e4961d Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Fri, 24 Jan 2014 17:55:03 +0100
Subject: [PATCH 15/29] [IMP] Make sure returned action window dictionary is
 correct

bzr revid: jco@openerp.com-20140124165503-vz8w5vox0xqa1kj8
---
 addons/stock/stock.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index ae8db2950be..00a75dd60b1 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1180,22 +1180,14 @@ class stock_production_lot(osv.osv):
         for quant in quant_obj.browse(cr, uid, quants, context=context):
             for move in quant.history_ids:
                 moves.add(move.id)
-#         import pdb
-#         pdb.set_trace()
         if moves:
-#             ir_model_data = self.pool.get('ir.model.data')
-#             try: 
-#                 template_id = ir_model_data.get_object_reference(cr, uid, 'stock', 'view_move_tree')[1]
-#             except:
-#                 template_id = False
             return { 
                 'domain': "[('id','in',["+','.join(map(str, list(moves)))+"])]",
                 'name': 'Traceability',
-                'view_mode': 'tree, form',
-                'view_type': 'tree',
+                'view_mode': 'tree,form',
+                'view_type': 'form',
                 'res_model': 'stock.move',
                 'type': 'ir.actions.act_window',
-                'nodestroy':True,
                     }
         else:
             return False

From 28cc62ffb42d61bb31fbff510fd0a833793b0565 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Mon, 27 Jan 2014 10:47:35 +0100
Subject: [PATCH 16/29] [IMP] Do not show button if no quants and prefer same
 view as for stock moves

bzr revid: jco@openerp.com-20140127094735-j16y0xjgw10p5erx
---
 addons/stock/stock.py       | 1 +
 addons/stock/stock_view.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 00a75dd60b1..bc0b6294727 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1186,6 +1186,7 @@ class stock_production_lot(osv.osv):
                 'name': 'Traceability',
                 'view_mode': 'tree,form',
                 'view_type': 'form',
+                'context': {'tree_view_ref': 'stock.view_move_tree'},
                 'res_model': 'stock.move',
                 'type': 'ir.actions.act_window',
                     }
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ff542762c38..7af0d7d0064 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -191,7 +191,7 @@
             <field name="arch" type="xml">
                 <form string="Serial Number" version="7.0">
                     <div class="oe_button_box oe_right">
-                        <button name="action_traceability" string="Traceability" type="object"/>
+                        <button name="action_traceability" string="Traceability" type="object" attrs="{'invisible': [('quant_ids','=',[])]}"/>
                     </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>

From 71d97e70082d50159afc3de09e428146140ea75d Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 27 Jan 2014 12:25:27 +0100
Subject: [PATCH 17/29] [IMP] stock: some code refactoring on the new
 traceability action

bzr revid: qdp-launchpad@openerp.com-20140127112527-ynyyjsizy10zm1vn
---
 addons/stock/stock.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 032bb71799c..de2622862eb 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1165,7 +1165,7 @@ class stock_production_lot(osv.osv):
     ]
 
     def action_traceability(self, cr, uid, ids, context=None):
-        """ It traces the information of a product
+        """ It traces the information of lots
         @param self: The object pointer.
         @param cr: A database cursor
         @param uid: ID of the user currently logged in
@@ -1180,20 +1180,18 @@ class stock_production_lot(osv.osv):
         quants = quant_obj.search(cr, uid, [('lot_id', 'in', ids)], context=context)
         moves = set()
         for quant in quant_obj.browse(cr, uid, quants, context=context):
-            for move in quant.history_ids:
-                moves.add(move.id)
+            moves |= {move.id for move in quant.history_ids}
         if moves:
             return { 
                 'domain': "[('id','in',["+','.join(map(str, list(moves)))+"])]",
-                'name': 'Traceability',
+                'name': _('Traceability'),
                 'view_mode': 'tree,form',
                 'view_type': 'form',
                 'context': {'tree_view_ref': 'stock.view_move_tree'},
                 'res_model': 'stock.move',
                 'type': 'ir.actions.act_window',
                     }
-        else:
-            return False
+        return False
         
 
 

From aed6fa8dc50facf47e1f416ff8f2efec12702a43 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 27 Jan 2014 13:40:45 +0100
Subject: [PATCH 18/29] [IMP] stock: small refactoring

bzr revid: qdp-launchpad@openerp.com-20140127124045-14yk1o7m00p8ai8e
---
 addons/stock/stock.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index de2622862eb..899d253e70c 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1173,8 +1173,6 @@ class stock_production_lot(osv.osv):
         @param context: A standard dictionary
         @return: A dictionary of values
         """
-        if not ids or len(ids) == 0:
-            return False #TODO give warning instead
         quant_obj = self.pool.get("stock.quant")
         move_obj = self.pool.get("stock.move")
         quants = quant_obj.search(cr, uid, [('lot_id', 'in', ids)], context=context)

From e1ddf7b056b0c80405f4528b01446f66833eeb6c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 27 Jan 2014 16:48:08 +0100
Subject: [PATCH 19/29] [REF] mrp_repair: small refactoring

bzr revid: qdp-launchpad@openerp.com-20140127154808-ohlkbr3f7zxo040z
---
 addons/mrp_repair/mrp_repair.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 5562c8b4d5b..23b98d4b1b5 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -117,7 +117,7 @@ class mrp_repair(osv.osv):
     _columns = {
         'name': fields.char('Repair Reference',size=24, required=True, states={'confirmed':[('readonly',True)]}),
         'product_id': fields.many2one('product.product', string='Product to Repair', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'product_qty': fields.float('Product Quantity', help='Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), 
+        'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), 
                                     required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'partner_id' : fields.many2one('res.partner', 'Partner', select=True, help='Choose partner for whom the order will be invoiced and delivered.', states={'confirmed':[('readonly',True)]}),
@@ -139,9 +139,9 @@ class mrp_repair(osv.osv):
             \n* The \'To be Invoiced\' status is used to generate the invoice before or after repairing done. \
             \n* The \'Done\' status is set when repairing is completed.\
             \n* The \'Cancelled\' status is used when user cancel repair order.'),
-        'location_id': fields.many2one('stock.location', 'Current Location', select=True, required = True, readonly=True, states={'draft':[('readonly',False)], 'confirmed':[('readonly',True)]}),
-        'location_dest_id': fields.many2one('stock.location', 'Delivery Location', readonly=True, required = True, states={'draft':[('readonly',False)], 'confirmed':[('readonly',True)]}),
-        'lot_id': fields.many2one('stock.production.lot', 'Lot', domain="[('product_id','=', product_id)]", help="Lot chosen"),
+        'location_id': fields.many2one('stock.location', 'Current Location', select=True, required=True, readonly=True, states={'draft':[('readonly',False)], 'confirmed':[('readonly',True)]}),
+        'location_dest_id': fields.many2one('stock.location', 'Delivery Location', readonly=True, required=True, states={'draft':[('readonly',False)], 'confirmed':[('readonly',True)]}),
+        'lot_id': fields.many2one('stock.production.lot', 'Repaired Lot', domain="[('product_id','=', product_id)]", help="Products repaired are all belonging to this lot"),
         'guarantee_limit': fields.date('Warranty Expiration', help="The warranty expiration limit is computed as: last move date + warranty defined on selected product. If the current date is below the warranty expiration limit, each operation and fee you will add will be set as 'not to invoiced' by default. Note that you can change manually afterwards.", states={'confirmed':[('readonly',True)]}),
         'operations' : fields.one2many('mrp.repair.line', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', help='Pricelist of the selected partner.'),
@@ -153,7 +153,7 @@ class mrp_repair(osv.osv):
            ], "Invoice Method",
             select=True, required=True, states={'draft':[('readonly',False)]}, readonly=True, help='Selecting \'Before Repair\' or \'After Repair\' will allow you to generate invoice before or after the repair is done respectively. \'No invoice\' means you don\'t want to generate invoice for this repair order.'),
         'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
-        'move_id': fields.many2one('stock.move', 'Move',readonly=True),
+        'move_id': fields.many2one('stock.move', 'Move',readonly=True, help="Move created by the repair order"),
         'fees_lines': fields.one2many('mrp.repair.fee', 'repair_id', 'Fees Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'internal_notes': fields.text('Internal Notes'),
         'quotation_notes': fields.text('Quotation Notes'),
@@ -219,7 +219,7 @@ class mrp_repair(osv.osv):
         }
     
     def onchange_product_uom(self, cr, uid, ids, product_id, product_uom, context=None):
-        res = {'value':{}}
+        res = {'value': {}}
         if not product_uom or not product_id:
             return res
         product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
@@ -491,7 +491,6 @@ class mrp_repair(osv.osv):
                 'location_dest_id': repair.location_dest_id.id,
                 'restrict_lot_id': repair.lot_id.id,
             })
-            move_obj.signal_button_confirm(cr, uid, [move_id])
             move_obj.action_done(cr, uid, [move_id], context=context)
             self.write(cr, uid, [repair.id], {'state': 'done', 'move_id': move_id}, context=context)
             res[repair.id] = move_id

From f62c70832e2c290f5c50f929fb6e038600c8a98c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 27 Jan 2014 17:33:39 +0100
Subject: [PATCH 20/29] [IMP] mrp_repair: usability and refactoring

bzr revid: qdp-launchpad@openerp.com-20140127163339-mncm92w3cilfzyxy
---
 addons/mrp_repair/mrp_repair.py       | 21 ++++++++++++++++-----
 addons/mrp_repair/mrp_repair_view.xml | 19 ++++++++++---------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 23b98d4b1b5..c10beda17ae 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -152,8 +152,8 @@ class mrp_repair(osv.osv):
             ("after_repair","After Repair")
            ], "Invoice Method",
             select=True, required=True, states={'draft':[('readonly',False)]}, readonly=True, help='Selecting \'Before Repair\' or \'After Repair\' will allow you to generate invoice before or after the repair is done respectively. \'No invoice\' means you don\'t want to generate invoice for this repair order.'),
-        'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
-        'move_id': fields.many2one('stock.move', 'Move',readonly=True, help="Move created by the repair order"),
+        'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True, track_visibility="onchange"),
+        'move_id': fields.many2one('stock.move', 'Move',readonly=True, help="Move created by the repair order", track_visibility="onchange"),
         'fees_lines': fields.one2many('mrp.repair.fee', 'repair_id', 'Fees Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'internal_notes': fields.text('Internal Notes'),
         'quotation_notes': fields.text('Quotation Notes'),
@@ -177,15 +177,24 @@ class mrp_repair(osv.osv):
             }),
     }
 
+    def _default_stock_location(self, cr, uid, context=None):
+        try:
+            warehouse = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'warehouse0')
+            return warehouse.lot_stock_id.id
+        except:
+            return False
+
     _defaults = {
         'state': lambda *a: 'draft',
         'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'mrp.repair'),
         'invoice_method': lambda *a: 'none',
         'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.repair', context=context),
-        'pricelist_id': lambda self, cr, uid,context : self.pool.get('product.pricelist').search(cr, uid, [('type','=','sale')])[0],
+        'pricelist_id': lambda self, cr, uid, context: self.pool.get('product.pricelist').search(cr, uid, [('type', '=', 'sale')])[0],
         'product_qty': 1.0,
+        'location_id': _default_stock_location,
     }
 
+
     _sql_constraints = [
         ('name', 'unique (name)', 'The name of the Repair Order must be unique!'),
     ]
@@ -467,6 +476,7 @@ class mrp_repair(osv.osv):
         move_obj = self.pool.get('stock.move')
         repair_line_obj = self.pool.get('mrp.repair.line')
         for repair in self.browse(cr, uid, ids, context=context):
+            move_ids = []
             for move in repair.operations:
                 move_id = move_obj.create(cr, uid, {
                     'name': move.name,
@@ -479,7 +489,7 @@ class mrp_repair(osv.osv):
                     'location_dest_id': move.location_dest_id.id,
                     'state': 'assigned',
                 })
-                move_obj.action_done(cr, uid, [move_id], context=context)
+                move_ids.append(move_id)
                 repair_line_obj.write(cr, uid, [move.id], {'move_id': move_id, 'state': 'done'}, context=context)
             move_id = move_obj.create(cr, uid, {
                 'name': repair.name,
@@ -491,7 +501,8 @@ class mrp_repair(osv.osv):
                 'location_dest_id': repair.location_dest_id.id,
                 'restrict_lot_id': repair.lot_id.id,
             })
-            move_obj.action_done(cr, uid, [move_id], context=context)
+            move_ids.append(move_id)
+            move_obj.action_done(cr, uid, move_ids, context=context)
             self.write(cr, uid, [repair.id], {'state': 'done', 'move_id': move_id}, context=context)
             res[repair.id] = move_id
         return res
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index a3c6ab012a1..aaa860fa793 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -49,15 +49,15 @@
                                 <field name="product_qty" class="oe_inline"/> 
                                 <field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(product_id, product_uom)" class="oe_inline"/>
                             </div>
-                            <field name="lot_id" domain="[('product_id','=',product_id]" context="{'default_product_id': product_id}" groups="stock.track_grouping_lot"/>
+                            <field name="lot_id" domain="[('product_id', '=', product_id)]" context="{'default_product_id': product_id}" groups="stock.group_tracking_lot"/>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id,address_id)" attrs="{'required':[('invoice_method','!=','none')]}"/>
                             <field name="address_id" groups="sale.group_delivery_invoice_address"/>
-                            <field name="location_id" on_change="onchange_location_id(location_id)" groups="stock.group_locations"/>
                         </group>
                         <group>
+                            <field name="location_id" on_change="onchange_location_id(location_id)" groups="stock.group_locations" domain="[('usage', 'in', ('internal', 'customer'))]"/>
+                            <field name="location_dest_id" groups="stock.group_locations" domain="[('usage', 'in', ('internal', 'customer'))]"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field name="guarantee_limit"/>
-                            <field name="repaired" groups="base.group_no_one"/>
-                            <field name="invoiced" groups="base.group_no_one"/>
                         </group>
                     </group>
                 <notebook>
@@ -122,13 +122,15 @@
                     <page string="Invoicing">
                         <group col="4">
                             <field name="invoice_method"/>
+                            <field name="invoice_id" context="{'form_view_ref': 'account.invoice_form'}"/>
                             <field name="partner_invoice_id" attrs="{'readonly':[('invoice_method','=', 'none')],'required':[('invoice_method','!=','none')]}" groups="sale.group_delivery_invoice_address"/>
                             <field
                                 name="pricelist_id" groups="product.group_sale_pricelist" context="{'product_id':product_id}"
                                 attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
                         </group>
                         <!-- <field name="invoice_id"/> -->
-                        <field name="fees_lines">
+                        <separator string="Fees Lines"/>
+                        <field name="fees_lines" attrs="{'readonly': [('invoice_method','=', 'none')]}">
                             <form string="Fees" version="7.0">
                                 <label for="name" class="oe_edit_only"/>
                                 <h2>
@@ -170,15 +172,14 @@
                             </tree>
                         </field>
                     </page>
-                    <page string="Extra Info">
+                    <page string="Extra Info" groups="base.group_no_one">
                         <group>
                             <group>
                                 <field name="move_id"/>
-                                <field name="invoice_id" context="{'form_view_ref': 'account.invoice_form'}"/>
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             </group>
                             <group>
-                                <field name="location_dest_id" groups="stock.group_locations"/>
+                                <field name="repaired"/>
+                                <field name="invoiced"/>
                             </group>
                         </group>
                     </page>

From dfd96e9d7c2add680a2d327a6c218b73bdbaec58 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 27 Jan 2014 18:14:00 +0100
Subject: [PATCH 21/29] [FIX] stock, usability: search of a stock move by name

bzr revid: qdp-launchpad@openerp.com-20140127171400-5o6i4rhn7b7i8h93
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f344e9b5ab9..94e20b1e09f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1185,7 +1185,7 @@
             <field eval="3" name="priority"/>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
-                    <field name="origin" filter_domain="['|',('origin','ilike',self),('picking_id','ilike',self)]" string="Reference"/>
+                    <field name="origin" filter_domain="['|', '|', ('origin', 'ilike', self), ('name', 'ilike', self), ('picking_id', 'ilike', self)]" string="Reference"/>
                     <field name="date" groups="base.group_no_one"/>
 
                     <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>

From 105210acd0b1fedd4c7a1fedb6b4472c7de075f7 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Tue, 28 Jan 2014 15:03:47 +0100
Subject: [PATCH 22/29] [FIX]better error msg for inventory when a start entry
 have a negative qty

bzr revid: csn@openerp.com-20140128140347-9nkk80d1yjy4sbwe
---
 addons/stock/stock.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 306b028f934..5eb238438b7 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2191,7 +2191,13 @@ class stock_inventory(osv.osv):
                 if not value:
                     product_line[key] = False
             if product_line['product_qty'] < 0:
-                negative_product_ids.append(product_line['product_id'])
+                summary = 'Product: '+self.pool.get('product.product').browse(cr, uid, product_line['product_id'], context=context).name+'\n'
+                summary += 'Quantity: '+str(product_line['product_qty'])+'\n'
+                summary += 'Location: '+self.pool.get('stock.location').browse(cr, uid, product_line['location_id'], context=context).complete_name+'\n'
+                summary += ('Partner: '+self.pool.get('res.partner').browse(cr, uid, product_line['partner_id'],context=context).name+'\n') if product_line['partner_id'] else ''
+                summary += ('Lot: '+self.pool.get('stock.production.lot').browse(cr, uid, product_line['prod_lot_id'], context=context).name+'\n') if product_line['prod_lot_id'] else ''
+                summary += ('Package: '+self.pool.get('stock.quant.package').browse(cr, uid, product_line['package_id'], context=context).name+'\n') if product_line['package_id'] else ''
+                raise osv.except_osv(_('Warning'),_('This product has a negative qty, please fix it before doing an inventory\n%s' % (summary)))
             product_line['inventory_id'] = inventory.id
             product_line['th_qty'] = product_line['product_qty']
             if product_line['product_id']:
@@ -2199,11 +2205,6 @@ class stock_inventory(osv.osv):
                 product_line['product_uom_id'] = product.uom_id.id
             vals.append(product_line)
 
-        if negative_product_ids:
-            summary = ''
-            for product in self.pool.get('product.product').browse(cr, uid, negative_product_ids, context=context):
-                summary += '- '+product.name+'\n'
-            raise osv.except_osv(_('Warning'),_('These products have a negative qty, please fix them before doing an inventory\n%s' % (summary)))
         return vals
 
 class stock_inventory_line(osv.osv):

From f2ad1117713ed78cbd11ed586333c739573d881f Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Tue, 28 Jan 2014 17:02:43 +0100
Subject: [PATCH 23/29] [FIX]should not check for a lot_id on a package but
 should check when putting things in a package

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

bzr revid: csn@openerp.com-20140128160243-fchi86wqgkjjdkdv
---
 addons/stock/stock.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 899d253e70c..d01bfbd0bcd 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1112,9 +1112,13 @@ class stock_picking(osv.osv):
         Used in the barcode scanner UI and the normal interface as well. """
         stock_operation_obj = self.pool.get('stock.pack.operation')
         package_obj = self.pool.get('stock.quant.package')
+        stock_move_obj = self.pool.get('stock.move')
         for picking_id in picking_ids:
             operation_ids = stock_operation_obj.search(cr, uid, [('picking_id', '=', picking_id), ('result_package_id', '=', False)], context=context)
             if operation_ids:
+                for operation in stock_operation_obj.browse(cr, uid, operation_ids, context=context):
+                    for move in operation.linked_move_operation_ids:
+                        stock_move_obj.check_tracking(cr, uid, move.move_id, operation.package_id.id if operation.package_id else operation.lot_id.id, context=None)
                 package_id = package_obj.create(cr, uid, {}, context=context)
                 stock_operation_obj.write(cr, uid, operation_ids, {'result_package_id': package_id}, context=context)
         return True
@@ -1835,7 +1839,7 @@ class stock_move(osv.osv):
             fallback_domain = [('reservation_id', '=', False)]
             #first, process the move per linked operation first because it may imply some specific domains to consider
             for record in move.linked_move_operation_ids:
-                self.check_tracking(cr, uid, move, record.operation_id.lot_id.id, context=context)
+                self.check_tracking(cr, uid, move, record.operation_id.package_id.id if record.operation_id.package_id else record.operation_id.lot_id.id, context=context)
                 dom = main_domain + self.pool.get('stock.move.operation.link').get_specific_domain(cr, uid, record, context=context)
                 quants = quant_obj.quants_get_prefered_domain(cr, uid, move.location_id, move.product_id, record.qty, domain=dom, prefered_domain=prefered_domain, fallback_domain=fallback_domain, restrict_lot_id=move.restrict_lot_id.id, restrict_partner_id=move.restrict_partner_id.id, context=context)
                 package_id = False

From e41b26f4e0c22c9224947d2b334668543563c257 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Wed, 29 Jan 2014 11:04:10 +0100
Subject: [PATCH 24/29] [FIX]putaway location should be taken into account when
 force_assign a move

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

bzr revid: csn@openerp.com-20140129100410-6r185w2jkm4oporu
---
 addons/stock/stock.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 899d253e70c..3bdd95c11f4 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1481,6 +1481,7 @@ class stock_move(osv.osv):
         moveputaway_obj = self.pool.get('stock.move.putaway')
         quant_obj = self.pool.get('stock.quant')
         if putaway.method == 'fixed' and putaway.location_spec_id:
+            qty = move.product_qty
             for row in quant_obj.read_group(cr, uid, [('reservation_id', '=', move.id)], ['qty', 'lot_id'], ['lot_id'], context=context):
                 vals = {
                     'move_id': move.id,
@@ -1489,6 +1490,14 @@ class stock_move(osv.osv):
                     'lot_id': row.get('lot_id') and row['lot_id'][0] or False,
                 }
                 moveputaway_obj.create(cr, SUPERUSER_ID, vals, context=context)
+                qty -= row['qty']
+            if qty > 0:
+                vals = {
+                    'move_id': move.id,
+                    'location_id': putaway.location_spec_id.id,
+                    'quantity': qty,
+                }
+                moveputaway_obj.create(cr, SUPERUSER_ID, vals, context=context)
 
     def _putaway_check(self, cr, uid, ids, context=None):
         for move in self.browse(cr, uid, ids, context=context):
@@ -1723,6 +1732,8 @@ class stock_move(osv.osv):
         """ Changes the state to assigned.
         @return: True
         """
+        #check putaway method
+        self._putaway_check(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state': 'assigned'})
 
     def cancel_assign(self, cr, uid, ids, context=None):

From b7d584a4f45694c107f8c046264ebf8989e5ae03 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Wed, 29 Jan 2014 11:24:56 +0100
Subject: [PATCH 25/29] [FIX]remove non store field from quant graph view
 (problem when grouping by)

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

bzr revid: csn@openerp.com-20140129102456-t75z2gvv4qrr9ozc
---
 addons/stock/stock_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 94e20b1e09f..dd1694535c9 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1823,7 +1823,6 @@
                     <field name="product_id"/>
                     <field name="qty"/>
                     <field name="location_id"/>
-                    <field name="inventory_value"/>
                 </graph>
             </field>
         </record>

From f2d62ab2a46a4b6f70834c5efc5a2776c2acec65 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Wed, 29 Jan 2014 15:00:05 +0100
Subject: [PATCH 26/29] [FIX]stock_warehouse: raise of error for
 default_resupply_id != warehouse_id should not be in a sql_constraint since
 it will not rollback the creation of routes.

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

bzr revid: csn@openerp.com-20140129140005-efomi7gdmcf1pi1q
---
 addons/stock/stock.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 899d253e70c..c0ae91602ea 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2438,7 +2438,6 @@ class stock_warehouse(osv.osv):
     _sql_constraints = [
         ('warehouse_name_uniq', 'unique(name, company_id)', 'The name of the warehouse must be unique per company!'),
         ('warehouse_code_uniq', 'unique(code, company_id)', 'The code of the warehouse must be unique per company!'),
-        ('default_resupply_wh_diff', 'check (id != default_resupply_wh_id)', 'The default resupply warehouse should be different that the warehouse itself!'),
     ]
 
     def _get_partner_locations(self, cr, uid, ids, context=None):
@@ -2903,6 +2902,8 @@ class stock_warehouse(osv.osv):
                     #not implemented
                     pass
         if 'default_resupply_wh_id' in vals:
+            if vals.get('default_resupply_wh_id') == warehouse.id:
+                raise osv.except_osv(_('Warning'),_('The default resupply warehouse should be different that the warehouse itself!'))
             if warehouse.default_resupply_wh_id:
                 #remove the existing resupplying route on all products
                 to_remove_route_ids = route_obj.search(cr, uid, [('supplied_wh_id', '=', warehouse.id), ('supplier_wh_id', '=', warehouse.default_resupply_wh_id.id)], context=context)

From ab0a42756f10d3f337f6f817ff2238259a47e7c7 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Wed, 29 Jan 2014 15:26:13 +0100
Subject: [PATCH 27/29] [FIX]orderpoint: when running scheduler, newly create
 procurement didn't had information about orderpoint warehouse

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

bzr revid: csn@openerp.com-20140129142613-zg3ysaklhf1r33w6
---
 addons/stock/procurement.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/stock/procurement.py b/addons/stock/procurement.py
index 96c05487192..2668520eb57 100644
--- a/addons/stock/procurement.py
+++ b/addons/stock/procurement.py
@@ -309,7 +309,8 @@ class procurement_order(osv.osv):
                 'company_id': orderpoint.company_id.id,
                 'product_uom': orderpoint.product_uom.id,
                 'location_id': orderpoint.location_id.id,
-                'origin': orderpoint.name}
+                'origin': orderpoint.name,
+                'warehouse_id': orderpoint.warehouse_id.id}
 
     def _product_virtual_get(self, cr, uid, order_point):
         product_obj = self.pool.get('product.product')

From 15dc06788fcf49a9413fde7445be22005ed1ee78 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 30 Jan 2014 09:07:13 +0100
Subject: [PATCH 28/29] [FIX] stock: merge prop correction

bzr revid: qdp-launchpad@openerp.com-20140130080713-uf4onnuvto9mnlyc
---
 addons/stock/stock.py | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 483115bfe64..29019385a7c 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2107,10 +2107,9 @@ class stock_inventory(osv.osv):
             context = {}
         move_obj = self.pool.get('stock.move')
         for inv in self.browse(cr, uid, ids, context=context):
-            if inv.line_ids:
-                for inventory_line in inv.line_ids:
-                    if inventory_line.product_qty < 0:
-                        raise osv.except_osv(_('Warning'),_('You cannot have a negative product quantity in an inventory line'))
+            for inventory_line in inv.line_ids:
+                if inventory_line.product_qty < 0:
+                    raise osv.except_osv(_('Warning'),_('You cannot set a negative product quantity in an inventory line'))
             if not inv.move_ids:
                 self.action_check(cr, uid, [inv.id], context=context)
             inv.refresh()
@@ -2218,27 +2217,24 @@ class stock_inventory(osv.osv):
            GROUP BY product_id, location_id, lot_id, package_id, partner_id
         ''', args)
         vals = []
-        negative_product_ids = []
         for product_line in cr.dictfetchall():
             #replace the None the dictionary by False, because falsy values are tested later on
             for key, value in product_line.items():
                 if not value:
                     product_line[key] = False
             if product_line['product_qty'] < 0:
-                summary = 'Product: '+self.pool.get('product.product').browse(cr, uid, product_line['product_id'], context=context).name+'\n'
-                summary += 'Quantity: '+str(product_line['product_qty'])+'\n'
-                summary += 'Location: '+self.pool.get('stock.location').browse(cr, uid, product_line['location_id'], context=context).complete_name+'\n'
-                summary += ('Partner: '+self.pool.get('res.partner').browse(cr, uid, product_line['partner_id'],context=context).name+'\n') if product_line['partner_id'] else ''
-                summary += ('Lot: '+self.pool.get('stock.production.lot').browse(cr, uid, product_line['prod_lot_id'], context=context).name+'\n') if product_line['prod_lot_id'] else ''
-                summary += ('Package: '+self.pool.get('stock.quant.package').browse(cr, uid, product_line['package_id'], context=context).name+'\n') if product_line['package_id'] else ''
-                raise osv.except_osv(_('Warning'),_('This product has a negative qty, please fix it before doing an inventory\n%s' % (summary)))
+                summary = _('Product: ') + product_obj.browse(cr, uid, product_line['product_id'], context=context).name + '\n'
+                summary += _('Location: ') + location_obj.browse(cr, uid, product_line['location_id'], context=context).complete_name + '\n'
+                summary += (_('Partner: ') + self.pool.get('res.partner').browse(cr, uid, product_line['partner_id'], context=context).name + '\n') if product_line['partner_id'] else ''
+                summary += (_('Lot: ') + self.pool.get('stock.production.lot').browse(cr, uid, product_line['prod_lot_id'], context=context).name + '\n') if product_line['prod_lot_id'] else ''
+                summary += (_('Package: ') + self.pool.get('stock.quant.package').browse(cr, uid, product_line['package_id'], context=context).name + '\n') if product_line['package_id'] else ''
+                raise osv.except_osv(_('Warning'),_('This inventory line has a theoretical negative quantity, please fix it before doing an inventory\n%s' % (summary)))
             product_line['inventory_id'] = inventory.id
             product_line['th_qty'] = product_line['product_qty']
             if product_line['product_id']:
                 product = product_obj.browse(cr, uid, product_line['product_id'], context=context)
                 product_line['product_uom_id'] = product.uom_id.id
             vals.append(product_line)
-
         return vals
 
 class stock_inventory_line(osv.osv):

From 05091a07310b23ea2380f75397adec0da87d8a8e Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 30 Jan 2014 11:07:19 +0100
Subject: [PATCH 29/29] [FIX] stock: context=None + some refactoring to shorten
 the code

bzr revid: qdp-launchpad@openerp.com-20140130100719-tx7ujnoizcspcncv
---
 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 bb49732c557..dc20bf6eb5e 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1117,8 +1117,8 @@ class stock_picking(osv.osv):
             operation_ids = stock_operation_obj.search(cr, uid, [('picking_id', '=', picking_id), ('result_package_id', '=', False)], context=context)
             if operation_ids:
                 for operation in stock_operation_obj.browse(cr, uid, operation_ids, context=context):
-                    for move in operation.linked_move_operation_ids:
-                        stock_move_obj.check_tracking(cr, uid, move.move_id, operation.package_id.id if operation.package_id else operation.lot_id.id, context=None)
+                    for record in operation.linked_move_operation_ids:
+                        stock_move_obj.check_tracking(cr, uid, record.move_id, operation.package_id.id or operation.lot_id.id, context=context)
                 package_id = package_obj.create(cr, uid, {}, context=context)
                 stock_operation_obj.write(cr, uid, operation_ids, {'result_package_id': package_id}, context=context)
         return True
@@ -1852,7 +1852,7 @@ class stock_move(osv.osv):
             fallback_domain = [('reservation_id', '=', False)]
             #first, process the move per linked operation first because it may imply some specific domains to consider
             for record in move.linked_move_operation_ids:
-                self.check_tracking(cr, uid, move, record.operation_id.package_id.id if record.operation_id.package_id else record.operation_id.lot_id.id, context=context)
+                self.check_tracking(cr, uid, move, record.operation_id.package_id.id or record.operation_id.lot_id.id, context=context)
                 dom = main_domain + self.pool.get('stock.move.operation.link').get_specific_domain(cr, uid, record, context=context)
                 quants = quant_obj.quants_get_prefered_domain(cr, uid, move.location_id, move.product_id, record.qty, domain=dom, prefered_domain=prefered_domain, fallback_domain=fallback_domain, restrict_lot_id=move.restrict_lot_id.id, restrict_partner_id=move.restrict_partner_id.id, context=context)
                 package_id = False