Merge lp:~camptocamp/openobject-addons/7.0-fix-1088412 into lp:openobject-addons/7.0

[Alexandre Fayolle - camptocamp]

fix the sequence type code for internal stock pickings. Update the data for existing databases.

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Looks good to me. Using migrate function will be better than using init function.
I'm a little bit worried if an exception happens as I have not a global vision of cursor transaction management of the migrate function. If someone from OpenERP can gave more explanation about it it will be nice.

review: Approve (no test, code review only)

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

setting back to "WIP" following comments on the OCB MP

Unmerged revisions

9145. By Alexandre Fayolle - camptocamp on 2013-06-08

[FIX] stock.picking: fix the case which was broken by previous change

9144. By Alexandre Fayolle - camptocamp on 2013-05-21

[IMP] set version to 1.1.1 rather than 1.2

9143. By Alexandre Fayolle - camptocamp on 2013-05-20

[FIX] added migration script to ensure the correct name of the sequence type in pre existing databases

9142. By Paramjit Singh Sahota(OpenERP) on 2013-05-20

[FIX] change the name to the sequence code for internal pickings

when a chained picking is generated, the sequence code used is "stock.picking.%s" % picking.type
so we need a sequence code "stock.picking.internal" for internal pickings (and not "stock.picking")

=== modified file 'stock/__openerp__.py'
--- stock/__openerp__.py	2012-12-09 10:55:27 +0000
+++ stock/__openerp__.py	2013-06-08 19:32:28 +0000
@@ -21,7 +21,7 @@
 
 {
     'name': 'Warehouse Management',
-    'version': '1.1',
+    'version': '1.1.1',
     'author': 'OpenERP SA',
     'summary': 'Inventory, Logistic, Storage',
     'description' : """
 
=== added directory 'stock/migrations'
=== added directory 'stock/migrations/7.0.1.1.1'
=== added file 'stock/migrations/7.0.1.1.1/pre-rename_sequence_code.py'
--- stock/migrations/7.0.1.1.1/pre-rename_sequence_code.py	1970-01-01 00:00:00 +0000
+++ stock/migrations/7.0.1.1.1/pre-rename_sequence_code.py	2013-06-08 19:32:28 +0000
@@ -0,0 +1,11 @@
+__name__ = ("update internal picking sequence code and sequence")
+
+def migrate(cr, version):
+    old_type = 'stock.picking'
+    new_type = 'stock.picking.internal'
+    cr.execute ("UPDATE ir_sequence_type SET code=%(newtype)s WHERE code=%(oldtype)s",
+                {'newtype': new_type,
+                 'oldtype': old_type})
+    cr.execute ("UPDATE ir_sequence SET code=%(newtype)s WHERE code=%(oldtype)s",
+                {'newtype': new_type,
+                 'oldtype': old_type})
 
=== modified file 'stock/stock.py'
--- stock/stock.py	2013-06-07 15:53:50 +0000
+++ stock/stock.py	2013-06-08 19:32:28 +0000
@@ -618,7 +618,7 @@
 
     def create(self, cr, user, vals, context=None):
         if ('name' not in vals) or (vals.get('name')=='/'):
-            seq_obj_name =  self._name
+            seq_obj_name =  'stock.picking.%s' % vals.get('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)
         return new_id
 
=== modified file 'stock/stock_sequence.xml'
--- stock/stock_sequence.xml	2012-11-29 22:26:45 +0000
+++ stock/stock_sequence.xml	2013-06-08 19:32:28 +0000
@@ -17,7 +17,7 @@
         
         <record id="seq_type_picking_internal" model="ir.sequence.type">
             <field name="name">Picking INT</field>
-            <field name="code">stock.picking</field>
+            <field name="code">stock.picking.internal</field>
         </record>
 
         <!--
@@ -42,7 +42,7 @@
         
         <record id="seq_picking_internal" model="ir.sequence">
             <field name="name">Picking INT</field>
-            <field name="code">stock.picking</field>
+            <field name="code">stock.picking.internal</field>
             <field name="prefix">INT/</field>
             <field name="padding">5</field>
             <field name="company_id" eval="False"/>