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 1/5] [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 2/5] [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 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 3/5] [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 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 4/5] [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 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 5/5] [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):