From 0ac081ca597c9b491dc50f9c3acee92ef9869e02 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 9 May 2012 16:26:41 +0530
Subject: [PATCH 01/14] [FIX]stock: fix the issue of return picking wizard

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

bzr revid: mma@tinyerp.com-20120509105641-9ijemxgekhif76zc
---
 addons/stock/wizard/stock_return_picking.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 689f17cd9b9..8cfe4342327 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -100,7 +100,8 @@ class stock_return_picking(osv.osv_memory):
             valid_lines = 0
             return_history = self.get_return_history(cr, uid, record_id, context)
             for m  in pick.move_lines:
-                if m.product_qty * m.product_uom.factor > return_history[m.id]:
+                if return_history:
+                    if m.product_qty * m.product_uom.factor > return_history[m.id]:
                         valid_lines += 1
             if not valid_lines:
                 raise osv.except_osv(_('Warning !'), _("There are no products to return (only lines in Done state and not fully returned yet can be returned)!"))

From 815ea021d8cec91331c2815cc1a9812a2eb1750c Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 27 Aug 2012 16:40:13 +0530
Subject: [PATCH 02/14] [IMP]stock:improve condition

bzr revid: mma@tinyerp.com-20120827111013-x5xlu56cxtm5lqf0
---
 addons/stock/wizard/stock_return_picking.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 8cfe4342327..203db7232f1 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -100,7 +100,7 @@ class stock_return_picking(osv.osv_memory):
             valid_lines = 0
             return_history = self.get_return_history(cr, uid, record_id, context)
             for m  in pick.move_lines:
-                if return_history:
+                if return_history and return_history.get(m.id):
                     if m.product_qty * m.product_uom.factor > return_history[m.id]:
                         valid_lines += 1
             if not valid_lines:

From 0a9c1b54ca80d0cc942f99cd18539b89d5385449 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 10 Sep 2012 16:14:22 +0530
Subject: [PATCH 03/14] [IMP]stock : improve code which is more batter for
 return picking

bzr revid: mma@tinyerp.com-20120910104422-1s9h1fq25ud2iwvs
---
 addons/stock/wizard/stock_return_picking.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index bc6acfaa1cc..80cc5a4a368 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -100,8 +100,7 @@ class stock_return_picking(osv.osv_memory):
             valid_lines = 0
             return_history = self.get_return_history(cr, uid, record_id, context)
             for m  in pick.move_lines:
-                if return_history and return_history.get(m.id):
-                    if m.product_qty * m.product_uom.factor > return_history[m.id]:
+                 if (return_history.get(m.id) is not None) and (m.product_qty * m.product_uom.factor > return_history[m.id]):
                         valid_lines += 1
             if not valid_lines:
                 raise osv.except_osv(_('Warning!'), _("No products to return (only lines in Done state and not fully returned yet can be returned)!"))

From c0a3cbac504d4ad35b6f5111e2b235dfaab31dd8 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 14 Sep 2012 15:49:47 +0530
Subject: [PATCH 04/14] [IMP]stock : set a proper indentation

bzr revid: mma@tinyerp.com-20120914101947-cbrdfp0iatq6r0a6
---
 addons/stock/wizard/stock_return_picking.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 80cc5a4a368..bc4cf652cdb 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -100,8 +100,8 @@ class stock_return_picking(osv.osv_memory):
             valid_lines = 0
             return_history = self.get_return_history(cr, uid, record_id, context)
             for m  in pick.move_lines:
-                 if (return_history.get(m.id) is not None) and (m.product_qty * m.product_uom.factor > return_history[m.id]):
-                        valid_lines += 1
+                if (return_history.get(m.id) is not None) and (m.product_qty * m.product_uom.factor > return_history[m.id]):
+                    valid_lines += 1
             if not valid_lines:
                 raise osv.except_osv(_('Warning!'), _("No products to return (only lines in Done state and not fully returned yet can be returned)!"))
         return res

From a49acd9fcadc6c0ed4bb39489ace3dd0c36f6315 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 17 Sep 2012 11:53:26 +0530
Subject: [PATCH 05/14] [IMP] stock: update warning message for stock in serial
 number

bzr revid: cha@tinyerp.com-20120917062326-ony3gx9k2o871kq3
---
 addons/stock/stock.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 31d5a68c9fe..9cdbc97c115 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1804,8 +1804,8 @@ class stock_move(osv.osv):
         warning = {}
         if (location.usage == 'internal') and (product_qty > (amount_actual or 0.0)):
             warning = {
-                'title': _('Insufficient Stock in Lot !'),
-                'message': _('You are moving %.2f %s products but only %.2f %s available in this lot.') % (product_qty, uom.name, amount_actual, uom.name)
+                'title': _('Insufficient Stock in Serial Number !'),
+                'message': _('You are moving %.2f %s products but only %.2f %s available in this serial number.') % (product_qty, uom.name, amount_actual, uom.name)
             }
         return {'warning': warning}
 

From c8e57c8c059bf842fdeae0fc813fb2ae1c970ef8 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 17 Sep 2012 12:23:36 +0530
Subject: [PATCH 06/14] [IMP] stock: change string for ok button & add cancel
 button in wizard

bzr revid: cha@tinyerp.com-20120917065336-f1yw01itbx2ka32o
---
 addons/stock/wizard/stock_move_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 3df336b5e30..5dc0d0d824c 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -109,7 +109,9 @@
                         </form>
                     </field>
                     <footer>
-                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"  />
+                        <button name="split_lot" string="Split" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
                 </form>
                 </field>

From c4166b869ac223014b1d63f6f15ef3ce6b285871 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 17 Sep 2012 16:05:10 +0530
Subject: [PATCH 07/14] [IMP] product: made little change to get proper view

bzr revid: cha@tinyerp.com-20120917103510-crlrfrqo2rem5izd
---
 addons/product/product_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 13474351744..fc511d20a62 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -447,9 +447,9 @@
                             <field name="uom_type" on_change="onchange_type(uom_type)"/>
                             <field name="rounding"/>
                             <field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
-                            <label string="  e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
                             <field name="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
-                            <label string="  e.g: 1 * (this unit) = ratio * (reference unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
+                            <label string="e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
+                            <label string="e.g: 1 * (this unit) = ratio * (reference unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
                         </group>
                     </group>
                 </form>

From dc00c1ea7892a4baf24a38a021a5defb64888c49 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 18 Sep 2012 16:57:52 +0530
Subject: [PATCH 08/14] [IMP] stock: solved issue of return shipment

bzr revid: cha@tinyerp.com-20120918112752-8uxqchz0dxjt6vhj
---
 addons/stock/wizard/stock_return_picking.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index bc4cf652cdb..22bee56903e 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -72,9 +72,10 @@ class stock_return_picking(osv.osv_memory):
                     res.update({'invoice_state': 'none'})
             return_history = self.get_return_history(cr, uid, record_id, context)       
             for line in pick.move_lines:
-                qty = line.product_qty - return_history[line.id]
-                if qty > 0:
-                    result1.append({'product_id': line.product_id.id, 'quantity': qty,'move_id':line.id})
+                if (return_history.get(line.id) is not None) and (line.product_qty * line.product_uom.factor > return_history[line.id]):
+                    qty = line.product_qty - return_history[line.id]
+                    if qty > 0:
+                        result1.append({'product_id': line.product_id.id, 'quantity': qty,'move_id':line.id})
             if 'product_return_moves' in fields:
                 res.update({'product_return_moves': result1})
         return res

From 05c9def924282ed828e600e58c5576ac664b77b3 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Wed, 19 Sep 2012 17:38:18 +0530
Subject: [PATCH 09/14] [IMP] stock: improve helptext for field
 'stock_available'

bzr revid: cha@tinyerp.com-20120919120818-aejvs1qdn68tcoiq
---
 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 9cdbc97c115..8fa28f42ee4 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1485,7 +1485,7 @@ class stock_production_lot(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type', '<>', 'service')]),
         'date': fields.datetime('Creation Date', required=True),
         'stock_available': fields.function(_get_stock, fnct_search=_stock_search, type="float", string="Available", select=True,
-            help="Current quantity of products with this Production Lot Number available in company warehouses",
+            help="Current quantity of products with this Serial Number available in company warehouses",
             digits_compute=dp.get_precision('Product Unit of Measure')),
         'revisions': fields.one2many('stock.production.lot.revision', 'lot_id', 'Revisions'),
         'company_id': fields.many2one('res.company', 'Company', select=True),

From 3c084ff4aa99b95601419912a94cbc772e9985ee Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 21 Sep 2012 11:58:21 +0530
Subject: [PATCH 10/14] [IMP] stock: solve the issue of getting state as
 delivered

bzr revid: cha@tinyerp.com-20120921062821-jhzcvnz3k44hjs54
---
 addons/stock/stock.py       | 13 +++++++++++--
 addons/stock/stock_view.xml |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 30bd70b9728..2d3acaae0e7 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -761,6 +761,15 @@ class stock_picking(osv.osv):
             self.pool.get('stock.move').force_assign(cr, uid, move_ids)
             wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
         return True
+    
+    def button_cancel(self, cr, uid, ids, *args):
+        """ Changes state of picking to cancel.
+        @return: True
+        """
+        wf_service = netsvc.LocalService("workflow")
+        for pick in self.browse(cr, uid, ids):
+            wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_cancel', cr)
+        return True
 
     def draft_force_assign(self, cr, uid, ids, *args):
         """ Confirms picking directly from draft state.
@@ -1141,7 +1150,7 @@ class stock_picking(osv.osv):
             for move in pick.move_lines:
                 if move.state not in ('cancel','done'):
                     return False
-                if move.state=='done':
+                if move.state=='done' and not move.scrapped:
                     ok = True
         return ok
 
@@ -1160,7 +1169,7 @@ class stock_picking(osv.osv):
             if not pick.move_lines:
                 return True
             for move in pick.move_lines:
-                if move.state == 'done':
+                if move.state == 'done' and not move.scrapped:
                     raise osv.except_osv(_('Error!'), _('You cannot cancel picking because stock move is in done state!'))
         return True
     def unlink(self, cr, uid, ids, context=None):
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 83fed186f42..411c57aeede 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -754,7 +754,7 @@
                         <button name="action_process" states="assigned" string="Confirm &amp; Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight"/>
                         <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice/Refund"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" class="oe_highlight"/>
                         <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action"/>
-                        <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel"/>
+                        <button name="button_cancel" type="object" states="assigned,confirmed,draft" string="_Cancel"/>
                     </span>
                     <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                 </header>

From 2ad80397112d5fb8187fc3159434f4e8e52983b9 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 21 Sep 2012 15:38:50 +0530
Subject: [PATCH 11/14] [IMP] stock: update warning message for serial number

bzr revid: cha@tinyerp.com-20120921100850-bvrgytvux9650tzp
---
 addons/stock/stock.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index bbda0f468ca..c76c3dc5f67 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1836,8 +1836,8 @@ class stock_move(osv.osv):
         warning = {}
         if (location.usage == 'internal') and (product_qty > (amount_actual or 0.0)):
             warning = {
-                'title': _('Insufficient Stock in Serial Number !'),
-                'message': _('You are moving %.2f %s products but only %.2f %s available in this serial number.') % (product_qty, uom.name, amount_actual, uom.name)
+                'title': _('Insufficient Stock for Serial Number !'),
+                'message': _('You are moving %.2f %s products but only %.2f %s available for this serial number.') % (product_qty, uom.name, amount_actual, uom.name)
             }
         return {'warning': warning}
 

From 694743bbf3d1106f2978af399f74df1ea17b1dad Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 21 Sep 2012 18:17:34 +0530
Subject: [PATCH 12/14] [IMP] stock: made changes to do auto cancel

bzr revid: cha@tinyerp.com-20120921124734-9x0m4dtkv08jsw37
---
 addons/stock/stock.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index c76c3dc5f67..03d8a802f4f 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1160,6 +1160,8 @@ class stock_picking(osv.osv):
         """
         for pick in self.browse(cr, uid, ids, context=context):
             for move in pick.move_lines:
+                if move.state == 'done' and move.scrapped:
+                    return True
                 if move.state not in ('cancel',):
                     return False
         return True
@@ -2205,7 +2207,7 @@ class stock_move(osv.osv):
         self.write(cr, uid, ids, {'state': 'cancel', 'move_dest_id': False})
         if not context.get('call_unlink',False):
             for pick in self.pool.get('stock.picking').browse(cr, uid, list(pickings), context=context):
-                if all(move.state == 'cancel' for move in pick.move_lines):
+                if all(move.state == 'cancel' or move.scrapped for move in pick.move_lines):
                     self.pool.get('stock.picking').write(cr, uid, [pick.id], {'state': 'cancel'})
 
         wf_service = netsvc.LocalService("workflow")

From 5e7deadf24521caeae5566253d85a91ff3c385ba Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 25 Sep 2012 11:56:57 +0530
Subject: [PATCH 13/14] [IMP] stock: update warning message for serial number

bzr revid: cha@tinyerp.com-20120925062657-bz3ho9tx3oriuamy
---
 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 03d8a802f4f..b5a6c74826a 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1839,7 +1839,7 @@ class stock_move(osv.osv):
         if (location.usage == 'internal') and (product_qty > (amount_actual or 0.0)):
             warning = {
                 'title': _('Insufficient Stock for Serial Number !'),
-                'message': _('You are moving %.2f %s products but only %.2f %s available for this serial number.') % (product_qty, uom.name, amount_actual, uom.name)
+                'message': _('You are moving %.2f %s but only %.2f %s available for this serial number.') % (product_qty, uom.name, amount_actual, uom.name)
             }
         return {'warning': warning}
 

From 48100d36df5c20089b70648c3f2c9a6ac60a97fe Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 25 Sep 2012 14:28:38 +0530
Subject: [PATCH 14/14] [IMP] product: put the formula exact bellow the field

bzr revid: cha@tinyerp.com-20120925085838-1qjjr88azzuqk0f7
---
 addons/product/product_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 28878379ab9..2d153fa9d06 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -465,11 +465,13 @@
                         </group>
                         <group>
                             <field name="uom_type" on_change="onchange_type(uom_type)"/>
+                            <label string=""/>
+                            <label string="e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
+                            <label string=""/>
+                            <label string="e.g: 1 * (this unit) = ratio * (reference unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
                             <field name="rounding"/>
                             <field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
                             <field name="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
-                            <label string="e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
-                            <label string="e.g: 1 * (this unit) = ratio * (reference unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
                         </group>
                     </group>
                 </form>