Merge lp:~syleam/wms/5.0-alnslang into lp:wms

[Sebastien LANGE - http://www.Syleam.fr]

Christophe,

This branch fixed bug and merged with the branches from Jean-Sébastien and Sylvain for customer's project.

Could you please check and merge it asap ?

Thanks

[lp:~syleam/wms/5.0-alnslang]

229. By Sebastien LANGE - http://www.Syleam.fr on 2011-04-26

[FIX] Fix price accuracy in price_unit during picking in

230. By Christophe CHAUVET on 2011-05-07

[FIX] issue with document module

231. By Sebastien LANGE - http://www.Syleam.fr on 2011-05-07

[FIX] Fix possibility to change sequence

Unmerged revisions

231. By Sebastien LANGE - http://www.Syleam.fr on 2011-05-07

[FIX] Fix possibility to change sequence

230. By Christophe CHAUVET on 2011-05-07

[FIX] issue with document module

229. By Sebastien LANGE - http://www.Syleam.fr on 2011-04-26

[FIX] Fix price accuracy in price_unit during picking in

228. By Sebastien LANGE - http://www.Syleam.fr on 2011-04-19

[MERGE] with branch 5.0-sgaranger

227. By Sebastien LANGE - http://www.Syleam.fr on 2011-04-19

[IMP] the price unit of move.picking in is copy in purchase price in move out and delivery

226. By Sebastien LANGE - http://www.Syleam.fr on 2011-04-19

[FIX] Fixing location_dest_id if stock picking is created by sale order

=== modified file 'wms/i18n/fr_FR.po'
--- wms/i18n/fr_FR.po	2011-03-25 08:52:08 +0000
+++ wms/i18n/fr_FR.po	2011-05-07 16:56:36 +0000
@@ -7,8 +7,8 @@
 "Project-Id-Version: OpenERP Server 5.0.15\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-25 08:50:37+0000\n"
-"PO-Revision-Date: 2011-03-25 09:51+0100\n"
-"Last-Translator: Christophe Chauvet <[e-mail]>\n"
+"PO-Revision-Date: 2011-03-31 16:12+0100\n"
+"Last-Translator: Sylvain Garancher <[e-mail]>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -79,7 +79,7 @@
 #. module: wms
 #: field:stock.warehouse,return_location_id:0
 msgid "Return location"
-msgstr "Emplacement de retourn"
+msgstr "Emplacement de retour"
 
 #. module: wms
 #: help:stock.warehouse,parent_id:0
@@ -492,7 +492,7 @@
 #: code:addons/stock/wizard/wizard_track_line.py:0
 #, python-format
 msgid "Caution!"
-msgstr "Caution!"
+msgstr "Attention !"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
@@ -1232,7 +1232,7 @@
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
 msgid "Finished products"
-msgstr "produits finis"
+msgstr "Produits finis"
 
 #. module: stock
 #: field:stock.location,location_id:0
@@ -1374,7 +1374,7 @@
 #. module: stock
 #: field:stock.location,allocation_method:0
 msgid "Allocation Method"
-msgstr "Méthod d'attribution"
+msgstr "Méthode d'attribution"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1508,7 +1508,7 @@
 #. module: wms
 #: help:product.uom,code:0
 msgid "This field can be used on printing"
-msgstr "Ce champ pourra être utilser lors de l'impression"
+msgstr "Ce champ pourra être utilisé lors de l'impression"
 
 #. modules: wms, stock
 #: wizard_button:inventory.merge,init,end:0
@@ -1739,12 +1739,12 @@
 #: code:addons/wms/object/picking.py:0
 #, python-format
 msgid "Only picking in confirmed or assigned must be reset!"
-msgstr "Seul les bon confirmés ou assignés peut être reinitialiser!"
+msgstr "Seul les bons confirmés ou assignés peut être réinitialisés !"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic No Step Added"
-msgstr "Automatique aucun pas ajouter"
+msgstr "Automatique aucun pas ajouté"
 
 #. module: stock
 #: wizard_view:stock.location.products,init:0
@@ -2862,7 +2862,7 @@
 #. module: wms
 #: model:stock.location,name:wms.stock_location_syleam_alencon
 msgid "Syleam - Alencon"
-msgstr "Syleam - Alencon"
+msgstr "Syleam - Alençon"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -2895,7 +2895,7 @@
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Cancelled"
-msgstr "Cancelled"
+msgstr "Annulé"
 
 #. module: wms
 #: model:ir.actions.act_window,name:wms.act_burst_2_stock_picking
@@ -3381,7 +3381,7 @@
 #. module: stock
 #: wizard_button:wms.partial_picking,end2,end:0
 msgid "Close"
-msgstr "Close"
+msgstr "Fermé"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels

=== modified file 'wms/object/picking.py'
--- wms/object/picking.py	2011-03-22 14:12:31 +0000
+++ wms/object/picking.py	2011-05-07 16:56:36 +0000
@@ -123,6 +123,28 @@
 
         return super(StockPicking, self).create(cr, uid, values, context=context)
 
+    def unlink(self, cr, uid, ids, context=None):
+        """
+        Redefine unlink to delete picking.delivery when picking.out is deleted
+        """
+        move_obj = self.pool.get('stock.move')
+        move_out_ids = move_obj.search(cr, uid, [('picking_id', 'in', ids)], context=context)
+        for move_out in move_obj.browse(cr, uid, move_out_ids, context=context):
+            if move_out and move_out.move_dest_id and move_out.move_dest_id.picking_id:
+                self.unlink(cr, uid, [move_out.move_dest_id.picking_id.id], context=context)
+        return super(StockPicking, self).unlink(cr, uid, ids, context=context)
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        """
+        Redefine action_cancel to cancel picking.delivery when picking.out is canceled
+        """
+        move_obj = self.pool.get('stock.move')
+        move_out_ids = move_obj.search(cr, uid, [('picking_id', 'in', ids)], context=context)
+        for move_out in move_obj.browse(cr, uid, move_out_ids, context=context):
+            if move_out and move_out.move_dest_id and move_out.move_dest_id.picking_id:
+                self.action_cancel(cr, uid, [move_out.move_dest_id.picking_id.id], context=context)
+        return super(StockPicking, self).action_cancel(cr, uid, ids, context=context)
+
     def action_confirm(self, cr, uid, ids, context=None):
         """
         Change destination location on move, if there is a round on the picking
@@ -131,8 +153,9 @@
         pick = self.browse(cr, uid, ids, context=context)
         for p in pick:
             if p.type == 'out' and p.state == 'draft' and p.round_id and p.round_id.default_location_id:
-                move_ids = [x.id for x in p.move_lines]
+                move_ids = [x.id for x in p.move_lines if x.state == 'draft']
                 move_obj.write(cr, uid, move_ids, {'location_dest_id': p.round_id.default_location_id.id}, context=context)
+            move_obj._chain_compute(cr, uid, p.move_lines, context=context)
 
         return super(StockPicking, self).action_confirm(cr, uid, ids, context=context)
 
@@ -616,7 +639,7 @@
 
     #def test_cancel(self, cr, uid, ids, context={}):
     #    """
-    #    Redefine test cancel, to protect 
+    #    Redefine test cancel, to protect
     #    """
     #    for pick in self.browse(cr, uid, ids, context=context):
     #        for move in pick.move_lines:

=== modified file 'wms/wizard/wizard_partial_picking.py'
--- wms/wizard/wizard_partial_picking.py	2011-03-04 11:07:55 +0000
+++ wms/wizard/wizard_partial_picking.py	2011-05-07 16:56:36 +0000
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -27,6 +27,7 @@
 
 import wizard
 from osv import osv
+from tools import config
 import tools
 from tools.translate import _
 
@@ -87,7 +88,7 @@
                     <field name="price%s"/>' % (m.id,m.id,))
 
             _moves_fields['price%s' % m.id] = {'string': 'Unit Price',
-                    'type': 'float', 'required': True, 'default': make_default(price)}
+                    'type': 'float', 'required': True, 'digits': (16, int(config['price_accuracy'])), 'default': make_default(price)}
 
             _moves_fields['uom%s' % m.id] = {'string': 'UOM', 'type': 'many2one',
                     'relation': 'product.uom', 'required': True,
@@ -159,9 +160,10 @@
 
             new_picking = pick_obj.copy(cr, uid, pick.id,
                     {
-                        'name': pool.get('ir.sequence').get(cr, uid, 'stock.picking'),
                         'move_lines' : [],
                         'state':'draft',
+                        'type': pick.type,
+                        'sale_id' : pick.sale_id and pick.sale_id.id or False,
                     })
         if data['form']['move%s' % move.id] <> 0:
             new_obj = move_obj.copy(cr, uid, move.id,

=== modified file 'wms_inventory/__terp__.py'
--- wms_inventory/__terp__.py	2011-02-28 09:05:33 +0000
+++ wms_inventory/__terp__.py	2011-05-07 16:56:36 +0000
@@ -40,11 +40,12 @@
     'init_xml': [],
     'update_xml': [
         #'security/groups.xml',
-        #'security/ir.model.access.csv',
+        'security/ir.model.access.csv',
         #'view/menu.xml',
         'view/warehouse.xml',
         'view/inventory.xml',
         #'wizard/wizard.xml',
+        'wizard/product_affect_location.xml',
         #'report/report.xml',
     ],
     'demo_xml': [],

=== modified file 'wms_inventory/i18n/fr_FR.po'
--- wms_inventory/i18n/fr_FR.po	2011-03-01 13:04:52 +0000
+++ wms_inventory/i18n/fr_FR.po	2011-05-07 16:56:36 +0000
@@ -1,18 +1,24 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# * wms_inventory
+#	* wms_inventory
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: OpenERP Server 5.0.15\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-02-27 18:39:06+0000\n"
-"PO-Revision-Date: 2011-02-27 19:39+0100\n"
-"Last-Translator: Christophe Chauvet <[e-mail]>\n"
-"Language-Team: LANGUAGE <[e-mail]>\n"
+"POT-Creation-Date: 2011-04-12 14:26:02+0000\n"
+"PO-Revision-Date: 2011-04-12 16:29+0100\n"
+"Last-Translator: Sylvain Garancher <[e-mail]>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.3.0\n"
+"Plural-Forms: \n"
+
+#. module: wms_inventory
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de caractères spéciaux !"
 
 #. module: wms_inventory
 #: code:addons/wms_inventory/object/inventory.py:0
@@ -23,6 +29,12 @@
 #. module: wms_inventory
 #: code:addons/wms_inventory/object/inventory.py:0
 #, python-format
+msgid "product %s"
+msgstr "produit %s"
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
 msgid "global"
 msgstr "globale"
 
@@ -56,37 +68,60 @@
 msgstr "quantité à reinitialisée %.2f"
 
 #. module: wms_inventory
+#: code:addons/wms_inventory/wizard/product_affect_location.py:0
+#, python-format
+msgid "Location"
+msgstr "Emplacement"
+
+#. module: wms_inventory
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom du modèle invalide dans la définition de l'action."
+
+#. module: wms_inventory
 #: field:stock.inventory,warehouse_id:0
 msgid "Warehouse"
 msgstr "Entrepôt"
 
 #. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "        [%s]"
+msgstr "        [%s]"
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/wizard/product_affect_location.py:0
+#, python-format
+msgid "Set procure method to stock for products"
+msgstr "Change la méthode d'approvisionnement à 'stock' pour les produits"
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid " -> Partial Inventory"
+msgstr " -> Inventaire partiel"
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/wizard/product_affect_location.py:0
+#, python-format
+msgid "end"
+msgstr "fin"
+
+#. module: wms_inventory
 #: field:stock.inventory,type:0
 msgid "Type"
 msgstr "Type"
 
 #. module: wms_inventory
-#: code:addons/wms_inventory/object/inventory.py:0
-#, python-format
-msgid " -> Partial Inventory"
-msgstr " -> Inventaire partiel"
-
-#. module: wms_inventory
-#: code:addons/wms_inventory/object/inventory.py:0
-#, python-format
-msgid "        [%s]"
-msgstr "        [%s]"
-
-#. module: wms_inventory
 #: help:stock.inventory,warehouse_id:0
 msgid "Select the warehouse where the inventory is made"
 msgstr "Sélectionner l'entrepôt ou sera fait cet inventaire"
 
 #. module: wms_inventory
-#: code:addons/wms_inventory/object/inventory.py:0
+#: code:addons/wms_inventory/wizard/product_affect_location.py:0
 #, python-format
-msgid "init"
-msgstr "init"
+msgid "End inventory %d : %s"
+msgstr "Fin de l'inventaire %d : %s"
 
 #. module: wms_inventory
 #: code:addons/wms_inventory/object/inventory.py:0
@@ -96,26 +131,38 @@
 
 #. module: wms_inventory
 #: code:addons/wms_inventory/object/inventory.py:0
+#: code:addons/wms_inventory/wizard/product_affect_location.py:0
+#, python-format
+msgid "action"
+msgstr "action"
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
 #, python-format
 msgid "Inventory number %s"
 msgstr "Inventaire numéro %s"
 
 #. module: wms_inventory
+#: view:wizard.product.affect.location:0
+msgid "Affect"
+msgstr "Affectation"
+
+#. module: wms_inventory
 #: code:addons/wms_inventory/object/inventory.py:0
 #, python-format
 msgid "analyze"
 msgstr "analyse"
 
 #. module: wms_inventory
-#: code:addons/wms_inventory/object/inventory.py:0
+#: code:addons/wms_inventory/wizard/product_affect_location.py:0
 #, python-format
-msgid "product %s"
-msgstr "produit %s"
+msgid "Set orderpoint active for products"
+msgstr "Active les règles de stock minimum pour les produits"
 
 #. module: wms_inventory
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour cette vue!"
+msgstr "XML non valide pour l'architecture de la vue"
 
 #. module: wms_inventory
 #: field:stock.inventory.line,tracking_id:0
@@ -137,14 +184,30 @@
 #. module: wms_inventory
 #: code:addons/wms_inventory/object/inventory.py:0
 #, python-format
+msgid "error"
+msgstr "erreur"
+
+#. module: wms_inventory
+#: model:ir.actions.act_window,name:wms_inventory.act_open_wizard_product_affect_location_view
+msgid "Affect product location"
+msgstr "Affectation des emplacements aux produits"
+
+#. module: wms_inventory
+#: field:stock.inventory.line,prodlot_id:0
+msgid "Production Lot"
+msgstr "Lot de production"
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
 msgid "Start to analyse each line"
 msgstr "Démarrer une analyse pour chaque ligne"
 
 #. module: wms_inventory
-#: code:addons/wms_inventory/object/inventory.py:0
+#: code:addons/wms_inventory/wizard/product_affect_location.py:0
 #, python-format
-msgid "Validate each inventory line"
-msgstr "Validation de chaque ligne d'inventaire"
+msgid "Start inventory %d : %s"
+msgstr "Démarrage de l'inventaire %d : %s"
 
 #. module: wms_inventory
 #: help:stock.inventory,type:0
@@ -157,7 +220,9 @@
 msgid ""
 "Inventory %s failed\n"
 "see below\n"
-msgstr "Échec de l'inventaire %s\n"
+msgstr ""
+"L'inventaire %s a échoué\n"
+"Voir ci dessous\n"
 
 #. module: wms_inventory
 #: code:addons/wms_inventory/object/inventory.py:0
@@ -184,6 +249,13 @@
 msgstr "Calcul de l'inventaire %s terminé"
 
 #. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#: code:addons/wms_inventory/wizard/product_affect_location.py:0
+#, python-format
+msgid "init"
+msgstr "init"
+
+#. module: wms_inventory
 #: selection:stock.inventory,type:0
 msgid "Partial"
 msgstr "Partiel"
@@ -191,6 +263,12 @@
 #. module: wms_inventory
 #: code:addons/wms_inventory/object/inventory.py:0
 #, python-format
+msgid "Validate each inventory line"
+msgstr "Validation de chaque ligne d'inventaire"
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
 msgid "tracking %s"
 msgstr "suivi %s"
 
@@ -206,21 +284,24 @@
 msgstr "Quantité en stock %.2f à cet emplacement %s"
 
 #. module: wms_inventory
+#: model:ir.model,name:wms_inventory.model_wizard_product_affect_location
+msgid "Affects location to products from inventory"
+msgstr "Affecte les emplacements aux produits depuis l'inventaire"
+
+#. module: wms_inventory
 #: model:ir.module.module,shortdesc:wms_inventory.module_meta_information
 msgid "Wms Inventory"
 msgstr "WMS Inventory"
 
 #. module: wms_inventory
-#: code:addons/wms_inventory/object/inventory.py:0
-#, python-format
-msgid "error"
-msgstr "erreur"
+#: view:wizard.product.affect.location:0
+msgid "Affect product locations ?"
+msgstr "Affecter les emplacements aux produits ?"
 
 #. module: wms_inventory
-#: code:addons/wms_inventory/object/inventory.py:0
-#, python-format
-msgid "action"
-msgstr "action"
+#: view:wizard.product.affect.location:0
+msgid "Cancel"
+msgstr "Annuler"
 
 #. module: wms_inventory
 #: code:addons/wms_inventory/object/inventory.py:0
@@ -228,24 +309,3 @@
 msgid "production lot %s"
 msgstr "lot de production %s"
 
-#. module: wms_inventory
-#: field:stock.inventory.line,prodlot_id:0
-msgid "Production Lot"
-msgstr "Lot de production"
-
-#, python-format
-#~ msgid "quantity in stock %.2f"
-#~ msgstr "quantité en stock %.2f"
-
-#, python-format
-#~ msgid "        %s"
-#~ msgstr "        %s"
-
-#, python-format
-#~ msgid "Cost price %s"
-#~ msgstr "PUMP %s"
-
-#, python-format
-#~ msgid "\"\"Inventory %s has been finished\"\""
-#~ msgstr "\"\"l'inventaire %s est terminé\"\""
-

=== modified file 'wms_inventory/i18n/wms_inventory.pot'
--- wms_inventory/i18n/wms_inventory.pot	2011-02-27 18:40:01 +0000
+++ wms_inventory/i18n/wms_inventory.pot	2011-05-07 16:56:36 +0000
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.12\n"
+"Project-Id-Version: OpenERP Server 5.0.15\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-02-27 18:39:06+0000\n"
-"PO-Revision-Date: 2011-02-27 18:39:06+0000\n"
+"POT-Creation-Date: 2011-04-12 14:25:32+0000\n"
+"PO-Revision-Date: 2011-04-12 14:25:32+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@
 "Plural-Forms: \n"
 
 #. module: wms_inventory
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: wms_inventory
 #: code:addons/wms_inventory/object/inventory.py:0
 #, python-format
 msgid "nothing to regulate"
@@ -24,6 +29,12 @@
 #. module: wms_inventory
 #: code:addons/wms_inventory/object/inventory.py:0
 #, python-format
+msgid "product %s"
+msgstr ""
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
 msgid "global"
 msgstr ""
 
@@ -54,36 +65,59 @@
 msgstr ""
 
 #. module: wms_inventory
+#: code:addons/wms_inventory/wizard/product_affect_location.py:0
+#, python-format
+msgid "Location"
+msgstr ""
+
+#. module: wms_inventory
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: wms_inventory
 #: field:stock.inventory,warehouse_id:0
 msgid "Warehouse"
 msgstr ""
 
 #. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "        [%s]"
+msgstr ""
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/wizard/product_affect_location.py:0
+#, python-format
+msgid "Set procure method to stock for products"
+msgstr ""
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid " -> Partial Inventory"
+msgstr ""
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/wizard/product_affect_location.py:0
+#, python-format
+msgid "end"
+msgstr ""
+
+#. module: wms_inventory
 #: field:stock.inventory,type:0
 msgid "Type"
 msgstr ""
 
 #. module: wms_inventory
-#: code:addons/wms_inventory/object/inventory.py:0
-#, python-format
-msgid " -> Partial Inventory"
-msgstr ""
-
-#. module: wms_inventory
-#: code:addons/wms_inventory/object/inventory.py:0
-#, python-format
-msgid "        [%s]"
-msgstr ""
-
-#. module: wms_inventory
 #: help:stock.inventory,warehouse_id:0
 msgid "Select the warehouse where the inventory is made"
 msgstr ""
 
 #. module: wms_inventory
-#: code:addons/wms_inventory/object/inventory.py:0
+#: code:addons/wms_inventory/wizard/product_affect_location.py:0
 #, python-format
-msgid "init"
+msgid "End inventory %d : %s"
 msgstr ""
 
 #. module: wms_inventory
@@ -94,20 +128,32 @@
 
 #. module: wms_inventory
 #: code:addons/wms_inventory/object/inventory.py:0
+#: code:addons/wms_inventory/wizard/product_affect_location.py:0
+#, python-format
+msgid "action"
+msgstr ""
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
 #, python-format
 msgid "Inventory number %s"
 msgstr ""
 
 #. module: wms_inventory
+#: view:wizard.product.affect.location:0
+msgid "Affect"
+msgstr ""
+
+#. module: wms_inventory
 #: code:addons/wms_inventory/object/inventory.py:0
 #, python-format
 msgid "analyze"
 msgstr ""
 
 #. module: wms_inventory
-#: code:addons/wms_inventory/object/inventory.py:0
+#: code:addons/wms_inventory/wizard/product_affect_location.py:0
 #, python-format
-msgid "product %s"
+msgid "Set orderpoint active for products"
 msgstr ""
 
 #. module: wms_inventory
@@ -135,13 +181,29 @@
 #. module: wms_inventory
 #: code:addons/wms_inventory/object/inventory.py:0
 #, python-format
+msgid "error"
+msgstr ""
+
+#. module: wms_inventory
+#: model:ir.actions.act_window,name:wms_inventory.act_open_wizard_product_affect_location_view
+msgid "Affect product location"
+msgstr ""
+
+#. module: wms_inventory
+#: field:stock.inventory.line,prodlot_id:0
+msgid "Production Lot"
+msgstr ""
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
 msgid "Start to analyse each line"
 msgstr ""
 
 #. module: wms_inventory
-#: code:addons/wms_inventory/object/inventory.py:0
+#: code:addons/wms_inventory/wizard/product_affect_location.py:0
 #, python-format
-msgid "Validate each inventory line"
+msgid "Start inventory %d : %s"
 msgstr ""
 
 #. module: wms_inventory
@@ -180,6 +242,13 @@
 msgstr ""
 
 #. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#: code:addons/wms_inventory/wizard/product_affect_location.py:0
+#, python-format
+msgid "init"
+msgstr ""
+
+#. module: wms_inventory
 #: selection:stock.inventory,type:0
 msgid "Partial"
 msgstr ""
@@ -187,6 +256,12 @@
 #. module: wms_inventory
 #: code:addons/wms_inventory/object/inventory.py:0
 #, python-format
+msgid "Validate each inventory line"
+msgstr ""
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
 msgid "tracking %s"
 msgstr ""
 
@@ -202,20 +277,23 @@
 msgstr ""
 
 #. module: wms_inventory
+#: model:ir.model,name:wms_inventory.model_wizard_product_affect_location
+msgid "Affects location to products from inventory"
+msgstr ""
+
+#. module: wms_inventory
 #: model:ir.module.module,shortdesc:wms_inventory.module_meta_information
 msgid "Wms Inventory"
 msgstr ""
 
 #. module: wms_inventory
-#: code:addons/wms_inventory/object/inventory.py:0
-#, python-format
-msgid "error"
+#: view:wizard.product.affect.location:0
+msgid "Affect product locations ?"
 msgstr ""
 
 #. module: wms_inventory
-#: code:addons/wms_inventory/object/inventory.py:0
-#, python-format
-msgid "action"
+#: view:wizard.product.affect.location:0
+msgid "Cancel"
 msgstr ""
 
 #. module: wms_inventory
@@ -224,8 +302,3 @@
 msgid "production lot %s"
 msgstr ""
 
-#. module: wms_inventory
-#: field:stock.inventory.line,prodlot_id:0
-msgid "Production Lot"
-msgstr ""
-

=== modified file 'wms_inventory/object/inventory.py'
=== modified file 'wms_inventory/security/ir.model.access.csv'
--- wms_inventory/security/ir.model.access.csv	2010-06-29 04:55:17 +0000
+++ wms_inventory/security/ir.model.access.csv	2011-05-07 16:56:36 +0000
@@ -1,1 +1,2 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_wizard_product_affect_location","wizard_product_affect_location","wms_inventory.model_wizard_product_affect_location","base.group_user",1,1,1,1

=== modified file 'wms_inventory/wizard/__init__.py'
--- wms_inventory/wizard/__init__.py	2010-06-29 04:55:17 +0000
+++ wms_inventory/wizard/__init__.py	2011-05-07 16:56:36 +0000
@@ -22,6 +22,7 @@
 #
 ##############################################################################
 
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+import product_affect_location
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'wms_inventory/wizard/product_affect_location.py'
--- wms_inventory/wizard/product_affect_location.py	1970-01-01 00:00:00 +0000
+++ wms_inventory/wizard/product_affect_location.py	2011-05-07 16:56:36 +0000
@@ -0,0 +1,130 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    wms_inventory module for OpenERP, Module to extended inventory process
+#    Copyright (C) 2011 SYLEAM Info Services (<http://www.Syleam.fr/>)
+#              Sylvain Garancher <[e-mail]>
+#
+#    This file is a part of wms_inventory
+#
+#    wms_inventory is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    wms_inventory 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+import netsvc
+import thread
+import time
+import tempfile
+import pooler
+import base64
+from tools.translate import _
+
+
+class wizard_product_affect_location(osv.osv_memory):
+    _name = 'wizard.product.affect.location'
+    _description = 'Affects location to products from inventory'
+
+    def affect_product_locations(self, cr, uid, ids, context=None):
+        stock_inv_obj = self.pool.get('stock.inventory')
+        inv_line_obj = self.pool.get('stock.inventory.line')
+        warehouse_obj = self.pool.get('stock.warehouse')
+        product_obj = self.pool.get('product.product')
+        location_obj = self.pool.get('product.location')
+        orderpoint_obj = self.pool.get('stock.warehouse.orderpoint')
+
+        # Init log
+        logger = netsvc.Logger()
+
+        def threading_done(cr, uid, ids, data, context=None):
+            """
+            Treatment launch as a new thread
+            Must be include production lot and tracking
+            """
+            def log_message(fic, section, message):
+                """
+                Format the content of the logfile
+                """
+                fic.write('[%s] %s: %s\n' % (time.strftime('%Y-%m-%d %H:%M:%S'), section.encode('utf-8'), message.encode('utf-8')))
+
+            # Open log file
+            outfp = tempfile.NamedTemporaryFile(prefix='openerp', suffix='inventory')
+
+            # Open new cursor
+            cr = pooler.get_db(cr.dbname).cursor()
+            start_logline = _('Start inventory %d : %s') % (data['id'], data['name'])
+            logger.notifyChannel('wms_inventory', netsvc.LOG_INFO, '%s [%s]' % (start_logline, outfp.name))
+            log_message(outfp, _('init'), start_logline)
+
+            warehouse_id = data['warehouse_id'][0]
+            from_location = warehouse_obj.read(cr, uid, warehouse_id, ['lot_input_id'], context=context)['lot_input_id'][0]
+
+            product_ids = []
+            line_ids = data['inventory_line_id']
+            for line in inv_line_obj.browse(cr, uid, line_ids, context=context):
+                product_ids.append(line.product_id.id)
+                product_location = location_obj.search(cr, uid, [('product_id', '=', line.product_id.id), ('location_from_id', '=', from_location)], context=context)
+                action = 'Add'
+                # If line already exits, we update
+                if product_location:
+                    action = 'Update'
+                    location_obj.write(cr, uid, product_location[0], {'location_dest_id': line.location_id.id}, context=context)
+                # Else, we add a new line
+                else:
+                    product_obj.write(cr, uid, [line.product_id.id], {'location_ids': [(0, 0, {
+                        'name': _('Location'),
+                        'location_from_id': from_location,
+                        'location_dest_id': line.location_id.id,
+                        'delay': 0,
+                        'auto': 'transparent',
+                    })]}, context=context)
+                log_message(outfp, _('action'), _(action + ' location for product [%s] %s : %s') % (line.product_id.default_code, line.product_id.name, line.location_id.complete_name))
+
+            orderpoint_ids = orderpoint_obj.search(cr, uid, [('product_id', 'in', product_ids), ('active', '=', False)], context=context)
+            orderpoint_obj.write(cr, uid, orderpoint_ids, {'active': True}, context=context)
+            log_message(outfp, _('action'), _('Set orderpoint active for products'))
+
+            product_obj.write(cr, uid, product_ids, {'procure_method': 'make_to_stock'}, context=context)
+            log_message(outfp, _('action'), _('Set procure method to stock for products'))
+
+            end_logline = _('End inventory %d : %s') % (data['id'], data['name'])
+            logger.notifyChannel('wms_inventory', netsvc.LOG_INFO, end_logline)
+            log_message(outfp, _('end'), end_logline)
+            # Close log file
+            outfp.flush()
+            outfp.seek(0)
+            vals = {
+                'datas': base64.encodestring(outfp.read()),
+                'datas_fname': 'inv_%s' % data['name'],
+                'name': 'INV %s' % data['name'],
+                'res_model': 'stock.inventory',
+                'res_id': data['id'],
+            }
+            outfp.close()
+            self.pool.get('ir.attachment').create(cr, uid, vals, context=context)
+            # Close cursor
+            cr.commit()
+            cr.close()
+            return True
+
+        logger.notifyChannel('wms_inventory', netsvc.LOG_INFO, 'Start affect products location from inventory')
+        data = stock_inv_obj.read(cr, uid, context.get('active_id'), ['name', 'inventory_line_id', 'warehouse_id'], context=context)
+        thread.start_new_thread(threading_done, (cr, uid, ids, data, context))
+
+        return {'type': 'ir_actions.act_window_close'}
+
+wizard_product_affect_location()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'wms_inventory/wizard/product_affect_location.xml'
--- wms_inventory/wizard/product_affect_location.xml	1970-01-01 00:00:00 +0000
+++ wms_inventory/wizard/product_affect_location.xml	2011-05-07 16:56:36 +0000
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        ##############################################################################
+        #
+        #    wms_inventory module for OpenERP, Module to extended inventory process
+        #    Copyright (C) 2011 SYLEAM Info Services ([http://www.Syleam.fr/]) 
+        #              Sylvain Garancher [[e-mail]]
+        #
+        #    This file is a part of wms_inventory
+        #
+        #    wms_inventory is free software: you can redistribute it and/or modify
+        #    it under the terms of the GNU General Public License as published by
+        #    the Free Software Foundation, either version 3 of the License, or
+        #    (at your option) any later version.
+        #
+        #    wms_inventory 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 General Public License for more details.
+        #
+        #    You should have received a copy of the GNU General Public License
+        #    along with this program.  If not, see [http://www.gnu.org/licenses/].
+        #
+        ##############################################################################
+
+        <record id="view_wizard_product_affect_location_form" model="ir.ui.view">
+            <field name="name">wizard.product.affect.location.form</field>
+            <field name="model">wizard.product.affect.location</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Affect product locations ?">
+                    <group colspan="4">
+                        <label string="Affect product locations ?" colspan="4"/>
+                    </group>
+                    <group colspan="4">
+                        <button string="Cancel" special="cancel" icon="gtk-cancel"/>
+                        <button string="Affect" type="object" name="affect_product_locations" icon="gtk-ok"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="act_open_wizard_product_affect_location_view">
+            <field name="name">Affect product location</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">wizard.product.affect.location</field>
+            <field name="src_model">stock.inventory</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="usage">menu</field>
+            <field name="domain">[]</field>
+            <field name="context">{}</field>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="act_open_wizard_product_affect_location_view_form">
+            <field name="act_window_id" ref="act_open_wizard_product_affect_location_view"/>
+            <field name="sequence" eval="20"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_wizard_product_affect_location_form"/>
+        </record>
+
+        <record id="value_act_open_wizard_product_affect_location" model="ir.values">
+            <field name="name">Affect product location</field>
+            <field name="key2">client_action_multi</field>
+            <field name="model">stock.inventory</field>
+            <field name="object">True</field>
+            <field name="value" eval="'ir.actions.act_window,'+str(act_open_wizard_product_affect_location_view)"/>
+        </record>
+
+    </data>
+</openerp>

=== modified file 'wms_location/i18n/fr_FR.po'
--- wms_location/i18n/fr_FR.po	2011-01-24 21:44:11 +0000
+++ wms_location/i18n/fr_FR.po	2011-05-07 16:56:36 +0000
@@ -35,7 +35,7 @@
 #. module: wms_location
 #: selection:product.location,auto:0
 msgid "Automatic No Step Added"
-msgstr "Mouvement automatique, sans pas ajouter"
+msgstr "Mouvement automatique, sans pas ajouté"
 
 #. module: wms_location
 #: field:stock.location,transcend_height:0
@@ -79,7 +79,7 @@
 "The 'Automatic Move' value will create a stock move after the current one that will be validated automatically. With 'Manual Operation', the stock move has to be validated by a worker. With 'Automatic No Step Added', the location is replaced in the original move."
 msgstr ""
 "Ceci est utilisé pour définir le chemin que le produit doit suivre dans l'arborescence des emplacements.\n"
-"le 'Mouvement automatique' créer un mouvement de stock de la position courante qui sera valider automatiquement. Avec 'Opération manuelle' sera valider par le logisticien. Avec 'Mouvement automatique, sans pas ajouter' l'emplacement sera remplacer dans le mouvement original."
+"le 'Mouvement automatique' créer un mouvement de stock de la position courante qui sera valider automatiquement. Avec 'Opération manuelle' sera valider par le logisticien. Avec 'Mouvement automatique, sans pas ajouté' l'emplacement sera remplacer dans le mouvement original."
 
 #. module: wms_location
 #: view:stock.location:0

=== modified file 'wms_location/object/location.py'
--- wms_location/object/location.py	2011-03-25 11:26:38 +0000
+++ wms_location/object/location.py	2011-05-07 16:56:36 +0000
@@ -109,7 +109,7 @@
         res = 0.0
         for m in move:
             res += m['product_qty']
-        
+
         # We compute all quantity out in this location
         args = [
             ('location_id', '=', location_id),
@@ -137,6 +137,8 @@
         result = []
         amount = 0.0
         loc_ids = self.search(cr, uid, [('location_id', 'child_of', ids)])
+        if not loc_ids:
+            loc_ids = ids
 
         arg_query1 = [tuple(loc_ids)]
         sql_query1 = """SELECT coalesce(sum(m11.product_qty), 0)

=== modified file 'wms_sale/object/move.py'
--- wms_sale/object/move.py	2011-03-09 11:36:46 +0000
+++ wms_sale/object/move.py	2011-05-07 16:56:36 +0000
@@ -273,6 +273,14 @@
                       ##                qty > stock_qty => pump wrong the good pump is the price_unit
                     pump = price_unit
                 log_message(outfp, 'wms_sale.stock_move.compute_pump', 'Compute the new P.U.M.P. = %s' % repr(pump))
+                # add price unit like purchase price in out and delivery
+                if move.move_dest_id and move.move_dest_id.sale_line_id.type == 'make_to_order':
+                    move_to_add_pourchase_price_ids = [move.move_dest_id.id]
+                    if move.move_dest_id.move_dest_id:
+                        move_to_add_pourchase_price_ids.append(move.move_dest_id.move_dest_id.id)
+                    self.write(cr, uid, move_to_add_pourchase_price_ids, {'purchase_price': price_unit}, context=context)
+
+
             if move.picking_id and move.picking_id.type in picking_type:
                 # write the pump in average_price
                 average_uom_id = move.product_id.list_price_uom_id and move.product_id.list_price_uom_id.id or move.product_uom.id

=== modified file 'wms_sale/wizard/compute_pump.py'
--- wms_sale/wizard/compute_pump.py	2010-11-23 09:05:48 +0000
+++ wms_sale/wizard/compute_pump.py	2011-05-07 16:56:36 +0000
@@ -70,7 +70,7 @@
                                 {
                                     'type': 'float',
                                     'string': move.product_id.name,
-                                    'digit': (16, int(config['price_accuracy'])),
+                                    'digits': (16, int(config['price_accuracy'])),
                                 },
                            })