From 00629a404040b18c9fd2fb882b70b1bf11fd018b Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 26 Sep 2012 16:53:06 +0530
Subject: [PATCH 01/10] [FIX] stock : Removed slash('/') When creating new
 'Incoming Shipments' and 'Delivery Orders'.

bzr revid: mdi@tinyerp.com-20120926112306-35axo0rg22yj38yq
---
 addons/stock/stock.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index efd596684cb..8743834539f 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -660,7 +660,6 @@ class stock_picking(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
     }
     _defaults = {
-        'name': lambda self, cr, uid, context: '/',
         'state': 'draft',
         'move_type': 'direct',
         'type': 'internal',

From 58723b04add44a022d1cb979164e1a36480bb5fc Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 26 Sep 2012 17:12:17 +0530
Subject: [PATCH 02/10] [FIX] stock : Error when selecting internal for
 shipping type, following fields are invalid: 'Source Location' and
 'Destination Location'.

bzr revid: mdi@tinyerp.com-20120926114217-70avgduo0px5x2yj
---
 addons/stock/stock.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 8743834539f..0a2d3328fef 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1950,6 +1950,9 @@ class stock_move(osv.osv):
         elif type == 'out':
             location_source_id = 'stock_location_stock'
             location_dest_id = 'stock_location_customers'
+        elif type == 'internal':
+            location_source_id = 'stock_location_stock'
+            location_dest_id = 'stock_location_stock'
         if location_source_id:
             try:
                 location_model, location_source_id = mod_obj.get_object_reference(cr, uid, 'stock', location_source_id)

From d0dffd87d233ef0f8e1bc6871c03a3b5ff4e9ac8 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 26 Sep 2012 17:47:03 +0530
Subject: [PATCH 03/10] [IMP] stock : Stock Moves menu should come with the
 Manage Multiple Locations and Warehouse Group.

bzr revid: mdi@tinyerp.com-20120926121703-qnf904kw68xmtkq9
---
 addons/stock/stock_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 83fed186f42..8c7777d785b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -272,7 +272,7 @@
             </field>
         </record>
         <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" 
-            sequence="3" groups="stock.group_tracking_lot,stock.group_production_lot"/>
+            sequence="3"/>
         <menuitem action="action_tracking_form" id="menu_action_tracking_form"
             groups="product.group_stock_packaging"
             sequence="6"
@@ -1419,7 +1419,7 @@
         <field name="act_window_id" ref="action_move_form2"/>
         </record>
 
-        <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="3"/>
+        <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="3" groups="stock.group_locations"/>
 
         <!--
             Reception Picking (By Stock Move)

From 8959e7488529d11892a08763b350d10dacc47934 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 27 Sep 2012 12:28:20 +0530
Subject: [PATCH 04/10] [FIX] stock : Traceback when click on Return Shipment
 Wizard.

bzr revid: mdi@tinyerp.com-20120927065820-f3j23w4dmmmpmckx
---
 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 fb8e327b71f..efd547d1974 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -72,7 +72,7 @@ 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]
+                qty = line.product_qty - return_history.get(line.id, False)
                 if qty > 0:
                     result1.append({'product_id': line.product_id.id, 'quantity': qty,'move_id':line.id})
             if 'product_return_moves' in fields:
@@ -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 m.product_qty * m.product_uom.factor > return_history[m.id]:
+                if m.product_qty * m.product_uom.factor > return_history.get(m.id, False):
                         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 677a60cdf4dbf78a72418d445b9923f284dbefc3 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 27 Sep 2012 12:42:59 +0530
Subject: [PATCH 05/10] [FIX] stock : Traceback when click on Return Shipment
 Wizard.

bzr revid: mdi@tinyerp.com-20120927071259-olnkk6m1ocr173n3
---
 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 efd547d1974..d0494432bd2 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -72,7 +72,7 @@ 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.get(line.id, False)
+                qty = line.product_qty - return_history.get(line.id, 0)
                 if qty > 0:
                     result1.append({'product_id': line.product_id.id, 'quantity': qty,'move_id':line.id})
             if 'product_return_moves' in fields:
@@ -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 m.product_qty * m.product_uom.factor > return_history.get(m.id, False):
+                if m.product_qty * m.product_uom.factor > return_history.get(m.id, 0):
                         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 e9fd752b344af0d38ddf4e81a9ab9cd7722d6734 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 27 Sep 2012 14:05:35 +0530
Subject: [PATCH 06/10] [FIX] stock : Traceback when click on Return Shipment
 Wizard.

bzr revid: mdi@tinyerp.com-20120927083535-f5trwbj0o7hlvbxf
---
 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 d0494432bd2..abe1754a49e 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 m.product_qty * m.product_uom.factor > return_history.get(m.id, 0):
-                        valid_lines += 1
+                if m.state == 'done' and m.product_qty * m.product_uom.factor > return_history.get(m.id, 0):
+                    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 cfa8f988a78c3bc8cc27e743832fbcf72399e67c Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 27 Sep 2012 14:33:52 +0530
Subject: [PATCH 07/10] [FIX] stock : Revert the unneccessary changes.

bzr revid: mdi@tinyerp.com-20120927090352-0kv4nw32v57h0gdy
---
 addons/stock/stock.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 0a2d3328fef..db6748efa5a 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -660,6 +660,7 @@ class stock_picking(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
     }
     _defaults = {
+        'name': lambda self, cr, uid, context: '/',
         'state': 'draft',
         'move_type': 'direct',
         'type': 'internal',

From 691b258a562359e61735ff945ee720f2868aa5bc Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 27 Sep 2012 15:25:39 +0530
Subject: [PATCH 08/10] [IMP] stock : Improved the onchange method.

bzr revid: mdi@tinyerp.com-20120927095539-urak0amvtqdv56fl
---
 addons/stock/stock.py | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index db6748efa5a..4dea3ab3aed 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1943,28 +1943,17 @@ class stock_move(osv.osv):
         @return: Dictionary of values
         """
         mod_obj = self.pool.get('ir.model.data')
-        location_source_id = False
-        location_dest_id = False
+        location_source_id = 'stock_location_stock'
+        location_dest_id = 'stock_location_stock'
         if type == 'in':
             location_source_id = 'stock_location_suppliers'
             location_dest_id = 'stock_location_stock'
         elif type == 'out':
             location_source_id = 'stock_location_stock'
             location_dest_id = 'stock_location_customers'
-        elif type == 'internal':
-            location_source_id = 'stock_location_stock'
-            location_dest_id = 'stock_location_stock'
-        if location_source_id:
-            try:
-                location_model, location_source_id = mod_obj.get_object_reference(cr, uid, 'stock', location_source_id)
-            except ValueError, e:
-                location_source_id = False
-        if location_dest_id:
-            try:
-                location_model, location_dest_id = mod_obj.get_object_reference(cr, uid, 'stock', location_dest_id)
-            except ValueError, e:
-                location_dest_id = False
-        return {'value':{'location_id': location_source_id, 'location_dest_id': location_dest_id}}
+        source_location = mod_obj.get_object_reference(cr, uid, 'stock', location_source_id)
+        dest_location = mod_obj.get_object_reference(cr, uid, 'stock', location_dest_id)
+        return {'value':{'location_id': source_location and source_location[1] or False, 'location_dest_id': dest_location and dest_location[1] or False}}
 
     def onchange_date(self, cr, uid, ids, date, date_expected, context=None):
         """ On change of Scheduled Date gives a Move date.

From 545b8ad1a1211d7de32167aa018ab0eba602c943 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 27 Sep 2012 15:44:36 +0530
Subject: [PATCH 09/10] [IMP] stock : Set the default value for 'Source
 Location' and 'Destination Location' in Internal Picking.

bzr revid: mdi@tinyerp.com-20120927101436-rl77urw5awl7qler
---
 addons/stock/stock.py       | 4 ++++
 addons/stock/stock_view.xml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 4dea3ab3aed..b015a657383 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1728,6 +1728,8 @@ class stock_move(osv.osv):
                 location_xml_id = 'stock_location_stock'
             elif picking_type == 'out':
                 location_xml_id = 'stock_location_customers'
+            elif picking_type == 'internal':
+                location_xml_id = 'stock_location_stock'
             if location_xml_id:
                 location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', location_xml_id)
         return location_id
@@ -1757,6 +1759,8 @@ class stock_move(osv.osv):
                 location_xml_id = 'stock_location_suppliers'
             elif picking_type == 'out':
                 location_xml_id = 'stock_location_stock'
+            elif picking_type == 'internal':
+                location_xml_id = 'stock_location_stock'
             if location_xml_id:
                 location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', location_xml_id)
         return location_id
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 8c7777d785b..d03a83dec77 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -778,7 +778,7 @@
                     </group>
                     <notebook>
                         <page string="Products">
-                            <field name="move_lines" context="{'address_in_id': partner_id, 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
+                            <field name="move_lines" context="{'address_in_id': partner_id, 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree', 'picking_type': 'internal'}"/>
                         </page>
                         <page string="Additional Info">
                             <group>

From 308dc4c65ef037dfa178f250419ad59b7616d83c Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 27 Sep 2012 17:45:03 +0530
Subject: [PATCH 10/10] [IMP] stock : Set the default value for 'Source
 Location' and 'Destination Location' in Internal Picking.

bzr revid: mdi@tinyerp.com-20120927121503-mmy2lg7ocdfjd7pd
---
 addons/stock/stock.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index b015a657383..7306176d5f9 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1724,12 +1724,10 @@ class stock_move(osv.osv):
             location_id = property_out and property_out.id or False
         else:
             location_xml_id = False
-            if picking_type == 'in':
+            if picking_type in ('in', 'internal'):
                 location_xml_id = 'stock_location_stock'
             elif picking_type == 'out':
                 location_xml_id = 'stock_location_customers'
-            elif picking_type == 'internal':
-                location_xml_id = 'stock_location_stock'
             if location_xml_id:
                 location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', location_xml_id)
         return location_id
@@ -1757,9 +1755,7 @@ class stock_move(osv.osv):
             location_xml_id = False
             if picking_type == 'in':
                 location_xml_id = 'stock_location_suppliers'
-            elif picking_type == 'out':
-                location_xml_id = 'stock_location_stock'
-            elif picking_type == 'internal':
+            elif picking_type in ('out', 'internal'):
                 location_xml_id = 'stock_location_stock'
             if location_xml_id:
                 location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', location_xml_id)