From 3d6f4f088240374b42ff23521c87c6063c365fa4 Mon Sep 17 00:00:00 2001 From: "Jalpesh Patel (OpenERP)" Date: Thu, 25 Oct 2012 17:05:43 +0530 Subject: [PATCH 1/4] [IMP]solve problem don't save or confirm or confirm & receive manually creating incoming shipments bzr revid: pja@tinyerp.com-20121025113543-a4cxxwcntj4e2ij8 --- 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 729e0976f94..eb667b53c09 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -618,7 +618,7 @@ class stock_picking(osv.osv): def create(self, cr, user, vals, context=None): if ('name' not in vals) or (vals.get('name')=='/'): - seq_obj_name = 'stock.picking.' + vals['type'] + seq_obj_name = 'stock.picking.' + vals.get('type','in') vals['name'] = self.pool.get('ir.sequence').get(cr, user, seq_obj_name) new_id = super(stock_picking, self).create(cr, user, vals, context) if new_id: From f992b688bb268a03957e2b4f936715cc145c2864 Mon Sep 17 00:00:00 2001 From: "Jalpesh Patel (OpenERP)" Date: Mon, 29 Oct 2012 15:48:50 +0530 Subject: [PATCH 2/4] [IMP]solve problem don't save or confirm or confirm & receive manually creating incoming shipments bzr revid: pja@tinyerp.com-20121029101850-78iq489ut29q7w62 --- 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 eb667b53c09..e7b3cf1e041 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -618,7 +618,7 @@ class stock_picking(osv.osv): def create(self, cr, user, vals, context=None): if ('name' not in vals) or (vals.get('name')=='/'): - seq_obj_name = 'stock.picking.' + vals.get('type','in') + seq_obj_name = 'stock.picking.' + context.get('default_type','internal') vals['name'] = self.pool.get('ir.sequence').get(cr, user, seq_obj_name) new_id = super(stock_picking, self).create(cr, user, vals, context) if new_id: From c56368ee0c3db11069e1eecf3553a62147cb7d75 Mon Sep 17 00:00:00 2001 From: "Jalpesh Patel (OpenERP)" Date: Mon, 29 Oct 2012 17:16:35 +0530 Subject: [PATCH 3/4] [IMP]improve code for getting reference of internal move bzr revid: pja@tinyerp.com-20121029114635-p960l6bsq9fo0035 --- addons/stock/stock.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index dffe1d69cc1..fb12bc40ce0 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -619,6 +619,9 @@ class stock_picking(osv.osv): def create(self, cr, user, vals, context=None): if ('name' not in vals) or (vals.get('name')=='/'): seq_obj_name = self._name + if seq_obj_name == 'stock.picking': + seq_obj_name = 'stock.picking.' + 'internal' + vals['name'] = self.pool.get('ir.sequence').get(cr, user, seq_obj_name) vals['name'] = self.pool.get('ir.sequence').get(cr, user, seq_obj_name) new_id = super(stock_picking, self).create(cr, user, vals, context) if new_id: From 3860dfeed6b0526e68bf8faef268e1c374ac6c52 Mon Sep 17 00:00:00 2001 From: "Jalpesh Patel (OpenERP)" Date: Tue, 30 Oct 2012 11:04:08 +0530 Subject: [PATCH 4/4] [IMP]fix problem of getting reference of internal moves bzr revid: pja@tinyerp.com-20121030053408-81vod77769icetbu --- addons/stock/stock.py | 3 --- addons/stock/stock_sequence.xml | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index fb12bc40ce0..dffe1d69cc1 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -619,9 +619,6 @@ class stock_picking(osv.osv): def create(self, cr, user, vals, context=None): if ('name' not in vals) or (vals.get('name')=='/'): seq_obj_name = self._name - if seq_obj_name == 'stock.picking': - seq_obj_name = 'stock.picking.' + 'internal' - vals['name'] = self.pool.get('ir.sequence').get(cr, user, seq_obj_name) vals['name'] = self.pool.get('ir.sequence').get(cr, user, seq_obj_name) new_id = super(stock_picking, self).create(cr, user, vals, context) if new_id: diff --git a/addons/stock/stock_sequence.xml b/addons/stock/stock_sequence.xml index 6c0b3e84cf2..c3569c48c3e 100644 --- a/addons/stock/stock_sequence.xml +++ b/addons/stock/stock_sequence.xml @@ -17,7 +17,7 @@ Picking INT - stock.picking.internal + stock.picking