Merge lp:~akretion-team/stock-logistic-flows/70-product_serial-plus-plus into lp:stock-logistic-flows

[Alexis de Lattre]

This merge proposal is for the module product_serial.

The main new feature of this merge proposal is the ability to select or create prodlots from a text file (simple texte file, 1 line per prodlot)

Other changes :
- Keep the native "split in serial number" button, because it can be usefull for products that need manual split in non-predictable lot size.
- Code cleaning : reduce flake8 warnings in the wizard, remove old code

I hope you will like this merge proposal :-)

[lp:~akretion-team/stock-logistic-flows/70-product_serial-plus-plus]

39. By Alexis de Lattre on 2013-12-09

[MERGE] with lp:stock-logistic-flows/7.0 revno 39.

40. By Alexis de Lattre on 2014-01-03

Add the new field track_internal to demo data.

41. By Alexis de Lattre on 2014-01-03

Add 2 small modules product_serial_purchase and product_serial_sale_stock.

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

LGTM, lot's f welcome code cleaning, thanks.

review: Approve

[Lionel Sausin - Initiatives/Numérigraphe (ls-initiatives)]

product_serial looks like a great module but it already has 4 functional features.
I humbly suggest it would be better to split it into several small specialized modules, and let user cherry-pick the ones they need.
I would make the code easier to understand and to extend.

review: Needs Fixing

[Alexis de Lattre (alexis-via)]

@Lionel

I agree with you ; my merge proposal is a first step in this direction, with the introduction of :
- product_serial_sale_stock
- product_serial_purchase

but I won't do the split you talk about in this merge proposal, because it's out of the scope of this MP. It would have to be done in a new MP dedicated to this task.

[Lionel Sausin - Initiatives/Numérigraphe (ls-initiatives)]

review: Abstain

[Lionel Sausin - Initiatives/Numérigraphe (ls-initiatives)]

Sorry Alexis de Lattre, I didn't notice the modules you introduced.
You're right a dedicated MP for the splitting will be more effective.

[lp:~akretion-team/stock-logistic-flows/70-product_serial-plus-plus]

42. By Alexis de Lattre on 2014-01-29

[MERGE] with main branch revno 40.

43. By Alexis de Lattre on 2014-02-10

Modularize the code of the wizard for the module product_serial_mrp

44. By Alexis de Lattre on 2014-02-10

Harmonize with the OpenERP strings : Production Lots -> Serial Numbers

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

I'll approve it under the condition this will be splited.
You should already create an other MP which has this one as prerequisite.

Will you split that added feature of serial number in a module as well ?

Otherwise thanks for the code cleaning.

Cheers

review: Needs Information

[Alexis de Lattre (alexis-via)]

@Yannick:

As I said, this MP is a first step towards a split ; as you can see, it introduce 2 new modules : product_serial_sale_stock and product_serial_purchase. I am about to do an MP on lp:openerp-manufacturing for product_serial_mrp.

BUT I didn't say that i'll do all the work for the split by myself. You say : "You should already create an other MP" : you are also invited to do it, it's a community work, not just my own work ! I am not the original author of the module product_serial, I am just a modest contributor on this module.

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

* in select_or_create_prodlots_from_interval:

The following lines

282 + prodlot_seq = ['%%s%%0%dd%%s' % number_length % (
283 + prefix, current_number, suffix) for current_number in
284 + range(first_number, last_number+1)
285 + ]

should be rewritten using '%s%0*d%s' % (prefix, current_number, number_length, suffix) (see http://docs.python.org/2.7/library/stdtypes.html#string-formatting-operations)

I also suggest testing that the interval limits are > 0

* spell check: s/splitted/split/ everywhere

* product_serial_sale_stock/sale_stock.py : the code is not calling super()._create_pickings_and_procurements and will therefore break any addons which overloads this method. If you really need to reimplement the method without playing the super game, this needs at least to be proeminently documented in the module description. And I think monkey patching the official addon implementation would be less disruptive to other addons.

* there are no automated tests for the new feature.

review: Needs Fixing (code review, no test)

[lp:~akretion-team/stock-logistic-flows/70-product_serial-plus-plus]

45. By Alexis de Lattre on 2014-03-19

As suggested by Alexandre Fayolle:
- splitted -> split (English irregular verb)
- simplify string formatting in the spread prodlot wizard
- in the speard prodlot wizard, check that the numbers are > 0
- add a warning in the description of the module product_serial_sale_stock that the module doesn't call super()

Update POT file

[Alexis de Lattre (alexis-via)]

@Alexandre

Thanks for your review.

You are right, the fact that I don't call super() on _create_pickings_and_procurements() in the module product_serial_sale_stock is a big problem and I am aware of that. But, unfortunately, I didn't find a solution that includes calling super(). If you think it's possible, please give me some ideas !

I am not an expert of monkey patching, but I'll see with my colleagues if it is possible.

And thanks for pointing out my mistakes on English irregular verbs :)

[lp:~akretion-team/stock-logistic-flows/70-product_serial-plus-plus]

46. By Alexis de Lattre on 2014-03-20

Use monkey-patching in product_serial_sale_stock, as suggested by Alexandre Fayolle.
[FIX] Copy splitted qty to product_uos_qty, because this field is used for invoicing !

47. By Alexis de Lattre on 2014-03-20

PEP-8 stuff (I forgot to check it before my previous commit)

48. By Alexis de Lattre on 2014-03-20

Small change in import (idea of Sebastien Beau)

[Alexis de Lattre (alexis-via)]

@Alexandre:

Could you update your review status "Needs fixing" following my commits 45 to 48 ?

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Hi Alexis,

Thanks for this contribs. I checked the corrected points suggested by Alexandre and that's fine now !

The only point I see is that we have no tests provided. Can I ask you to add at least one when making the next MP on splitting the module ?

This is a feature we need to be able to rely on, therefor having tests is important here IMO.

I don't want to block this MP any longer, but please think on adding tests the next time.

Best regards,

Joël

review: Approve (code review, no tests)

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

The source code management for this project has been moved to https://github.com/OCA/stock-logistics-workflow

Could you resubmit this MP on the new site?

review: Needs Resubmitting

[Alexis de Lattre (alexis-via)]

Well... product_serial will have to be largely re-written for v8, given all the big changes in stock management. If the modules in v7.0 stay on LP, we could keep this branch here.

[Leonardo Pistone (lepistone)]

Alexis, They don't! :)

On Thu, Jul 3, 2014 at 6:16 PM, Alexis de Lattre <email address hidden>
wrote:

> Well... product_serial will have to be largely re-written for v8, given all the big changes in stock management. If the modules in v7.0 stay on LP, we could keep this branch here.
> --
> https://code.launchpad.net/~akretion-team/stock-logistic-flows/70-product_serial-plus-plus/+merge/195144
> Your team Stock and Logistic Core Editors is subscribed to branch lp:stock-logistic-flows.
> --
> Mailing list: https://launchpad.net/~openerp-community-reviewer
> Post to : <email address hidden>
> Unsubscribe : https://launchpad.net/~openerp-community-reviewer
> More help : https://help.launchpad.net/ListHelp

[lp:~akretion-team/stock-logistic-flows/70-product_serial-plus-plus]

49. By Alexis de Lattre on 2014-07-19

Add missing dependancy.

50. By Alexis de Lattre on 2014-07-20

FIX a bug that was causing wrong stock level when the qty was changed manually by the user in a PO generated by procurements.

51. By Alexis de Lattre on 2014-07-23

FIX my previous fix : don't fail when line.move_dest_id is False

52. By Alexis de Lattre on 2014-08-13

FIX avoid a crash when the module product_serial_sale_stock is not installed.

53. By Alexis de Lattre on 2014-10-29

Using split('\n') is not a good idea when we have windows files that use '\n\r' for new lines.

54. By Alexis de Lattre on 2015-11-18

FIX avoid infinite loop when product qty on sale order line is 0 !

55. By Alexis de Lattre on 2015-12-04

Add prepare method for prodlot generation

Unmerged revisions

55. By Alexis de Lattre on 2015-12-04

Add prepare method for prodlot generation

54. By Alexis de Lattre on 2015-11-18

FIX avoid infinite loop when product qty on sale order line is 0 !

53. By Alexis de Lattre on 2014-10-29

Using split('\n') is not a good idea when we have windows files that use '\n\r' for new lines.

52. By Alexis de Lattre on 2014-08-13

FIX avoid a crash when the module product_serial_sale_stock is not installed.

51. By Alexis de Lattre on 2014-07-23

FIX my previous fix : don't fail when line.move_dest_id is False

50. By Alexis de Lattre on 2014-07-20

FIX a bug that was causing wrong stock level when the qty was changed manually by the user in a PO generated by procurements.

49. By Alexis de Lattre on 2014-07-19

Add missing dependancy.

48. By Alexis de Lattre on 2014-03-20

Small change in import (idea of Sebastien Beau)

47. By Alexis de Lattre on 2014-03-20

PEP-8 stuff (I forgot to check it before my previous commit)

46. By Alexis de Lattre on 2014-03-20

Use monkey-patching in product_serial_sale_stock, as suggested by Alexandre Fayolle.
[FIX] Copy splitted qty to product_uos_qty, because this field is used for invoicing !

=== modified file 'product_serial/__init__.py'
--- product_serial/__init__.py	2013-08-01 12:40:27 +0000
+++ product_serial/__init__.py	2015-12-04 10:45:32 +0000
@@ -19,8 +19,7 @@
 #
 ##############################################################################
 
-import product
-import stock
-import company
-import wizard
-
+from . import product
+from . import stock
+from . import company
+from . import wizard
 
=== modified file 'product_serial/i18n/product_serial.pot'
--- product_serial/i18n/product_serial.pot	2013-11-29 15:22:57 +0000
+++ product_serial/i18n/product_serial.pot	2015-12-04 10:45:32 +0000
@@ -1,13 +1,13 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#       * product_serial
+#	* product_serial
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 09:30+0000\n"
-"PO-Revision-Date: 2013-11-29 16:22+0100\n"
+"POT-Creation-Date: 2014-03-19 13:36+0000\n"
+"PO-Revision-Date: 2014-03-19 13:36+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,8 +21,27 @@
 msgstr ""
 
 #. module: product_serial
-#: selection:product.product,lot_split_type:0
-msgid "Single"
+#: code:addons/product_serial/stock.py:146
+#, python-format
+msgid "Product '%s' has 'Lot split type' = 'Logistical Unit' but is missing packaging information."
+msgstr ""
+
+#. module: product_serial
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Spread Serial Numbers"
+msgstr ""
+
+#. module: product_serial
+#: field:product.product,track_internal:0
+msgid "Track Lots internally"
+msgstr ""
+
+#. module: product_serial
+#: code:addons/product_serial/wizard/prodlot_wizard.py:122
+#, python-format
+msgid "The field 'First Number' should only contain digits."
 msgstr ""
 
 #. module: product_serial
@@ -31,18 +50,30 @@
 msgstr ""
 
 #. module: product_serial
-#: selection:product.product,lot_split_type:0
-msgid "None"
-msgstr ""
-
-#. module: product_serial
-#: model:ir.model,name:product_serial.model_stock_picking_prodlot_selection
-msgid "stock.picking.prodlot.selection"
-msgstr ""
-
-#. module: product_serial
-#: field:stock.production.lot,last_location_id:0
-msgid "Last location"
+#: code:addons/product_serial/wizard/prodlot_wizard.py:129
+#, python-format
+msgid "The field 'Last Number' should only contain digits."
+msgstr ""
+
+#. module: product_serial
+#: help:res.company,is_group_invoice_line:0
+msgid "If active, OpenERP will group the identical invoice lines when generating an invoice from a picking. If inactive, each move line will generate one invoice line."
+msgstr ""
+
+#. module: product_serial
+#: view:stock.move:0
+msgid "onchange_product_id(product_id,location_id,location_dest_id, False)"
+msgstr ""
+
+#. module: product_serial
+#: view:stock.picking.prodlot.selection:0
+msgid "Run From Interval"
+msgstr ""
+
+#. module: product_serial
+#: code:addons/product_serial/wizard/prodlot_wizard.py:144
+#, python-format
+msgid "First and Last Numbers must have the same length."
 msgstr ""
 
 #. module: product_serial
@@ -51,16 +82,17 @@
 msgstr ""
 
 #. module: product_serial
-#: view:stock.move:0
-msgid "Manual Split"
-msgstr ""
-
-#. module: product_serial
 #: model:ir.model,name:product_serial.model_stock_production_lot
 msgid "Serial Number"
 msgstr ""
 
 #. module: product_serial
+#: code:addons/product_serial/wizard/prodlot_wizard.py:134
+#, python-format
+msgid "The First and Last Numbers should be strictly positive."
+msgstr ""
+
+#. module: product_serial
 #: model:ir.model,name:product_serial.model_stock_picking
 msgid "Picking List"
 msgstr ""
@@ -76,6 +108,25 @@
 msgstr ""
 
 #. module: product_serial
+#: field:stock.picking.prodlot.selection,prodlot_file:0
+msgid "Serial Numbers File"
+msgstr ""
+
+#. module: product_serial
+#: code:addons/product_serial/wizard/prodlot_wizard.py:143
+#, python-format
+msgid "Invalid Lot Numbers"
+msgstr ""
+
+#. module: product_serial
+#: code:addons/product_serial/wizard/prodlot_wizard.py:184
+#: code:addons/product_serial/wizard/prodlot_wizard.py:194
+#: code:addons/product_serial/wizard/prodlot_wizard.py:200
+#, python-format
+msgid "Invalid Serial Number"
+msgstr ""
+
+#. module: product_serial
 #: field:stock.picking.prodlot.selection,first_number:0
 msgid "First Number"
 msgstr ""
@@ -87,8 +138,32 @@
 msgstr ""
 
 #. module: product_serial
+#: code:addons/product_serial/stock.py:309
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: product_serial
+#: code:addons/product_serial/wizard/prodlot_wizard.py:185
+#, python-format
+msgid "Serial Number %s not found."
+msgstr ""
+
+#. module: product_serial
 #: view:stock.move:0
-msgid "bottom"
+msgid "Auto-Split"
+msgstr ""
+
+#. module: product_serial
+#: code:addons/product_serial/wizard/prodlot_wizard.py:128
+#, python-format
+msgid "Invalid Last Number"
+msgstr ""
+
+#. module: product_serial
+#: code:addons/product_serial/stock.py:309
+#, python-format
+msgid "Operator %s not supported in searches for last_location_id (product.product)."
 msgstr ""
 
 #. module: product_serial
@@ -97,42 +172,71 @@
 msgstr ""
 
 #. module: product_serial
+#: view:stock.picking.prodlot.selection:0
+msgid "From Interval"
+msgstr ""
+
+#. module: product_serial
 #: field:stock.move,new_prodlot_code:0
 msgid "Create Serial Number"
 msgstr ""
 
 #. module: product_serial
+#: code:addons/product_serial/wizard/prodlot_wizard.py:133
+#: code:addons/product_serial/wizard/prodlot_wizard.py:138
+#, python-format
+msgid "Invalid Numbers"
+msgstr ""
+
+#. module: product_serial
 #: field:res.company,autosplit_is_active:0
 msgid "Active auto split"
 msgstr ""
 
 #. module: product_serial
+#: code:addons/product_serial/wizard/prodlot_wizard.py:139
+#, python-format
+msgid "The First Number must be lower than the Last Number."
+msgstr ""
+
+#. module: product_serial
 #: field:res.company,is_group_invoice_line:0
 msgid "Group invoice lines"
 msgstr ""
 
 #. module: product_serial
-#: model:ir.actions.act_window,name:product_serial.action_prodlot_selection
-#: view:stock.picking.prodlot.selection:0
-msgid "Select Production Lots"
-msgstr ""
-
-#. module: product_serial
-#: view:stock.picking.prodlot.selection:0
-msgid "Validate"
-msgstr ""
-
-#. module: product_serial
 #: view:stock.move:0
 msgid "onchange_lot_id(prodlot_id, product_qty, location_id, product_id, product_uom)"
 msgstr ""
 
 #. module: product_serial
+#: view:stock.picking.prodlot.selection:0
+msgid "Select or Create Production Lots"
+msgstr ""
+
+#. module: product_serial
+#: code:addons/product_serial/stock.py:146
+#, python-format
+msgid "Error :"
+msgstr ""
+
+#. module: product_serial
 #: selection:product.product,lot_split_type:0
 msgid "Logistical Unit"
 msgstr ""
 
 #. module: product_serial
+#: selection:product.product,lot_split_type:0
+msgid "None"
+msgstr ""
+
+#. module: product_serial
+#: code:addons/product_serial/wizard/prodlot_wizard.py:201
+#, python-format
+msgid "Not enough stock available of serial number %s."
+msgstr ""
+
+#. module: product_serial
 #: model:ir.model,name:product_serial.model_res_company
 msgid "Companies"
 msgstr ""
@@ -143,8 +247,9 @@
 msgstr ""
 
 #. module: product_serial
-#: help:res.company,is_group_invoice_line:0
-msgid "If active, OpenERP will group the identical invoice lines when generating an invoice from a picking. If inactive, each move line will generate one invoice line."
+#: code:addons/product_serial/wizard/prodlot_wizard.py:195
+#, python-format
+msgid "Serial Number %s exists but not for product %s."
 msgstr ""
 
 #. module: product_serial
@@ -153,10 +258,30 @@
 msgstr ""
 
 #. module: product_serial
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Spread Production Lots"
+#: code:addons/product_serial/wizard/prodlot_wizard.py:91
+#, python-format
+msgid "You should upload a text file containing the serial numbers."
+msgstr ""
+
+#. module: product_serial
+#: model:ir.actions.act_window,name:product_serial.action_prodlot_selection
+msgid "Select or Create Serial Numbers"
+msgstr ""
+
+#. module: product_serial
+#: code:addons/product_serial/wizard/prodlot_wizard.py:90
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: product_serial
+#: help:product.product,track_internal:0
+msgid "Forces to specify a Serial Number for all internal moves"
+msgstr ""
+
+#. module: product_serial
+#: view:stock.picking.prodlot.selection:0
+msgid "From File"
 msgstr ""
 
 #. module: product_serial
@@ -165,8 +290,8 @@
 msgstr ""
 
 #. module: product_serial
-#: view:stock.move:0
-msgid "onchange_product_id(product_id,location_id,location_dest_id, False)"
+#: field:stock.production.lot,last_location_id:0
+msgid "Last location"
 msgstr ""
 
 #. module: product_serial
@@ -175,17 +300,49 @@
 msgstr ""
 
 #. module: product_serial
+#: code:addons/product_serial/wizard/prodlot_wizard.py:115
+#, python-format
+msgid "You should enter a value for the First Number and the Last Number"
+msgstr ""
+
+#. module: product_serial
 #: view:res.company:0
 msgid "Product serial"
 msgstr ""
 
 #. module: product_serial
+#: model:ir.model,name:product_serial.model_stock_picking_prodlot_selection
+msgid "stock.picking.prodlot.selection"
+msgstr ""
+
+#. module: product_serial
 #: model:ir.model,name:product_serial.model_stock_move
 msgid "Stock Move"
 msgstr ""
 
 #. module: product_serial
 #: view:stock.move:0
+msgid "bottom"
+msgstr ""
+
+#. module: product_serial
+#: code:addons/product_serial/wizard/prodlot_wizard.py:121
+#, python-format
+msgid "Invalid First Number"
+msgstr ""
+
+#. module: product_serial
+#: help:stock.picking.prodlot.selection,prodlot_file:0
+msgid "The serial numbers file should be a text file with one line per serial number (all for the same product)."
+msgstr ""
+
+#. module: product_serial
+#: view:stock.picking.prodlot.selection:0
+msgid "Run From File"
+msgstr ""
+
+#. module: product_serial
+#: view:stock.move:0
 msgid "Manual split"
 msgstr ""
 
@@ -203,4 +360,15 @@
 #: model:ir.actions.act_window,name:product_serial.act_prodlot_location_open
 msgid "Prodlots"
 msgstr ""
- 
+
+#. module: product_serial
+#: code:addons/product_serial/wizard/prodlot_wizard.py:114
+#, python-format
+msgid "Missing parameters"
+msgstr ""
+
+#. module: product_serial
+#: selection:product.product,lot_split_type:0
+msgid "Single"
+msgstr ""
+
 
=== modified file 'product_serial/product_demo.xml'
--- product_serial/product_demo.xml	2013-05-11 16:09:05 +0000
+++ product_serial/product_demo.xml	2015-12-04 10:45:32 +0000
@@ -16,6 +16,7 @@
     <field name="track_production">True</field>
     <field name="track_incoming">True</field>
     <field name="track_outgoing">True</field>
+    <field name="track_internal">True</field>
 </record>
 
 </data>
 
=== modified file 'product_serial/stock.py'
--- product_serial/stock.py	2013-11-29 15:25:53 +0000
+++ product_serial/stock.py	2015-12-04 10:45:32 +0000
@@ -46,6 +46,12 @@
             res[move.id] = move.prodlot_id and move.prodlot_id.name or False
         return res
 
+    def _prepare_prodlot_generation(self, cr, uid, prodlot_name, move, context=None):
+        return {
+            'name': prodlot_name,
+            'product_id': move.product_id.id,
+            }
+
     def _set_prodlot_code(self, cr, uid, ids, name, value, arg, context=None):
         if not value: return False
 
@@ -53,15 +59,14 @@
             ids = [ids]
 
         for move in self.browse(cr, uid, ids, context=context):
-            product_id = move.product_id.id
             existing_prodlot = move.prodlot_id
             if existing_prodlot: #avoid creating a prodlot twice
                 self.pool.get('stock.production.lot').write(cr, uid, existing_prodlot.id, {'name': value})
             else:
-                prodlot_id = self.pool.get('stock.production.lot').create(cr, uid, {
-                    'name': value,
-                    'product_id': product_id,
-                })
+                plot_vals = self._prepare_prodlot_generation(
+                    cr, uid, value, move, context=context)
+                prodlot_id = self.pool.get('stock.production.lot').create(
+                    cr, uid, plot_vals, context=context)
                 move.write({'prodlot_id' : prodlot_id})
 
     def _get_tracking_code(self, cr, uid, ids, field_name, arg, context=None):
@@ -194,7 +199,7 @@
 
         return result
 
-    # Because stock move line can be splitted by the module, we merge
+    # Because stock move line can be split by the module, we merge
     # invoice lines (if option 'is_group_invoice_line' is activated for the company)
     # at the following conditions :
     #   - the product is the same and
 
=== modified file 'product_serial/stock_view.xml'
--- product_serial/stock_view.xml	2013-10-09 09:54:20 +0000
+++ product_serial/stock_view.xml	2015-12-04 10:45:32 +0000
@@ -32,11 +32,11 @@
             <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]" invisible="context.get('picking_type') != 'out' or False"/>
             <field name="location_id" groups="stock.group_locations"/>
         </xpath>
-        <xpath expr="//button[@name='%(stock.track_line)d']" position="replace">
-            <button name="split_move" string="Manual Split"
+        <xpath expr="//button[@name='%(stock.track_line)d']" position="after">
+            <button name="split_move" string="Auto-Split"
                     groups="stock.group_production_lot"
                     states="draft,waiting,confirmed,assigned"
-                    type="object" icon="gtk-justify-fill" />
+                    type="object" icon="STOCK_COPY" />
         </xpath>
         <!-- In the form view of Incoming shipments, add the "new_prodlot_code" field -->
         <xpath expr="//field[@name='prodlot_id']" position="before">
@@ -89,83 +89,5 @@
     <field eval="'ir.actions.act_window,%d'%act_prodlot_location_open" name="value"/>
 </record>
 
-	<!-- Wizard to help users input production lots in batch -->
-<!-- TODO Nan-TIc : port to v6
-	<record id="view_stock_picking_prodlot_selection" model="ir.ui.view">
-		<field name="name">stock.picking.prodlot.selection</field>
-		<field name="model">stock.picking.prodlot.selection</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Select Production Lots">
-				<field name="product_id" colspan="4"/>
-				<field name="first_lot"/>
-				<field name="last_lot"/>
-				<button type="object" name="action_cancel" string="Cancel" icon="gtk-cancel" special="cancel" colspan="2"/>
-				<button type="object" name="action_accept" string="Accept" icon="gtk-ok" colspan="2"/>
-			</form>
-		</field>
-	</record>
-
-	<record model="ir.actions.act_window" id="action_prodlot_selection">
-		<field name="name">Select Production Lots</field>
-		<field name="res_model">stock.picking.prodlot.selection</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">form</field>
-		<field name="target">new</field>
-	</record>
-
-	<record id="view_picking_form" model="ir.ui.view">
-		<field name="name">stock.picking.form.prodlot.selection</field>
-		<field name="model">stock.picking</field>
-		<field name="type">form</field>
-		<field name="inherit_id" ref="stock.view_picking_form"/>
-		<field name="arch" type="xml">
-			<xpath expr="/form/notebook/page/group/label[@colspan='6']" position="replace">
-				<label colspan="5"/>
-				<button type="action" name="%(action_prodlot_selection)d" string="Spread Production Lots" states="draft,confirmed,assigned"/>
-			</xpath>
-		</field>
-	</record>
-
-	<record id="view_picking_in_form" model="ir.ui.view">
-		<field name="name">stock.picking.in.form.prodlot.selection</field>
-		<field name="model">stock.picking</field>
-		<field name="type">form</field>
-		<field name="inherit_id" ref="stock.view_picking_in_form"/>
-		<field name="arch" type="xml">
-			<xpath expr="/form/notebook/page/group/label[@colspan='5']" position="replace">
-				<label colspan="4"/>
-				<button type="action" name="%(action_prodlot_selection)d" string="Spread Production Lots" states="draft,confirmed,assigned"/>
-			</xpath>
-		</field>
-	</record>
-
-	<record id="view_picking_out_form" model="ir.ui.view">
-		<field name="name">stock.picking.out.form</field>
-		<field name="model">stock.picking</field>
-		<field name="type">form</field>
-		<field name="inherit_id" ref="stock.view_picking_out_form"/>
-		<field name="arch" type="xml">
-			<xpath expr="/form/notebook/page/group/label[@colspan='6']" position="replace">
-				<label colspan="5"/>
-				<button type="action" name="%(action_prodlot_selection)d" string="Spread Production Lots" states="draft,confirmed,assigned"/>
-			</xpath>
-		</field>
-	</record>
-
-	<record id="view_picking_delivery_form" model="ir.ui.view">
-		<field name="name">stock.picking.delivery.form</field>
-		<field name="model">stock.picking</field>
-		<field name="type">form</field>
-		<field name="inherit_id" ref="stock.view_picking_delivery_form"/>
-		<field name="arch" type="xml">
-			<xpath expr="/form/notebook/page/group/label[@colspan='6']" position="replace">
-				<label colspan="5"/>
-				<button type="action" name="%(action_prodlot_selection)d" string="Spread Production Lots" states="draft,confirmed,assigned"/>
-			</xpath>
-		</field>
-	</record>
--->
-
 </data>
 </openerp>
 
=== modified file 'product_serial/wizard/__init__.py'
--- product_serial/wizard/__init__.py	2013-08-01 12:40:27 +0000
+++ product_serial/wizard/__init__.py	2015-12-04 10:45:32 +0000
@@ -20,5 +20,4 @@
 #
 ##############################################################################
 
-import prodlot_wizard
-
+from . import prodlot_wizard
 
=== modified file 'product_serial/wizard/prodlot_wizard.py'
--- product_serial/wizard/prodlot_wizard.py	2013-08-01 12:40:27 +0000
+++ product_serial/wizard/prodlot_wizard.py	2015-12-04 10:45:32 +0000
@@ -24,95 +24,186 @@
 
 from openerp.osv import orm, fields
 from openerp.tools.translate import _
+from openerp.tools.safe_eval import safe_eval
+import base64
 
 
 class stock_picking_prodlot_selection_wizard(orm.TransientModel):
     _name = 'stock.picking.prodlot.selection'
+    _description = "Select or Create Production Lots"
 
     _columns = {
-        'product_id': fields.many2one('product.product', 'Product', required=True),
+        'product_id': fields.many2one(
+            'product.product', 'Product', required=True),
         'prefix': fields.char('Prefix', size=256),
         'suffix': fields.char('Suffix', size=256),
-        'first_number': fields.char('First Number', size=256, required=True),
-        'last_number': fields.char('Last Number', size=256, required=True),
+        'first_number': fields.char('First Number', size=256),
+        'last_number': fields.char('Last Number', size=256),
+        'prodlot_file': fields.binary(
+            'Serial Numbers File',
+            help="The serial numbers file should be a text file with one line "
+            "per serial number (all for the same product)."),
         'create_prodlots': fields.boolean('Create New Serial Numbers'),
     }
 
+    def _default_create_prodlots(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        return context.get('default_create_prodlots')
+
     _defaults = {
-        'create_prodlots': False,
+        'create_prodlots': _default_create_prodlots,
         }
 
-
-    def select_or_create_prodlots(self, cr, uid, ids, context=None):
+    def _get_company_and_stock_moves(self, cr, uid, context=None):
+        '''This function is designed to be generic, in order to work
+        on the objects stock.picking (product_serial module) and
+        mrp.production (module product_serial_mrp)'''
         if context is None:
             context = {}
-        if not ids:
-            return {}
-        if not 'active_id' in context:
-            return {}
-
-        prodlot_obj = self.pool['stock.production.lot']
+        assert ('active_id' in context), "Missing 'active_id' key in context"
+        assert ('active_model' in context), \
+            "Missing 'active_model' key in context"
+        assert ('stock_move_field' in context), \
+            "Missing 'stock_move_field' key in context"
+
+        active_id = context['active_id']
+        assert isinstance(active_id, int), \
+            "Wrong value for 'active_id' in context"
+        parent_obj = self.pool[context['active_model']]
+        parent_rec = parent_obj.browse(cr, uid, active_id, context=context)
+        company_id = parent_rec.company_id.id
+        stock_moves = safe_eval(
+            'parent.%s' % context['stock_move_field'],
+            {'parent': parent_rec})
+        return company_id, stock_moves
+
+    def select_or_create_prodlots_from_file(
+            self, cr, uid, ids, context=None):
+        assert len(ids) == 1, "Only one ID"
+        if not ids:
+            return {}
+
+        record = self.browse(cr, uid, ids[0], context)
+        if not record.prodlot_file:
+            raise orm.except_orm(
+                _('Error'),
+                _("You should upload a text file containing the serial "
+                    "numbers."))
+        full_prodlot_str = base64.decodestring(record.prodlot_file)
+        full_prodlot_seq = full_prodlot_str.splitlines()
+        # Remove empty lines
+        prodlot_seq = [prodlot for prodlot in full_prodlot_seq if prodlot]
+        company_id, stock_moves = self._get_company_and_stock_moves(
+            cr, uid, context=context)
+        return self._select_or_create_prodlots(
+            cr, uid, company_id, stock_moves, record.product_id, prodlot_seq,
+            record.create_prodlots, context=context)
+
+    def select_or_create_prodlots_from_interval(
+            self, cr, uid, ids, context=None):
+        assert len(ids) == 1, "Only one ID"
+        if not ids:
+            return {}
+
         record = self.browse(cr, uid, ids[0], context)
         prefix = record.prefix or ''
         suffix = record.suffix or ''
+        if not record.first_number or not record.last_number:
+            raise orm.except_orm(
+                _('Missing parameters'),
+                _("You should enter a value for the First Number and the "
+                    "Last Number"))
         try:
             first_number = int(record.first_number)
         except:
-            raise orm.except_orm(_('Invalid First Number'), _("The field 'First Number' should only contain digits."))
+            raise orm.except_orm(
+                _('Invalid First Number'),
+                _("The field 'First Number' should only contain digits."))
 
         try:
             last_number = int(record.last_number)
         except:
-            raise orm.except_orm(_('Invalid Last Number'), _("The field 'Last Number' should only contain digits."))
+            raise orm.except_orm(
+                _('Invalid Last Number'),
+                _("The field 'Last Number' should only contain digits."))
+
+        if int(record.first_number) <= 0 or int(record.last_number) <= 0:
+            raise orm.except_orm(
+                _('Invalid Numbers'),
+                _("The First and Last Numbers should be strictly positive."))
 
         if last_number < first_number:
-            raise orm.except_orm(_('Invalid Numbers'), _('The First Number must be lower than the Last Number.'))
+            raise orm.except_orm(
+                _('Invalid Numbers'),
+                _('The First Number must be lower than the Last Number.'))
 
         if len(record.first_number) != len(record.last_number):
-            raise orm.except_orm(_('Invalid Lot Numbers'), _('First and Last Numbers must have the same length.'))
+            raise orm.except_orm(
+                _('Invalid Lot Numbers'),
+                _('First and Last Numbers must have the same length.'))
 
         number_length = len(record.first_number)
+        prodlot_seq = [
+            '%s%0*d%s' % (prefix, number_length, current_number, suffix)
+            for current_number in range(first_number, last_number+1)
+            ]
+        company_id, stock_moves = self._get_company_and_stock_moves(
+            cr, uid, context=context)
+        return self._select_or_create_prodlots(
+            cr, uid, company_id, stock_moves, record.product_id, prodlot_seq,
+            record.create_prodlots, context=context)
 
-        picking_id = context['active_id']
-        current_number = first_number
-        picking = self.pool['stock.picking'].browse(cr, uid, picking_id, context=context)
-        company_id = picking.company_id.id
-        for move in picking.move_lines:
-            if move.prodlot_id or move.product_id != record.product_id:
+    def _select_or_create_prodlots(
+            self, cr, uid, company_id, stock_moves, product, prodlot_seq,
+            create_prodlots, context=None):
+        assert prodlot_seq and isinstance(prodlot_seq, list)
+        prodlot_obj = self.pool['stock.production.lot']
+        for move in stock_moves:
+            if move.prodlot_id or move.product_id != product:
                 continue
-
-            current_lot = '%%s%%0%dd%%s' % number_length % (prefix, current_number, suffix)
-            if record.create_prodlots:
+            try:
+                current_lot = prodlot_seq.pop(0)
+            except:
+                break
+            if create_prodlots:
                 # Create new prodlot
-                lot_id_on_move = prodlot_obj.create(cr, uid, {
-                    'product_id': record.product_id.id,
-                    'name': current_lot,
-                    'company_id': company_id,
-                        }, context=context)
+                lot_id_on_move = prodlot_obj.create(
+                    cr, uid, {
+                        'product_id': product.id,
+                        'name': current_lot,
+                        'company_id': company_id,
+                    }, context=context)
             else:
                 # Search existing prodlots
-                lot_ids = prodlot_obj.search(cr, uid, [('name','=',current_lot)], limit=1, context=context)
+                lot_ids = prodlot_obj.search(
+                    cr, uid, [('name', '=', current_lot)], limit=1,
+                    context=context)
                 if not lot_ids:
-                    raise orm.except_orm(_('Invalid lot numbers'), _('Production lot %s not found.') % current_lot)
+                    raise orm.except_orm(
+                        _('Invalid Serial Number'),
+                        _('Serial Number %s not found.') % current_lot)
 
                 ctx = context.copy()
                 ctx['location_id'] = move.location_id.id
-                prodlot = self.pool.get('stock.production.lot').browse(cr, uid, lot_ids[0], ctx)
+                prodlot = self.pool.get('stock.production.lot').browse(
+                    cr, uid, lot_ids[0], ctx)
 
-                if prodlot.product_id != record.product_id:
-                    raise orm.except_orm(_('Invalid lot numbers'), _('Production lot %s exists but not for product %s.') % (current_lot, record.product_id.name))
+                if prodlot.product_id != product:
+                    raise orm.except_orm(
+                        _('Invalid Serial Number'),
+                        _('Serial Number %s exists but not for product %s.')
+                        % (current_lot, product.name))
 
                 if prodlot.stock_available < move.product_qty:
-                    raise orm.except_orm(_('Invalid lot numbers'), _('Not enough stock available of production lot %s.') % current_lot)
+                    raise orm.except_orm(
+                        _('Invalid Serial Number'),
+                        _('Not enough stock available of serial number %s.')
+                        % current_lot)
                 lot_id_on_move = lot_ids[0]
 
-            self.pool.get('stock.move').write(cr, uid, [move.id], {
-                'prodlot_id': lot_id_on_move,
-            }, context=context)
-
-            current_number += 1
-            if current_number > last_number:
-                break
+            self.pool.get('stock.move').write(
+                cr, uid, [move.id], {'prodlot_id': lot_id_on_move},
+                context=context)
 
         return True
-
 
=== modified file 'product_serial/wizard/prodlot_wizard_view.xml'
--- product_serial/wizard/prodlot_wizard_view.xml	2013-08-01 12:40:27 +0000
+++ product_serial/wizard/prodlot_wizard_view.xml	2015-12-04 10:45:32 +0000
@@ -7,17 +7,23 @@
     <field name="name">stock.picking.prodlot.selection</field>
     <field name="model">stock.picking.prodlot.selection</field>
     <field name="arch" type="xml">
-        <form string="Select Production Lots" version="7.0">
-            <group>
+        <form string="Select or Create Production Lots" version="7.0">
+            <group name="common">
                 <field name="product_id" />
+                <field name="create_prodlots"/>
+            </group>
+            <group name="from_interval" string="From Interval">
                 <field name="prefix"/>
                 <field name="first_number"/>
                 <field name="last_number"/>
                 <field name="suffix"/>
-                <field name="create_prodlots"/>
+                <button type="object" name="select_or_create_prodlots_from_interval" string="Run From Interval" class="oe_highlight"/>
+            </group>
+            <group name="from_file" string="From File">
+                <field name="prodlot_file"/>
+                <button type="object" name="select_or_create_prodlots_from_file" string="Run From File" class="oe_highlight"/>
             </group>
             <footer>
-                <button type="object" name="select_or_create_prodlots" string="Validate" class="oe_highlight"/>
                 <button string="Cancel" special="cancel" class="oe_link"/>
             </footer>
         </form>
@@ -26,7 +32,7 @@
 
 
 <record id="action_prodlot_selection" model="ir.actions.act_window">
-    <field name="name">Select Production Lots</field>
+    <field name="name">Select or Create Serial Numbers</field>
     <field name="res_model">stock.picking.prodlot.selection</field>
     <field name="view_type">form</field>
     <field name="view_mode">form</field>
@@ -41,7 +47,7 @@
     <field name="arch" type="xml">
         <xpath expr="//field[@name='origin']/.." position="after">
             <group name="prodlot_wizard">
-                <button type="action" name="%(action_prodlot_selection)d" string="Spread Production Lots" states="draft,confirmed,assigned"/>
+                <button type="action" name="%(action_prodlot_selection)d" string="Spread Serial Numbers" states="draft,confirmed,assigned" context="{'stock_move_field': 'move_lines'}"/>
             </group>
         </xpath>
     </field>
@@ -55,7 +61,7 @@
     <field name="arch" type="xml">
         <xpath expr="//field[@name='origin']/.." position="after">
             <group name="prodlot_wizard">
-                <button type="action" name="%(action_prodlot_selection)d" string="Spread Production Lots" states="draft,confirmed,assigned"/>
+                <button type="action" name="%(action_prodlot_selection)d" string="Spread Serial Numbers" states="draft,confirmed,assigned" context="{'stock_move_field': 'move_lines', 'default_create_prodlots': True}"/>
             </group>
         </xpath>
     </field>
@@ -69,7 +75,7 @@
     <field name="arch" type="xml">
         <xpath expr="//field[@name='origin']/.." position="after">
             <group name="prodlot_wizard">
-                <button type="action" name="%(action_prodlot_selection)d" string="Spread Production Lots" states="draft,confirmed,assigned"/>
+                <button type="action" name="%(action_prodlot_selection)d" string="Spread Serial Numbers" states="draft,confirmed,assigned" context="{'stock_move_field': 'move_lines'}"/>
             </group>
         </xpath>
     </field>
 
=== added directory 'product_serial_purchase'
=== added file 'product_serial_purchase/__init__.py'
--- product_serial_purchase/__init__.py	1970-01-01 00:00:00 +0000
+++ product_serial_purchase/__init__.py	2015-12-04 10:45:32 +0000
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Product Serial Purchase module for OpenERP
+#    Copyright (C) 2013-2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import purchase
 
=== added file 'product_serial_purchase/__openerp__.py'
--- product_serial_purchase/__openerp__.py	1970-01-01 00:00:00 +0000
+++ product_serial_purchase/__openerp__.py	2015-12-04 10:45:32 +0000
@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Product Serial Purchase module for OpenERP
+#    Copyright (C) 2013-2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Product Serial Purchase',
+    'version': '0.1',
+    'category': 'Inventory, Logistic, Storage',
+    'license': 'AGPL-3',
+    'description': """
+Product Serial Purchase
+=======================
+
+The module *product_serial* only depends on the module *stock*, not on the module *purchase*. If you only have the module *product_serial* and you activated the grouping of purchase order lines (via the module purchase_auto_merge for example), the move lines of the incoming picking will be automatically split but the *move_dest_id* of the generated move lines will all be the same. As a consequence, only one move line of the delivery order will be set to 'Available' ; the others will be stuck on 'Waiting Availability'. This module correctly handles the *move_dest_id* on the move lines of the incoming picking.
+
+Please contact Alexis de Lattre from Akretion <[e-mail]> for any help or question about this module.
+    """,
+    'author': 'Akretion',
+    'website': 'http://www.akretion.com',
+    'depends': ['purchase', 'product_serial'],
+    'data': [],
+    'images': [],
+    'installable': True,
+    'active': False,
+}
 
=== added directory 'product_serial_purchase/i18n'
=== added file 'product_serial_purchase/i18n/product_serial_purchase.pot'
--- product_serial_purchase/i18n/product_serial_purchase.pot	1970-01-01 00:00:00 +0000
+++ product_serial_purchase/i18n/product_serial_purchase.pot	2015-12-04 10:45:32 +0000
@@ -0,0 +1,34 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* product_serial_purchase
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-03 18:27+0000\n"
+"PO-Revision-Date: 2014-01-03 18:27+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: product_serial_purchase
+#: code:addons/product_serial_purchase/purchase.py:101
+#, python-format
+msgid "Product '%s' has 'Lot split type' = 'Logistical Unit' but it has no packaging information."
+msgstr ""
+
+#. module: product_serial_purchase
+#: code:addons/product_serial_purchase/purchase.py:100
+#, python-format
+msgid "Error:"
+msgstr ""
+
+#. module: product_serial_purchase
+#: model:ir.model,name:product_serial_purchase.model_purchase_order
+msgid "Purchase Order"
+msgstr ""
+
 
=== added file 'product_serial_purchase/purchase.py'
--- product_serial_purchase/purchase.py	1970-01-01 00:00:00 +0000
+++ product_serial_purchase/purchase.py	2015-12-04 10:45:32 +0000
@@ -0,0 +1,131 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Product Serial Purchase module for OpenERP
+#    Copyright (C) 2013-2014 Akretion (http://www.akretion.com)
+#    Copyright (C) OpenERP S.A.
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm
+from openerp.tools.translate import _
+from openerp import netsvc
+
+
+class purchase_order(orm.Model):
+    _inherit = 'purchase.order'
+
+    def _prepare_order_line_move(
+            self, cr, uid, order, order_line, picking_id, context=None):
+        if context is None:
+            context = {}
+        vals = super(purchase_order, self)._prepare_order_line_move(
+            cr, uid, order, order_line, picking_id, context=context)
+        if context.get('force_qty'):
+            vals['product_qty'] = context.get('force_qty')
+            vals['product_uos_qty'] = context.get('force_qty')
+        if context.get('force_move_dest_id'):
+            vals['move_dest_id'] = context.get('force_move_dest_id')
+        return vals
+
+    def _add_stock_move_on_picking(
+            self, cr, uid, order, line, picking_id, qty, proc_move_dest_id,
+            todo_moves, context=None):
+        if context is None:
+            context = {}
+        move_ctx = context.copy()
+        move_ctx['force_qty'] = qty
+        for move_dest_id, proc_qty in proc_move_dest_id.items():
+            if proc_qty == qty:
+                move_ctx['force_move_dest_id'] = move_dest_id
+                proc_move_dest_id.pop(move_dest_id)
+                self.pool['stock.move'].write(
+                    cr, uid, move_dest_id, {
+                        'location_id': order.location_id.id},
+                    context=context)
+                break
+        move_id = self.pool['stock.move'].create(
+            cr, uid, self._prepare_order_line_move(
+                cr, uid, order, line, picking_id,
+                context=move_ctx))
+        todo_moves.append(move_id)
+        return move_id
+
+    def _create_pickings(
+            self, cr, uid, order, order_lines, picking_id=False, context=None):
+        if not picking_id:
+            picking_id = self.pool.get('stock.picking').create(
+                cr, uid, self._prepare_order_picking(
+                    cr, uid, order, context=context))
+        todo_moves = []
+        stock_move = self.pool['stock.move']
+        wf_service = netsvc.LocalService("workflow")
+        for line in order_lines:
+            if not line.product_id:
+                continue
+            if line.product_id.type in ('product', 'consu'):
+                # We neutralise the procurement stock move now, to be sure
+                # that we don't miss this important task (for exemple when
+                # the user changes the quantity in the PO)
+                if (
+                        line.move_dest_id
+                        and line.move_dest_id.state != 'done'):
+                    line.move_dest_id.write(
+                        {'location_id': order.location_id.id}, context=context)
+
+                proc_ids = self.pool['procurement.order'].search(
+                    cr, uid, [
+                        ('purchase_line_id', '=', line.id),
+                        ('product_id', '=', line.product_id.id),
+                        ('state', '!=', 'cancel'),
+                        ], context=context)
+                proc_move_dest_id = {}
+                # key = move_dest_id ; value = product_qty
+                for procurement in self.pool['procurement.order'].browse(
+                        cr, uid, proc_ids, context=context):
+                    proc_move_dest_id[procurement.move_id.id] = \
+                        procurement.product_qty
+
+                qty = line.product_qty
+                if line.product_id.lot_split_type == 'lu':
+                    if not line.product_id.packaging:
+                        raise orm.except_orm(
+                            _('Error:'),
+                            _("Product '%s' has 'Lot split type' = "
+                                "'Logistical Unit' but it has no packaging "
+                                "information.")
+                            % (line.product_id.name))
+                    lu_qty = line.product_id.packaging[0].qty
+                elif line.product_id.lot_split_type == 'single':
+                    lu_qty = 1
+                else:
+                    lu_qty = qty
+                while qty >= lu_qty:
+                    self._add_stock_move_on_picking(
+                        cr, uid, order, line, picking_id, lu_qty,
+                        proc_move_dest_id, todo_moves, context=context)
+                    qty -= lu_qty
+                if qty > 0:
+                    # Create last move/proc for the remaining qty
+                    self._add_stock_move_on_picking(
+                        cr, uid, order, line, picking_id, qty,
+                        proc_move_dest_id, todo_moves, context=context)
+        stock_move.action_confirm(cr, uid, todo_moves)
+        stock_move.force_assign(cr, uid, todo_moves)
+        wf_service.trg_validate(
+            uid, 'stock.picking', picking_id, 'button_confirm', cr)
+        return [picking_id]
 
=== added directory 'product_serial_sale_stock'
=== added file 'product_serial_sale_stock/__init__.py'
--- product_serial_sale_stock/__init__.py	1970-01-01 00:00:00 +0000
+++ product_serial_sale_stock/__init__.py	2015-12-04 10:45:32 +0000
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Product Serial Sale Stock module for OpenERP
+#    Copyright (C) 2013 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import sale_stock
 
=== added file 'product_serial_sale_stock/__openerp__.py'
--- product_serial_sale_stock/__openerp__.py	1970-01-01 00:00:00 +0000
+++ product_serial_sale_stock/__openerp__.py	2015-12-04 10:45:32 +0000
@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Product Serial Sale Stock module for OpenERP
+#    Copyright (C) 2013 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Product Serial Sale Stock',
+    'version': '0.1',
+    'category': 'Inventory, Logistic, Storage',
+    'license': 'AGPL-3',
+    'description': """
+Product Serial Sale Stock
+=========================
+
+The module *product_serial* only depends on stock, not on procurements. If you only have the module *product_serial* and the move lines are automatically split, the procurements associated with the move lines are not split, so the split stock moves don't automatically switch from *Waiting Availability* to *Ready to Transfer* when the products are available in the stock. This module handles this.
+
+This module uses the monkey-patching method to replace the code of the method _create_pickings_and_procurements() by a different code.
+
+Please contact Alexis de Lattre from Akretion <[e-mail]> for any help or question about this module.
+    """,
+    'author': 'Akretion',
+    'website': 'http://www.akretion.com',
+    'depends': ['product_serial', 'sale_stock'],
+    'data': [],
+    'images': [],
+    'installable': True,
+    'active': False,
+}
 
=== added directory 'product_serial_sale_stock/i18n'
=== added file 'product_serial_sale_stock/i18n/product_serial_sale_stock.pot'
--- product_serial_sale_stock/i18n/product_serial_sale_stock.pot	1970-01-01 00:00:00 +0000
+++ product_serial_sale_stock/i18n/product_serial_sale_stock.pot	2015-12-04 10:45:32 +0000
@@ -0,0 +1,34 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* product_serial_sale_stock
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-03 18:28+0000\n"
+"PO-Revision-Date: 2014-01-03 18:28+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: product_serial_sale_stock
+#: code:addons/product_serial_sale_stock/sale_stock.py:100
+#, python-format
+msgid "Product '%s' has 'Lot split type' = 'Logistical Unit' but it has no packaging information."
+msgstr ""
+
+#. module: product_serial_sale_stock
+#: code:addons/product_serial_sale_stock/sale_stock.py:99
+#, python-format
+msgid "Error:"
+msgstr ""
+
+#. module: product_serial_sale_stock
+#: model:ir.model,name:product_serial_sale_stock.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
 
=== added file 'product_serial_sale_stock/sale_stock.py'
--- product_serial_sale_stock/sale_stock.py	1970-01-01 00:00:00 +0000
+++ product_serial_sale_stock/sale_stock.py	2015-12-04 10:45:32 +0000
@@ -0,0 +1,173 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Product Serial Sale Stock module for OpenERP
+#    Copyright (C) 2013-2014 Akretion (http://www.akretion.com)
+#    Copyright (C) OpenERP S.A.
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm
+from openerp.tools.translate import _
+from openerp import netsvc
+# For Monkey-patching:
+from openerp.addons.sale_stock import sale_stock
+
+
+class sale_order(orm.Model):
+    _inherit = 'sale.order'
+
+    def _prepare_order_line_procurement(
+            self, cr, uid, order, line, move_id, date_planned, context=None):
+        if context is None:
+            context = {}
+        vals = super(sale_order, self)._prepare_order_line_procurement(
+            cr, uid, order, line, move_id, date_planned, context=context)
+        if context.get('force_qty'):
+            vals['product_qty'] = context.get('force_qty')
+            vals['product_uos_qty'] = context.get('force_qty')
+        return vals
+
+    def _prepare_order_line_move(
+            self, cr, uid, order, line, picking_id, date_planned,
+            context=None):
+        if context is None:
+            context = {}
+        vals = super(sale_order, self)._prepare_order_line_move(
+            cr, uid, order, line, picking_id, date_planned, context=context)
+        if context.get('force_qty'):
+            vals['product_qty'] = context.get('force_qty')
+            vals['product_uos_qty'] = context.get('force_qty')
+        return vals
+
+    def _create_move_line_and_procurement(
+            self, cr, uid, order, line, picking_id, qty, proc_ids,
+            date_planned, context=None):
+        if context is None:
+            context = {}
+        qty_ctx = context.copy()
+        qty_ctx['force_qty'] = qty
+        picking_obj = self.pool.get('stock.picking')
+        move_obj = self.pool.get('stock.move')
+        procurement_obj = self.pool.get('procurement.order')
+        if line.product_id.type in ('product', 'consu'):
+            if not picking_id:
+                picking_id = picking_obj.create(
+                    cr, uid, self._prepare_order_picking(
+                        cr, uid, order, context=context),
+                    context=context)
+            move_id = move_obj.create(
+                cr, uid, self._prepare_order_line_move(
+                    cr, uid, order, line, picking_id, date_planned,
+                    context=qty_ctx),
+                context=context)
+        else:
+            # a service has no stock move
+            move_id = False
+
+        proc_id = procurement_obj.create(
+            cr, uid, self._prepare_order_line_procurement(
+                cr, uid, order, line, move_id, date_planned,
+                context=qty_ctx),
+            context=context)
+        proc_ids.append(proc_id)
+        return picking_id
+
+
+class product_serial_sale_stock_installed(orm.AbstractModel):
+    _name = "product.serial.sale.stock.installed"
+    # This class is used only to test if the module is installed or not
+
+
+original_create_pickings_and_procurements = \
+    sale_stock.sale_order._create_pickings_and_procurements
+
+
+def _create_pickings_and_procurements(
+        self, cr, uid, order, order_lines, picking_id=False, context=None):
+    if self.pool.get('product.serial.sale.stock.installed'):
+        # Here is the code that is executed when the module
+        # product_serial_sale_stock is installed
+        if context is None:
+            context = {}
+        proc_ids = []
+
+        for line in order_lines:
+            if line.state == 'done':
+                continue
+
+            date_planned = self._get_date_planned(
+                cr, uid, order, line, order.date_order, context=context)
+
+            if line.product_id and line.product_uom_qty:
+                qty = line.product_uom_qty
+                if line.product_id.lot_split_type == 'lu':
+                    if not line.product_id.packaging:
+                        raise orm.except_orm(
+                            _('Error:'),
+                            _("Product '%s' has 'Lot split type' = "
+                                "'Logistical Unit' but it has no packaging "
+                                "information.")
+                            % (line.product_id.name))
+                    lu_qty = line.product_id.packaging[0].qty
+                elif line.product_id.lot_split_type == 'single':
+                    lu_qty = 1
+                else:
+                    lu_qty = qty
+                while qty >= lu_qty:
+                    picking_id = self._create_move_line_and_procurement(
+                        cr, uid, order, line, picking_id, lu_qty, proc_ids,
+                        date_planned, context=context)
+                    qty -= lu_qty
+                if qty > 0:
+                    # Create last move/proc for the remaining qty
+                    picking_id = self._create_move_line_and_procurement(
+                        cr, uid, order, line, picking_id, qty, proc_ids,
+                        date_planned, context=context)
+                line.write({'procurement_id': proc_ids[-1]})
+                #self.ship_recreate(cr, uid, order, line, move_id, proc_id)
+
+        wf_service = netsvc.LocalService("workflow")
+        if picking_id:
+            wf_service.trg_validate(
+                uid, 'stock.picking', picking_id, 'button_confirm', cr)
+        for proc_id in proc_ids:
+            wf_service.trg_validate(
+                uid, 'procurement.order', proc_id, 'button_confirm', cr)
+
+        val = {}
+        if order.state == 'shipping_except':
+            val['state'] = 'progress'
+            val['shipped'] = False
+
+            if order.order_policy == 'manual':
+                for line in order.order_line:
+                    if not line.invoiced and \
+                            line.state not in ('cancel', 'draft'):
+                        val['state'] = 'manual'
+                        break
+        order.write(val)
+        return True
+    else:
+        # This is the code that is executed when the module
+        # product_serial_sale_stock is NOT installed
+        return original_create_pickings_and_procurements(
+            self, cr, uid, order, order_lines, picking_id=picking_id,
+            context=context)
+
+sale_stock.sale_order._create_pickings_and_procurements = \
+    _create_pickings_and_procurements