Merge lp:~syleam/wms/5.0-christophe-chauvet into lp:wms

[Christophe CHAUVET]

bugfix merge for 2 bugs

Fix 2 bugs and new features for inventory

[Christophe CHAUVET (christophe-chauvet)]

The regression test pass successfull

review: Approve

[lp:~syleam/wms/5.0-christophe-chauvet]

212. By Christophe CHAUVET on 2011-02-28

merge

=== modified file 'wms/i18n/fr_FR.po'
--- wms/i18n/fr_FR.po	2011-02-24 20:58:12 +0000
+++ wms/i18n/fr_FR.po	2011-02-28 08:44:57 +0000
@@ -5,8 +5,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.12\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-02-24 20:33:56+0000\n"
-"PO-Revision-Date: 2011-02-24 21:57+0100\n"
+"POT-Creation-Date: 2011-02-27 21:41:21+0000\n"
+"PO-Revision-Date: 2011-02-27 22:43+0100\n"
 "Last-Translator: Christophe Chauvet <[e-mail]>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,6 +15,12 @@
 "X-Generator: Translate Toolkit 1.3.0\n"
 
 #. module: wms
+#: model:stock.location,name:wms.stock_location_output_thursday
+#: model:stock.round,name:wms.stock_round_thursday
+msgid "Thursday"
+msgstr "Jeudi"
+
+#. module: wms
 #: model:ir.actions.wizard,name:wms.wizard_generate_wave
 msgid "Generate wave"
 msgstr "Générer une vague"
@@ -31,11 +37,6 @@
 msgstr "Reception en rafale"
 
 #. module: wms
-#: view:stock.burst:0
-msgid "Pickings"
-msgstr "Pickings"
-
-#. module: wms
 #: help:product.ul,is_inside:0
 msgid "Check this if the content is include in this volume"
 msgstr "Cocher ceci si le contenu est inclus dans le volume"
@@ -62,6 +63,11 @@
 msgstr "Enregistre le prix facturé, vérifier l'unité de facturation également"
 
 #. module: wms
+#: field:stock.picking,wave_id:0
+msgid "Wave"
+msgstr "Vague"
+
+#. module: wms
 #: field:product.ul,volume:0
 msgid "Volume"
 msgstr "Volume"
@@ -149,6 +155,11 @@
 msgstr "Suivi"
 
 #. module: wms
+#: wizard_button:wms.burst,init,end:0
+msgid "Finnish"
+msgstr "Terminé"
+
+#. module: wms
 #: help:product.ul,product_id:0
 msgid "Product for replenishment"
 msgstr "Produit pour le réapprovisionnement"
@@ -204,12 +215,23 @@
 msgstr "Est ce que le contenu est à l'intérieur ?"
 
 #. module: wms
+#: field:stock.warehouse,parent_id:0
+msgid "Parent warehouse"
+msgstr "Entrepôt parent"
+
+#. module: wms
+#: view:stock.burst:0
+msgid "Pickings in"
+msgstr "Receptions liés"
+
+#. module: wms
 #: field:wms.report.stock.available,qty:0
 msgid "Qty"
 msgstr "Qté"
 
 #. module: wms
 #: wizard_button:picking.generate.wave,init,valid:0
+#: wizard_button:wms.burst,init,valid:0
 msgid "OK"
 msgstr "OK"
 
@@ -271,9 +293,14 @@
 msgstr "Lot de production"
 
 #. module: wms
-#: help:stock.picking,warehouse_id:0
-msgid "Indicate the warehouse for this picking"
-msgstr "Indiquer l'entrepôt pour ce bon"
+#: view:stock.warehouse:0
+msgid "burst"
+msgstr "Rafale"
+
+#. module: wms
+#: help:stock.warehouse,keep_missing_product_in:0
+msgid "If check, missing product line on receipt order stay with quantity = 0"
+msgstr "Si coché, les lignes de produits manquant sur les receptions reste avec une quantité égal à 0 "
 
 #. module: wms
 #: view:stock.picking:0
@@ -281,6 +308,11 @@
 msgstr "Vérifier la disponibilité"
 
 #. module: wms
+#: field:stock.warehouse,check_tracking_burst:0
+msgid "check tracking"
+msgstr "Activer le suivi"
+
+#. module: wms
 #: field:res.partner,is_transporter:0
 msgid "Transporter ?"
 msgstr "Transporteur ?"
@@ -334,16 +366,37 @@
 msgstr "PUMP"
 
 #. module: wms
+#: view:stock.burst:0
+msgid "Pickings out"
+msgstr "Préparatiions liés"
+
+#. module: wms
+#: constraint:stock.warehouse:0
+msgid "You cannot create recursive warehouse !"
+msgstr "Vous ne pouvez pas créer d'entrepôts récursifs !"
+
+#. module: wms
 #: help:product.ul,warehouse_ids:0
 msgid "Select the warehouse where the UL must be seen"
 msgstr "Selectionner le ou les entrepot(s) ou sera visible cette unité"
 
 #. module: wms
+#: model:ir.actions.wizard,name:wms.stock_burst
+msgid "Fast entry"
+msgstr "Saisie rapide"
+
+#. module: wms
 #: help:product.product,qty_physical:0
 msgid "Currenti real quantities of products, include reserved"
 msgstr "Quantité réel courant du produit, incluant le réservé"
 
 #. module: wms
+#: code:addons/wms/wizard/generate_wave.py:0
+#, python-format
+msgid "Select cart"
+msgstr "Sélectionner un chariot"
+
+#. module: wms
 #: view:stock.burst.line:0
 msgid "Line"
 msgstr "Ligne"
@@ -365,6 +418,7 @@
 
 #. module: wms
 #: field:stock.burst.line,remark_id:0
+#: wizard_field:wms.burst,init,remark_id:0
 msgid "Observation"
 msgstr "Observation"
 
@@ -374,12 +428,6 @@
 msgstr "Erreur: L'unité secondaire doit être dans un catégorie différente que l'unité principale"
 
 #. module: wms
-#: code:addons/wms/wizard/generate_wave.py:0
-#, python-format
-msgid "You cannot affect chariot on picking in done or cancel"
-msgstr "Vous ne pouvez pas affecter un chariot sur un bon terminé ou annulé"
-
-#. module: wms
 #: field:product.ul,width:0
 msgid "Width"
 msgstr "Largeur"
@@ -395,12 +443,6 @@
 msgstr "Enreigistre le PUMP dans les mouvements de stock"
 
 #. module: wms
-#: code:addons/wms/wizard/generate_wave.py:0
-#, python-format
-msgid "Only picking out must be affected to a chariot!"
-msgstr "Seule des préparations peuvent être affecter dans un chariot!"
-
-#. module: wms
 #: view:stock.picking:0
 msgid "Force Availability"
 msgstr "Forcer la disponibilité"
@@ -411,11 +453,6 @@
 msgstr "Commentaire"
 
 #. module: wms
-#: wizard_field:picking.generate.wave,init,chariot_id:0
-msgid "Chariot"
-msgstr "Chariot"
-
-#. module: wms
 #: view:stock.burst:0
 msgid "Partial"
 msgstr "Partiel"
@@ -457,12 +494,22 @@
 msgstr "Carton déchiré"
 
 #. module: wms
+#: help:stock.warehouse,parent_id:0
+msgid "Define the parent warehouse"
+msgstr "Définier l'entrepôt parent"
+
+#. module: wms
 #: code:addons/wms/object/burst.py:0
 #, python-format
 msgid "Not in initial receipt"
 msgstr "Absent dans le bon initial"
 
 #. module: wms
+#: help:stock.location,analysis_id:0
+msgid "Select the ABC of product that can be store by default in this location"
+msgstr "Sélectionner la classe ABC du produit qui sera stocké par défaut dans cet emplacement"
+
+#. module: wms
 #: constraint:product.template:0
 msgid "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr "Erreur: l'unité par défaut et l'unité d'achat doivent appartenir à la même catégorie."
@@ -474,9 +521,9 @@
 msgstr "Note"
 
 #. module: wms
-#: model:ir.actions.act_window,name:wms.act_product_product_2_stock_move_in
-msgid "Incoming stock"
-msgstr "Stock entrant"
+#: view:product.product:0
+msgid "Qty Available"
+msgstr "Qté disponible"
 
 #. module: wms
 #: field:res.company,average_price_stock_picking_internal:0
@@ -520,6 +567,11 @@
 msgstr "Ce champ pourra être utilser lors de l'impression"
 
 #. module: wms
+#: wizard_field:picking.generate.wave,init,cart_id:0
+msgid "Cart"
+msgstr "Chariot de préparation"
+
+#. module: wms
 #: view:stock.picking:0
 msgid "Validate"
 msgstr "Valider"
@@ -535,14 +587,19 @@
 msgstr "Actif"
 
 #. module: wms
+#: help:stock.picking,wave_id:0
+msgid "Picking wave affectation for this picking"
+msgstr "Affectation à la vague pour cette préparation"
+
+#. module: wms
 #: model:product.template,name:wms.product_magic_mouse_product_template
 msgid "Magic Mouse"
 msgstr "Magic Mouse"
 
 #. module: wms
-#: model:ir.actions.act_window,name:wms.action_picking_wms_out_board
-msgid "Picking Orders"
-msgstr "Bons de préparations"
+#: help:stock.picking,warehouse_id:0
+msgid "Indicate the warehouse for this picking"
+msgstr "Indiquer l'entrepôt pour ce bon"
 
 #. module: wms
 #: help:res.partner,round_id:0
@@ -572,10 +629,9 @@
 msgstr "DPA"
 
 #. module: wms
-#: model:stock.location,name:wms.stock_location_output_thursday
-#: model:stock.round,name:wms.stock_round_thursday
-msgid "Thursday"
-msgstr "Jeudi"
+#: model:stock.location,name:wms.stock_location_w1_output
+msgid "Output 1"
+msgstr "Sortie 1"
 
 #. module: wms
 #: code:addons/wms/object/burst.py:0
@@ -593,12 +649,18 @@
 msgstr "Nom de la tournée"
 
 #. module: wms
+#: model:ir.model,name:wms.model_stock_move_remark
+msgid "Remark for the stock move"
+msgstr "Observation pour ce mouvement de stock"
+
+#. module: wms
 #: model:ir.model,name:wms.model_stock_burst_line
 msgid "Burst picking line"
 msgstr "Ligne de saisie en rafale"
 
 #. module: wms
 #: field:stock.burst.line,quantity:0
+#: wizard_field:wms.burst,init,quantity:0
 msgid "Quantity"
 msgstr "Quantité"
 
@@ -627,14 +689,17 @@
 msgstr "Code"
 
 #. module: wms
-#: model:ir.model,name:wms.model_stock_move_remark
-msgid "Remark for the stock move"
-msgstr "Observation pour ce mouvement de stock"
+#: field:stock.warehouse,keep_missing_product_in:0
+msgid "Keep product in"
+msgstr "Garder la trace des produits entrants"
 
 #. module: wms
+#: code:addons/wms/wizard/burst.py:0
 #: model:ir.ui.menu,name:wms.menu_stock_burst
 #: view:stock.burst:0
 #: field:stock.burst.line,burst_id:0
+#: wizard_view:wms.burst,init:0
+#, python-format
 msgid "Burst"
 msgstr "Mode rafale"
 
@@ -667,6 +732,12 @@
 msgstr "Annuler"
 
 #. module: wms
+#: code:addons/wms/wizard/generate_wave.py:0
+#, python-format
+msgid "You cannot affect cart on picking in done or cancel"
+msgstr "Vous ne pouvez affecter un chariot sur des préparations terminées ou annulées"
+
+#. module: wms
 #: view:res.company:0
 msgid "Average price calculate on stock picking"
 msgstr "Calcul du PUMP sur les mouvements de stock de type :"
@@ -682,9 +753,9 @@
 msgstr "Rediriger"
 
 #. module: wms
-#: help:stock.location,analysis_id:0
-msgid "Select the ABC of product that can be store by default in this location"
-msgstr "Sélectionner la classe ABC du produit qui sera stocké par défaut dans cet emplacement"
+#: view:stock.warehouse:0
+msgid "Information"
+msgstr "Information"
 
 #. module: wms
 #: field:stock.picking,picking_time:0
@@ -697,6 +768,11 @@
 msgstr "The Object name must start with x_ and not contain any special character !"
 
 #. module: wms
+#: model:ir.actions.act_window,name:wms.action_picking_wms_out_board
+msgid "Picking Orders"
+msgstr "Bons de préparations"
+
+#. module: wms
 #: model:ir.actions.act_window,name:wms.act_open_stock_picking_transfer_view
 #: model:ir.ui.menu,name:wms.menu_stock_picking_transfer
 #: view:stock.picking:0
@@ -723,9 +799,10 @@
 msgstr "Vous devez assigner un lot de production pour ce produit"
 
 #. module: wms
-#: model:stock.location,name:wms.stock_location_w1_output
-msgid "Output 1"
-msgstr "Sortie 1"
+#: code:addons/wms/wizard/generate_wave.py:0
+#, python-format
+msgid "Affect a cart for these picking"
+msgstr "Affecter un chariot à ces bons de préparations"
 
 #. module: wms
 #: model:ir.module.module,description:wms.module_meta_information
@@ -767,6 +844,12 @@
 "\n"
 
 #. module: wms
+#: code:addons/wms/wizard/generate_wave.py:0
+#, python-format
+msgid "Only picking out must be affected to a cart!"
+msgstr "Seul des bons de préparation peuvent être affecter à un chariot!"
+
+#. module: wms
 #: field:res.users,context_warehouse_id:0
 #: field:stock.picking,warehouse_id:0
 #: field:wms.report.stock.available,warehouse_id:0
@@ -798,6 +881,7 @@
 #: field:stock.burst.line,product_id:0
 #: field:stock.picking,product_id:0
 #: field:stock.tracking,product_id:0
+#: wizard_field:wms.burst,init,product_id:0
 #: field:wms.report.stock.available,product_id:0
 msgid "Product"
 msgstr "Produit"
@@ -818,9 +902,9 @@
 msgstr "Fournit le concept de classe ABC"
 
 #. module: wms
-#: field:stock.picking,wave_id:0
-msgid "Wave"
-msgstr "Vague"
+#: help:stock.warehouse,check_tracking_burst:0
+msgid "Check tracking on burst out"
+msgstr "Activer le suivi en préparation rafale"
 
 #. module: wms
 #: field:res.company,average_price_stock_picking_delivery:0
@@ -901,13 +985,9 @@
 msgstr "Dimension/Poids de l'unité logistique seulement"
 
 #. module: wms
-#: code:addons/wms/wizard/generate_wave.py:0
-#, python-format
-msgid ""
-"Not enough location on this chariot.\n"
-"Required %d\n"
-"Available %d"
-msgstr "Pas assez d'emplacement sur ce chariot.\n"
+#: model:ir.actions.act_window,name:wms.act_product_product_2_stock_move_in
+msgid "Incoming stock"
+msgstr "Stock entrant"
 
 #. module: wms
 #: model:ir.model,name:wms.model_stock_burst
@@ -930,11 +1010,6 @@
 msgstr "Utiliser pour faire un traitement différent, lorsque la remarque est sélectionnée!"
 
 #. module: wms
-#: view:product.product:0
-msgid "Qty Available"
-msgstr "Qté disponible"
-
-#. module: wms
 #: field:product.product,analysis_id:0
 #: field:stock.location,analysis_id:0
 msgid "ABC Class"
@@ -977,3 +1052,8 @@
 msgid "You try to assign a lot which is not from the same product"
 msgstr "Vous essayez d'assigner un lot qui n'appartient pas au même produit"
 
+#~ msgid "test"
+#~ msgstr "test"
+#~ msgid "Pickings"
+#~ msgstr "Pickings"
+

=== modified file 'wms/i18n/wms.pot'
--- wms/i18n/wms.pot	2011-02-24 20:58:12 +0000
+++ wms/i18n/wms.pot	2011-02-28 08:44:57 +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-24 20:33:56+0000\n"
-"PO-Revision-Date: 2011-02-24 20:33:56+0000\n"
+"POT-Creation-Date: 2011-02-27 21:41:21+0000\n"
+"PO-Revision-Date: 2011-02-27 21:41:21+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,6 +16,12 @@
 "Plural-Forms: \n"
 
 #. module: wms
+#: model:stock.location,name:wms.stock_location_output_thursday
+#: model:stock.round,name:wms.stock_round_thursday
+msgid "Thursday"
+msgstr ""
+
+#. module: wms
 #: model:ir.actions.wizard,name:wms.wizard_generate_wave
 msgid "Generate wave"
 msgstr ""
@@ -32,11 +38,6 @@
 msgstr ""
 
 #. module: wms
-#: view:stock.burst:0
-msgid "Pickings"
-msgstr ""
-
-#. module: wms
 #: help:product.ul,is_inside:0
 msgid "Check this if the content is include in this volume"
 msgstr ""
@@ -63,6 +64,11 @@
 msgstr ""
 
 #. module: wms
+#: field:stock.picking,wave_id:0
+msgid "Wave"
+msgstr ""
+
+#. module: wms
 #: field:product.ul,volume:0
 msgid "Volume"
 msgstr ""
@@ -150,6 +156,11 @@
 msgstr ""
 
 #. module: wms
+#: wizard_button:wms.burst,init,end:0
+msgid "Finnish"
+msgstr ""
+
+#. module: wms
 #: help:product.ul,product_id:0
 msgid "Product for replenishment"
 msgstr ""
@@ -205,12 +216,23 @@
 msgstr ""
 
 #. module: wms
+#: field:stock.warehouse,parent_id:0
+msgid "Parent warehouse"
+msgstr ""
+
+#. module: wms
+#: view:stock.burst:0
+msgid "Pickings in"
+msgstr ""
+
+#. module: wms
 #: field:wms.report.stock.available,qty:0
 msgid "Qty"
 msgstr ""
 
 #. module: wms
 #: wizard_button:picking.generate.wave,init,valid:0
+#: wizard_button:wms.burst,init,valid:0
 msgid "OK"
 msgstr ""
 
@@ -272,8 +294,13 @@
 msgstr ""
 
 #. module: wms
-#: help:stock.picking,warehouse_id:0
-msgid "Indicate the warehouse for this picking"
+#: view:stock.warehouse:0
+msgid "burst"
+msgstr ""
+
+#. module: wms
+#: help:stock.warehouse,keep_missing_product_in:0
+msgid "If check, missing product line on receipt order stay with quantity = 0"
 msgstr ""
 
 #. module: wms
@@ -282,6 +309,11 @@
 msgstr ""
 
 #. module: wms
+#: field:stock.warehouse,check_tracking_burst:0
+msgid "check tracking"
+msgstr ""
+
+#. module: wms
 #: field:res.partner,is_transporter:0
 msgid "Transporter ?"
 msgstr ""
@@ -335,16 +367,37 @@
 msgstr ""
 
 #. module: wms
+#: view:stock.burst:0
+msgid "Pickings out"
+msgstr ""
+
+#. module: wms
+#: constraint:stock.warehouse:0
+msgid "You cannot create recursive warehouse !"
+msgstr ""
+
+#. module: wms
 #: help:product.ul,warehouse_ids:0
 msgid "Select the warehouse where the UL must be seen"
 msgstr ""
 
 #. module: wms
+#: model:ir.actions.wizard,name:wms.stock_burst
+msgid "Fast entry"
+msgstr ""
+
+#. module: wms
 #: help:product.product,qty_physical:0
 msgid "Currenti real quantities of products, include reserved"
 msgstr ""
 
 #. module: wms
+#: code:addons/wms/wizard/generate_wave.py:0
+#, python-format
+msgid "Select cart"
+msgstr ""
+
+#. module: wms
 #: view:stock.burst.line:0
 msgid "Line"
 msgstr ""
@@ -366,6 +419,7 @@
 
 #. module: wms
 #: field:stock.burst.line,remark_id:0
+#: wizard_field:wms.burst,init,remark_id:0
 msgid "Observation"
 msgstr ""
 
@@ -375,12 +429,6 @@
 msgstr ""
 
 #. module: wms
-#: code:addons/wms/wizard/generate_wave.py:0
-#, python-format
-msgid "You cannot affect chariot on picking in done or cancel"
-msgstr ""
-
-#. module: wms
 #: field:product.ul,width:0
 msgid "Width"
 msgstr ""
@@ -396,12 +444,6 @@
 msgstr ""
 
 #. module: wms
-#: code:addons/wms/wizard/generate_wave.py:0
-#, python-format
-msgid "Only picking out must be affected to a chariot!"
-msgstr ""
-
-#. module: wms
 #: view:stock.picking:0
 msgid "Force Availability"
 msgstr ""
@@ -412,11 +454,6 @@
 msgstr ""
 
 #. module: wms
-#: wizard_field:picking.generate.wave,init,chariot_id:0
-msgid "Chariot"
-msgstr ""
-
-#. module: wms
 #: view:stock.burst:0
 msgid "Partial"
 msgstr ""
@@ -458,12 +495,22 @@
 msgstr ""
 
 #. module: wms
+#: help:stock.warehouse,parent_id:0
+msgid "Define the parent warehouse"
+msgstr ""
+
+#. module: wms
 #: code:addons/wms/object/burst.py:0
 #, python-format
 msgid "Not in initial receipt"
 msgstr ""
 
 #. module: wms
+#: help:stock.location,analysis_id:0
+msgid "Select the ABC of product that can be store by default in this location"
+msgstr ""
+
+#. module: wms
 #: constraint:product.template:0
 msgid "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
@@ -475,8 +522,8 @@
 msgstr ""
 
 #. module: wms
-#: model:ir.actions.act_window,name:wms.act_product_product_2_stock_move_in
-msgid "Incoming stock"
+#: view:product.product:0
+msgid "Qty Available"
 msgstr ""
 
 #. module: wms
@@ -521,6 +568,11 @@
 msgstr ""
 
 #. module: wms
+#: wizard_field:picking.generate.wave,init,cart_id:0
+msgid "Cart"
+msgstr ""
+
+#. module: wms
 #: view:stock.picking:0
 msgid "Validate"
 msgstr ""
@@ -536,13 +588,18 @@
 msgstr ""
 
 #. module: wms
+#: help:stock.picking,wave_id:0
+msgid "Picking wave affectation for this picking"
+msgstr ""
+
+#. module: wms
 #: model:product.template,name:wms.product_magic_mouse_product_template
 msgid "Magic Mouse"
 msgstr ""
 
 #. module: wms
-#: model:ir.actions.act_window,name:wms.action_picking_wms_out_board
-msgid "Picking Orders"
+#: help:stock.picking,warehouse_id:0
+msgid "Indicate the warehouse for this picking"
 msgstr ""
 
 #. module: wms
@@ -573,9 +630,8 @@
 msgstr ""
 
 #. module: wms
-#: model:stock.location,name:wms.stock_location_output_thursday
-#: model:stock.round,name:wms.stock_round_thursday
-msgid "Thursday"
+#: model:stock.location,name:wms.stock_location_w1_output
+msgid "Output 1"
 msgstr ""
 
 #. module: wms
@@ -594,12 +650,18 @@
 msgstr ""
 
 #. module: wms
+#: model:ir.model,name:wms.model_stock_move_remark
+msgid "Remark for the stock move"
+msgstr ""
+
+#. module: wms
 #: model:ir.model,name:wms.model_stock_burst_line
 msgid "Burst picking line"
 msgstr ""
 
 #. module: wms
 #: field:stock.burst.line,quantity:0
+#: wizard_field:wms.burst,init,quantity:0
 msgid "Quantity"
 msgstr ""
 
@@ -628,14 +690,17 @@
 msgstr ""
 
 #. module: wms
-#: model:ir.model,name:wms.model_stock_move_remark
-msgid "Remark for the stock move"
+#: field:stock.warehouse,keep_missing_product_in:0
+msgid "Keep product in"
 msgstr ""
 
 #. module: wms
+#: code:addons/wms/wizard/burst.py:0
 #: model:ir.ui.menu,name:wms.menu_stock_burst
 #: view:stock.burst:0
 #: field:stock.burst.line,burst_id:0
+#: wizard_view:wms.burst,init:0
+#, python-format
 msgid "Burst"
 msgstr ""
 
@@ -668,6 +733,12 @@
 msgstr ""
 
 #. module: wms
+#: code:addons/wms/wizard/generate_wave.py:0
+#, python-format
+msgid "You cannot affect cart on picking in done or cancel"
+msgstr ""
+
+#. module: wms
 #: view:res.company:0
 msgid "Average price calculate on stock picking"
 msgstr ""
@@ -683,8 +754,8 @@
 msgstr ""
 
 #. module: wms
-#: help:stock.location,analysis_id:0
-msgid "Select the ABC of product that can be store by default in this location"
+#: view:stock.warehouse:0
+msgid "Information"
 msgstr ""
 
 #. module: wms
@@ -698,6 +769,11 @@
 msgstr ""
 
 #. module: wms
+#: model:ir.actions.act_window,name:wms.action_picking_wms_out_board
+msgid "Picking Orders"
+msgstr ""
+
+#. module: wms
 #: model:ir.actions.act_window,name:wms.act_open_stock_picking_transfer_view
 #: model:ir.ui.menu,name:wms.menu_stock_picking_transfer
 #: view:stock.picking:0
@@ -724,8 +800,9 @@
 msgstr ""
 
 #. module: wms
-#: model:stock.location,name:wms.stock_location_w1_output
-msgid "Output 1"
+#: code:addons/wms/wizard/generate_wave.py:0
+#, python-format
+msgid "Affect a cart for these picking"
 msgstr ""
 
 #. module: wms
@@ -751,6 +828,12 @@
 msgstr ""
 
 #. module: wms
+#: code:addons/wms/wizard/generate_wave.py:0
+#, python-format
+msgid "Only picking out must be affected to a cart!"
+msgstr ""
+
+#. module: wms
 #: field:res.users,context_warehouse_id:0
 #: field:stock.picking,warehouse_id:0
 #: field:wms.report.stock.available,warehouse_id:0
@@ -782,6 +865,7 @@
 #: field:stock.burst.line,product_id:0
 #: field:stock.picking,product_id:0
 #: field:stock.tracking,product_id:0
+#: wizard_field:wms.burst,init,product_id:0
 #: field:wms.report.stock.available,product_id:0
 msgid "Product"
 msgstr ""
@@ -802,8 +886,8 @@
 msgstr ""
 
 #. module: wms
-#: field:stock.picking,wave_id:0
-msgid "Wave"
+#: help:stock.warehouse,check_tracking_burst:0
+msgid "Check tracking on burst out"
 msgstr ""
 
 #. module: wms
@@ -885,9 +969,8 @@
 msgstr ""
 
 #. module: wms
-#: code:addons/wms/wizard/generate_wave.py:0
-#, python-format
-msgid "Not enough location on this chariot.\nRequired %d\nAvailable %d"
+#: model:ir.actions.act_window,name:wms.act_product_product_2_stock_move_in
+msgid "Incoming stock"
 msgstr ""
 
 #. module: wms
@@ -911,11 +994,6 @@
 msgstr ""
 
 #. module: wms
-#: view:product.product:0
-msgid "Qty Available"
-msgstr ""
-
-#. module: wms
 #: field:product.product,analysis_id:0
 #: field:stock.location,analysis_id:0
 msgid "ABC Class"

=== modified file 'wms/object/burst.py'
--- wms/object/burst.py	2011-02-22 16:02:33 +0000
+++ wms/object/burst.py	2011-02-28 08:44:57 +0000
@@ -57,7 +57,7 @@
 
         return super(stock_burst, self).copy(cr, uid, id, default, context=context)
 
-    def _merge(self, cr, uid, ids, context=None):
+    def _merge(self, cr, uid, id, context=None):
         """
         Merge burst lines
         Returns burst lines in dico : {'product_key': (total_qty, [(qty, line_id, remark_id), (qty, line_id, remark_id), ])}
@@ -67,15 +67,16 @@
 
         # Retrieve burst lines
         burst_line_obj = self.pool.get('stock.burst.line')
-        burst_line_ids = burst_line_obj.search(cr, uid, [('burst_id', '=', ids[0]), ('is_done', '=', False)], context=context)
+        burst_line_ids = burst_line_obj.search(cr, uid, [('burst_id', '=', id), ('is_done', '=', False)], context=context)
         burst_lines = burst_line_obj.browse(cr, uid, burst_line_ids, context=context)
 
         known_lines = {}
         lines_to_delete = []
+        burst_type = self.read(cr, uid, id, ['type'], context=context)['type']
         for line in burst_lines:
-            product_key = "%d_%d_%d" % (line.product_id.id, line.prodlot_id and line.prodlot_id.id or 0, line.tracking_id and line.tracking_id.id or 0)
+            product_key = "%d_%d_%d" % (line.product_id.id, line.prodlot_id and line.prodlot_id.id or 0,
+                                        line.tracking_id and line.tracking_id.id or 0)
             # Remarks are not significant for type 'out'
-            burst_type = self.read(cr, uid, ids, ['type'], context=context)[0]['type']
             rem_id = (burst_type != 'out') and line.remark_id.id or 0
             # Check if product_id is known
             if product_key in known_lines.keys():
@@ -103,8 +104,10 @@
                 lines_list.append((line.quantity, line.id, rem_id))
             # final format :
             known_lines[p] = (total, lines_list)
+
         # Delete lines to delete
-        burst_line_obj.unlink(cr, uid, lines_to_delete, context=context)
+        if lines_to_delete:
+            burst_line_obj.unlink(cr, uid, lines_to_delete, context=context)
 
         return known_lines
 
@@ -117,7 +120,7 @@
 
         # Retrieve merged burst lines
         burst_line_obj = self.pool.get('stock.burst.line')
-        burst_lines = self._merge(cr, uid, ids, context=context)
+        burst_lines = self._merge(cr, uid, ids[0], context=context)
         # No new line : quit
         if not burst_lines:
             return
@@ -128,9 +131,9 @@
         picking_id = self.read(cr, uid, ids, ['stock_picking_id'], context=context)[0]['stock_picking_id'][0]
         backorder_ids = self.pool.get('stock.picking').search(cr, uid, [('backorder_id', '=', picking_id), ('state', 'not in', ('done', 'cancel', 'draft'))], context=context)
         if backorder_ids:
-            picking = self.pool.get('stock.picking').browse(cr, uid, [backorder_ids[0]], context=context)[0]
+            picking = self.pool.get('stock.picking').browse(cr, uid, backorder_ids[0], context=context)
         else:
-            picking = self.pool.get('stock.picking').browse(cr, uid, [picking_id], context=context)[0]
+            picking = self.pool.get('stock.picking').browse(cr, uid, picking_id, context=context)
         picking_moves = picking_obj.move_merge(cr, uid, picking.id, context=context)
 
         # Compare burst lines and move lines
@@ -198,7 +201,9 @@
                 missing.append((move_id, qty))
 
         wf_service = netsvc.LocalService("workflow")
+        del_empty_move = []
         if len(missing) > 0:
+            no_keep = (picking.type == 'in' and not picking.warehouse_id.keep_missing_product_in) or False
             # Generate new picking for missing products
             new_picking = picking_obj.copy(cr, uid, picking_id,
                     {
@@ -211,6 +216,12 @@
             for (move_id, qty) in missing:
                 # Generate move lines in new_picking for missing products
                 move_obj.copy(cr, uid, move_id, {'product_qty': qty, 'picking_id': new_picking, 'remark_id': False})
+                if no_keep:
+                    del_empty_move.append(move_id)
+
+            if del_empty_move:
+                #move_obj.write(cr, uid, del_empty_move, {'state': 'draft'})
+                move_obj.unlink(cr, uid, del_empty_move)
 
             # Sets state to assigned for new picking
             wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
@@ -218,13 +229,20 @@
             if burst_type != 'out':
                 picking_obj.force_assign(cr, uid, [new_picking])
 
+        for val in done_move_lines:
+            if val in del_empty_move:
+                done_move_lines.remove(val)
+
         # Set state to Done for picking
-        move_obj.write(cr, uid, done_move_lines, {'state': 'done'}, context=context)
+        if done_move_lines:
+            move_obj.write(cr, uid, done_move_lines, {'state': 'done'}, context=context)
+
         picking_obj.force_assign(cr, uid, [picking.id])
         wf_service.trg_validate(uid, 'stock.picking', picking.id, 'button_done', cr)
 
         # Set is_done=True for finished burst lines
         burst_line_obj.write(cr, uid, done_burst_lines, {'is_done': True}, context=context)
+
         # Add picking in M2M
         self.write(cr, uid, ids, {'picking_ids': [(4, picking.id)]}, context=context)
 

=== modified file 'wms/object/picking.py'
--- wms/object/picking.py	2011-02-24 13:07:22 +0000
+++ wms/object/picking.py	2011-02-28 08:44:57 +0000
@@ -26,6 +26,15 @@
 from osv import fields
 from tools.translate import _
 
+_picking_state = [
+    ('draft', 'Draft'),
+    ('auto', 'Waiting'),
+    ('confirmed', 'Confirmed'),
+    ('assigned', 'Assigned'),
+    ('done', 'Done'),
+    ('cancel', 'Cancelled'),
+]
+
 
 class StockPicking(osv.osv):
     """
@@ -52,7 +61,8 @@
         'transporter_number': fields.char('Tracking number', size=128),
         'product_id': fields.related('move_lines', 'product_id', type='many2one', relation='product.product', string='Product'),
         'round_id': fields.many2one('stock.round', 'Round', help='Use for manage deliveries'),
-        'wave_id': fields.many2one('stock.location', 'Wave'),
+        'wave_id': fields.many2one('stock.location', 'Wave', help='Picking wave affectation for this picking'),
+        'state': fields.selection(_picking_state, 'Status', readonly=True),
     }
 
     _defaults = {
@@ -61,6 +71,7 @@
         'transporter_id': lambda *a: False,
         'transporter_number': lambda *a: False,
         'round_id': lambda *a: False,
+        'state': lambda *a: 'draft',
     }
 
     def default_get(self, cr, uid, fields_list, context=None):
@@ -126,7 +137,7 @@
 
     def product_crossdock_location(self, cr, uid, product_id, warehouse_id, context=None):
         """
-        Search id 
+        Search id
         """
         if context is None:
             context = {}
@@ -187,7 +198,7 @@
                                         ['crossdock_location_id'], context=context)['crossdock_location_id']
             if not default_crossdock:
                 raise osv.except_osv(_('Error'), _('No default crossdock location defined on the warehouse!'))
-            crossdock_id = isinstance(default_crossdock, list) and default_crossdock[0] or default_crossdock
+            crossdock_id = isinstance(default_crossdock, tuple) and default_crossdock[0] or default_crossdock
 
         ###
         ## If we have an outgoing quantity, and location type is crossdock, we split in two line
@@ -201,7 +212,7 @@
             args = [
                 ('picking_id', 'in', picking_ids),
                 ('product_id', '=', move.product_id.id),
-                ('state', 'in', ['confirmed', 'waiting']),
+                ('state', 'in', ['assigned', 'confirmed', 'waiting']),
             ]
             reserve_ids = move_obj.search(cr, uid, args,
                                 limit=abs(move.product_qty), order='date_planned', context=context)
@@ -212,11 +223,12 @@
                 total_crossdock += r.product_qty
 
             # Check if we must split the line in two if there is enougth quantity available
-            if move.product_qty > total_crossdock:
+            if total_crossdock and move.product_qty > total_crossdock:
                 args = {
                     'product_qty': (move.product_qty - total_crossdock),
                     'state': 'done',
                     'crossdock_ok': True,
+                    'move_dest_id': False,
                 }
                 new_id = move_obj.copy(cr, uid, move.id, args, context=context)
                 args = {
@@ -226,7 +238,7 @@
                     'crossdock_ok': True,
                 }
                 move_obj.write(cr, uid, [move.id], args, context=context)
-            else:
+            elif total_crossdock:
                 # We don't have enougth quantity, how many moves can be assigned with quantity
                 args = {
                     'location_dest_id': crossdock_id,
@@ -244,11 +256,12 @@
                     else:
                         break
 
-            args = {
-                'location_id': crossdock_id,
-                'state': 'assigned',
-            }
-            move_obj.write(cr, uid, reserve_ids, args, context=context)
+            if total_crossdock:
+                args = {
+                    'location_id': crossdock_id,
+                    'state': 'assigned',
+                }
+                move_obj.write(cr, uid, reserve_ids, args, context=context)
 
         return new_id or move.id
 
@@ -308,15 +321,15 @@
             # For each picking out in confirm, check all lines and verify if it available
             # If yes, execute the workflow.
             args = [
-                ('type','=','out'),
-                ('state','=','confirmed'),
+                ('type', '=', 'out'),
+                ('state', '=', 'confirmed'),
             ]
             p_ids = self.search(cr, uid, args)
             pick_list = []
             for p in self.browse(cr, uid, p_ids):
                 l_ok = True
                 for l in p.move_lines:
-                    if l.state not in ('assigned','cancel'):
+                    if l.state not in ('assigned', 'cancel'):
                         l_ok = False
 
                 if l_ok:
@@ -340,7 +353,8 @@
         known_moves = {}
         moves_to_delete = []
         for move in move_obj.browse(cr, uid, move_ids, context=context):
-            product_key = "%d_%d_%d" % (move.product_id.id, move.prodlot_id and move.prodlot_id.id or 0, move.tracking_id and move.tracking_id.id or 0)
+            product_key = "%d_%d_%d" % (move.product_id.id, move.prodlot_id and move.prodlot_id.id or 0,
+                                        move.tracking_id and move.tracking_id.id or 0)
             # Check if product_id is known
             if product_key in known_moves.keys():
                 # Add quantities
@@ -355,7 +369,10 @@
             known_moves[p] = (move.product_qty, move.id, )
 
         # Delete moves to delete
-        move_obj.unlink(cr, uid, moves_to_delete, context=context)
+        if moves_to_delete:
+            ctx = context.copy()
+            ctx['call_unlink'] = True
+            move_obj.unlink(cr, uid, moves_to_delete, context=ctx)
 
         return known_moves
 

=== modified file 'wms/object/tracking.py'
--- wms/object/tracking.py	2010-07-01 08:22:53 +0000
+++ wms/object/tracking.py	2011-02-28 08:44:57 +0000
@@ -29,7 +29,7 @@
     _inherit = 'stock.tracking'
     
     _columns = {
-        'product_id': fields.many2one('product.product', 'Product', required=True),
+        'product_id': fields.many2one('product.product', 'Product'),
     }
 
     _defaults = {

=== modified file 'wms/object/warehouse.py'
--- wms/object/warehouse.py	2011-01-31 18:09:20 +0000
+++ wms/object/warehouse.py	2011-02-28 08:44:57 +0000
@@ -36,9 +36,35 @@
         'lot_stock_id': fields.many2one('stock.location', 'Location Stock', required=False, domain=[('usage', '<>', 'view')]),
         'lot_output_id': fields.many2one('stock.location', 'Location Output', required=False, domain=[('usage', '<>', 'view')]),
         'code': fields.char('Code', size=16, help='Enter the warehouse code'),
+        'parent_id': fields.many2one('stock.warehouse', 'Parent warehouse', help='Define the parent warehouse'),
         'crossdock_location_id': fields.many2one('stock.location', 'Crossdock location',
             help='Choose the crossdock location on this warehouse'),
-    }
+        'check_tracking_burst': fields.boolean('check tracking', help='Check tracking on burst out'),
+        'keep_missing_product_in': fields.boolean('Keep product in', help='If check, missing product line on receipt order stay with quantity = 0'),
+    }
+
+    _defaults = {
+        'check_tracking_burst': lambda *a: False,
+        'keep_missing_product_in': lambda *a: True,
+    }
+
+    def _check_recursion(self, cr, uid, ids):
+        """
+        Check if the selected parent warehouse create a recursive loop
+        """
+        level = 100
+        while len(ids):
+            cr.execute('select distinct parent_id from stock_warehouse where id in %s', (tuple(ids),))
+            ids = filter(None, map(lambda x:x[0], cr.fetchall()))
+            if not level:
+                return False
+            level -= 1
+        return True
+
+    _constraints = [
+        (_check_recursion, 'You cannot create recursive warehouse !', ['parent_id']),
+    ]
+
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False):
@@ -51,7 +77,7 @@
         ids = super(Warehouse, self).search(cr, uid, args, offset=offset, limit=limit,
                             order=order, context=context, count=count)
         for w in self.browse(cr, uid, ids, context=context):
-            if not w.lot_stock_id or not w.lot_input_id or not w.lot_output_id:
+            if not context.get('new_warehouse', False) and (not w.lot_stock_id or not w.lot_input_id or not w.lot_output_id):
                 raise osv.except_osv(_('Error'), _('Warehouse "%s" not correctly configure !') % w.name)
 
         return ids

=== modified file 'wms/view/burst.xml'
--- wms/view/burst.xml	2011-02-22 16:02:33 +0000
+++ wms/view/burst.xml	2011-02-28 08:44:57 +0000
@@ -95,7 +95,7 @@
                             <field name="line_ids" string="Lines" colspan="4" nolabel="1"
                                 attrs="{'readonly': [('state','=', 'done')]}"/>
                         </page>
-                        <page string="Pickings">
+                        <page string="Pickings in">
                             <field name="picking_ids" nolabel="1" attrs="{'readonly': [('state','=', 'done')]}"/>
                         </page>
                     </notebook>
@@ -126,7 +126,7 @@
                             <field name="line_ids" string="Lines" colspan="4" nolabel="1"
                                 attrs="{'readonly': [('state','=', 'done')]}"/>
                         </page>
-                        <page string="Pickings">
+                        <page string="Pickings out">
                             <field name="picking_ids" nolabel="1" attrs="{'readonly': [('state','=', 'done')]}"/>
                         </page>
                     </notebook>

=== modified file 'wms/view/location.xml'
--- wms/view/location.xml	2010-06-22 05:47:58 +0000
+++ wms/view/location.xml	2011-02-28 08:44:57 +0000
@@ -39,5 +39,13 @@
             </field>
         </record>
 
+        <!-- ************************************************************** -->
+        <!-- ** Add value to the context, to bypass the protection id ***** -->
+        <!-- ** the warehouse is not well configure *********************** -->
+        <!-- ************************************************************** -->
+        <record id="stock.action_location_form" model="ir.actions.act_window">
+            <field name="context">{'new_warehouse': True}</field>
+        </record>
+
     </data>
 </openerp>

=== modified file 'wms/view/warehouse.xml'
--- wms/view/warehouse.xml	2011-01-20 22:50:19 +0000
+++ wms/view/warehouse.xml	2011-02-28 08:44:57 +0000
@@ -44,10 +44,21 @@
                     </xpath>
                     <xpath expr="/form/field[@name='name']" position="after">
                         <field name="code"/>
+                        <field name="parent_id"/>
                         <field name="company_id"/>
+                        <newline/>
                     </xpath>
                     <xpath expr="/form/field[@name='lot_output_id']" position="after">
-                        <field name="crossdock_location_id" domain="[('usage','=', 'crossdock')]"/>
+                        <field name="crossdock_location_id" domain="[('warehouse_id','=', active_id),('usage','=', 'crossdock')]"/>
+                    </xpath>
+                    <xpath expr="/form/field[@name='partner_address_id']" position="after">
+                        <notebook colspan="4">
+                            <page string="Information">
+                                <separator string="burst" colspan="4"/>
+                                <field name="check_tracking_burst"/>
+                                <field name="keep_missing_product_in" invisible="1"/>
+                            </page>
+                        </notebook>
                     </xpath>
                 </data>
 
@@ -62,12 +73,25 @@
             <field name="inherit_id" ref="stock.view_warehouse_tree"/>
             <field name="arch" type="xml">
 
-                <xpath expr="/tree/field[@name='name']" position="before">
-                    <field name="code"/>
-                </xpath>
+                <data>
+                    <xpath expr="/tree/field[@name='name']" position="before">
+                        <field name="code"/>
+                    </xpath>
+                    <xpath expr="/tree/field[@name='name']" position="after">
+                        <field name="parent_id"/>
+                    </xpath>
+                </data>
 
             </field>
         </record>
 
+        <!-- ************************************************************** -->
+        <!-- ** Add value to the context, to bypass the protection id ***** -->
+        <!-- ** the warehouse is not well configure *********************** -->
+        <!-- ************************************************************** -->
+        <record id="stock.action_warehouse_form" model="ir.actions.act_window">
+            <field name="context">{'new_warehouse': True}</field>
+        </record>
+
     </data>
 </openerp>

=== modified file 'wms/wizard/burst.py'
--- wms/wizard/burst.py	2011-02-03 15:35:26 +0000
+++ wms/wizard/burst.py	2011-02-28 08:44:57 +0000
@@ -28,12 +28,12 @@
 from tools.translate import _
 
 init_form = """<?xml version="1.0" ?>
-<form string="Burst">
+<form string="%s">
     <field name="product_id" colspan="4"/>
     <field name="quantity"/>
     <field name="remark_id"/>
 </form>
-"""
+""" % (_('Burst'))
 
 init_fields = {
     'product_id': {'string': 'Product', 'type': 'many2one', 'relation': 'product.product', 'required': True, },
@@ -98,7 +98,7 @@
                 'type': 'form',
                 'arch': init_form,
                 'fields': init_fields,
-                'state': [('end','Cancel','gtk-cancel'), ('valid', 'OK', 'gtk-ok', True)],
+                'state': [('end','Finnish','gtk-cancel'), ('valid', 'OK', 'gtk-ok', True)],
             }
         },
         'valid': {

=== modified file 'wms/wizard/generate_wave.py'
--- wms/wizard/generate_wave.py	2011-02-24 22:02:45 +0000
+++ wms/wizard/generate_wave.py	2011-02-28 08:44:57 +0000
@@ -31,11 +31,11 @@
 _moves_arch = UpdateableStr()
 
 init_form = """<?xml version="1.0" ?>
-<form string="Select cart">
-  <separator string="Affect a cart for these picking" colspan="4"/>
+<form string="%s">
+  <separator string="%s" colspan="4"/>
   <field name="cart_id" colspan="4" domain="[('categ_id','=', %d)]"/>
 </form>
-"""
+""" 
 
 init_fields = {
     'cart_id': {'string': 'Cart', 'type': 'many2one', 'required': True, 'relation': 'stock.location'},
@@ -60,7 +60,7 @@
         ir_id = ir_mod_obj._get_id(cr, uid, 'wms_location', 'location_category_chariot')
         id = ir_mod_obj.read(cr, uid, ir_id, ['res_id'])['res_id']
 
-        _moves_arch.string = init_form % id
+        _moves_arch.string = init_form % (_('Select cart'), _('Affect a cart for these picking'), id)
 
         for i in pool.get('stock.picking').browse(cr, uid, data['ids'], context=context):
             if i.type != 'out':

=== modified file 'wms/wizard/wizard.xml'
--- wms/wizard/wizard.xml	2011-02-24 13:07:22 +0000
+++ wms/wizard/wizard.xml	2011-02-28 08:44:57 +0000
@@ -31,11 +31,11 @@
             name="wms.partial_picking"
             string="Partial packing"/>
 
-        <wizard
-            id="stock.burst"
+        <wizard id="stock_burst"
+            string="Fast entry"
             model="stock.burst"
-            name="wms.burst"
-            string="Burst"/>
+            multi="False"
+            name="wms.burst"/>
 
         <wizard id="wizard_generate_wave"
             string="Generate wave"

=== modified file 'wms_inventory/__terp__.py'
--- wms_inventory/__terp__.py	2010-06-29 05:35:00 +0000
+++ wms_inventory/__terp__.py	2011-02-28 08:44:57 +0000
@@ -42,6 +42,7 @@
         #'security/groups.xml',
         #'security/ir.model.access.csv',
         #'view/menu.xml',
+        'view/warehouse.xml',
         'view/inventory.xml',
         #'wizard/wizard.xml',
         #'report/report.xml',

=== modified file 'wms_inventory/i18n/fr_FR.po'
--- wms_inventory/i18n/fr_FR.po	2010-06-29 09:41:10 +0000
+++ wms_inventory/i18n/fr_FR.po	2011-02-28 08:44:57 +0000
@@ -5,8 +5,8 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-06-29 09:40:16+0000\n"
-"PO-Revision-Date: 2010-06-29 11:40+0100\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"
 "MIME-Version: 1.0\n"
@@ -15,9 +15,67 @@
 "X-Generator: Translate Toolkit 1.3.0\n"
 
 #. module: wms_inventory
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "nothing to regulate"
+msgstr "Rien à régulariser"
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "global"
+msgstr "globale"
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "quantity count %.2f"
+msgstr "quantité comptée %.2f"
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "Default inventory location %s"
+msgstr "Emplacement d'inventaire par défaut %s"
+
+#. module: wms_inventory
+#: model:ir.module.module,description:wms_inventory.module_meta_information
+msgid ""
+"Module to extended inventory process\n"
+"- enter production lot in inventory line\n"
+"- enter serial number in inventory line\n"
 msgstr ""
+"Module étendu de gestion du processus de l'inventaire\n"
+"- gestion des lot de production dans les lignes d'inventaires\n"
+"- gestion des numéros de série dans les lignes d'inventaires\n"
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "quantity to reset %.2f"
+msgstr "quantité à reinitialisée %.2f"
+
+#. module: wms_inventory
+#: field:stock.inventory,warehouse_id:0
+msgid "Warehouse"
+msgstr "Entrepôt"
+
+#. 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
@@ -25,11 +83,118 @@
 msgstr "Sélectionner l'entrepôt ou sera fait cet inventaire"
 
 #. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "init"
+msgstr "init"
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "Cost price %.2f"
+msgstr "P.U.M.P. %.2f"
+
+#. 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
+#: 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
+#, python-format
+msgid "product %s"
+msgstr "produit %s"
+
+#. module: wms_inventory
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valide pour cette vue!"
+
+#. module: wms_inventory
+#: field:stock.inventory.line,tracking_id:0
+msgid "Tracking"
+msgstr "Suivi"
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "quantity to regulate %.2f"
+msgstr "quantité à régularisé %.2f"
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid " -> Global Inventory"
+msgstr " -> Inventaire globale"
+
+#. 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
+#, python-format
+msgid "Validate each inventory line"
+msgstr "Validation de chaque ligne d'inventaire"
+
+#. module: wms_inventory
+#: help:stock.inventory,type:0
+msgid "If global, reset all quantity product  not found in this inventory"
+msgstr "Si globale, remise à zéro des quantités produits sur non trouvé dans l'inventaire"
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid ""
+"Inventory %s failed\n"
+"see below\n"
+msgstr "Échec de l'inventaire %s\n"
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "Inventory %s has been finished"
+msgstr "L'inventaire %s est terminé."
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "Finish the current inventory"
+msgstr "Fin de l'inventaire actuel"
+
+#. module: wms_inventory
+#: field:stock.warehouse,lot_inventory_id:0
+#: help:stock.warehouse,lot_inventory_id:0
+msgid "Default inventory location"
+msgstr "Emplacement de régul d'inventaire par défaut"
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "Compute inventory %s done"
+msgstr "Calcul de l'inventaire %s terminé"
+
+#. module: wms_inventory
 #: selection:stock.inventory,type:0
 msgid "Partial"
 msgstr "Partiel"
 
 #. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "tracking %s"
+msgstr "suivi %s"
+
+#. module: wms_inventory
 #: selection:stock.inventory,type:0
 msgid "Global"
 msgstr "Globale"
@@ -37,16 +202,8 @@
 #. module: wms_inventory
 #: code:addons/wms_inventory/object/inventory.py:0
 #, python-format
-msgid "Compute inventory %s done"
-msgstr "Calcul de l'inventaire %s terminé"
-
-#. module: wms_inventory
-#: model:ir.module.module,description:wms_inventory.module_meta_information
-msgid ""
-"Module to extended inventory process\n"
-"- enter production lot in inventory line\n"
-"- enter serial number in inventory line\n"
-msgstr ""
+msgid "quantity in stock %.2f at location %s"
+msgstr "Quantité en stock %.2f à cet emplacement %s"
 
 #. module: wms_inventory
 #: model:ir.module.module,shortdesc:wms_inventory.module_meta_information
@@ -54,30 +211,22 @@
 msgstr "WMS Inventory"
 
 #. module: wms_inventory
-#: help:stock.inventory,type:0
-msgid "If global, reset all quantity product  not found in this inventory"
-msgstr "Si globale, remise à zéro des quantités produits sur non trouvé dans l'inventaire"
-
-#. module: wms_inventory
-#: field:stock.inventory.line,tracking_id:0
-msgid "Tracking"
-msgstr "Suivi"
-
-#. 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 "Inventory %s has been finished"
-msgstr "L'inventaire %s est terminé."
-
-#. module: wms_inventory
-#: field:stock.inventory,type:0
-msgid "Type"
-msgstr "TYpe"
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "error"
+msgstr "erreur"
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "action"
+msgstr "action"
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "production lot %s"
+msgstr "lot de production %s"
 
 #. module: wms_inventory
 #: field:stock.inventory.line,prodlot_id:0
@@ -85,6 +234,18 @@
 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	2010-06-29 09:41:10 +0000
+++ wms_inventory/i18n/wms_inventory.pot	2011-02-28 08:44:57 +0000
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.11\n"
+"Project-Id-Version: OpenERP Server 5.0.12\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-06-29 09:40:16+0000\n"
-"PO-Revision-Date: 2010-06-29 09:40:16+0000\n"
+"POT-Creation-Date: 2011-02-27 18:39:06+0000\n"
+"PO-Revision-Date: 2011-02-27 18:39:06+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,29 +16,27 @@
 "Plural-Forms: \n"
 
 #. module: wms_inventory
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: wms_inventory
-#: help:stock.inventory,warehouse_id:0
-msgid "Select the warehouse where the inventory is made"
-msgstr ""
-
-#. module: wms_inventory
-#: selection:stock.inventory,type:0
-msgid "Partial"
-msgstr ""
-
-#. module: wms_inventory
-#: selection:stock.inventory,type:0
-msgid "Global"
-msgstr ""
-
-#. module: wms_inventory
-#: code:addons/wms_inventory/object/inventory.py:0
-#, python-format
-msgid "Compute inventory %s done"
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "nothing to regulate"
+msgstr ""
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "global"
+msgstr ""
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "quantity count %.2f"
+msgstr ""
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "Default inventory location %s"
 msgstr ""
 
 #. module: wms_inventory
@@ -50,18 +48,9 @@
 msgstr ""
 
 #. module: wms_inventory
-#: model:ir.module.module,shortdesc:wms_inventory.module_meta_information
-msgid "Wms Inventory"
-msgstr ""
-
-#. module: wms_inventory
-#: help:stock.inventory,type:0
-msgid "If global, reset all quantity product  not found in this inventory"
-msgstr ""
-
-#. module: wms_inventory
-#: field:stock.inventory.line,tracking_id:0
-msgid "Tracking"
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "quantity to reset %.2f"
 msgstr ""
 
 #. module: wms_inventory
@@ -70,17 +59,172 @@
 msgstr ""
 
 #. module: wms_inventory
-#: code:addons/wms_inventory/object/inventory.py:0
-#, python-format
-msgid "Inventory %s has been finished"
-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
+#, python-format
+msgid "init"
+msgstr ""
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "Cost price %.2f"
+msgstr ""
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "Inventory number %s"
+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
+#, python-format
+msgid "product %s"
+msgstr ""
+
+#. module: wms_inventory
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: wms_inventory
+#: field:stock.inventory.line,tracking_id:0
+msgid "Tracking"
+msgstr ""
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "quantity to regulate %.2f"
+msgstr ""
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid " -> Global Inventory"
+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
+#, python-format
+msgid "Validate each inventory line"
+msgstr ""
+
+#. module: wms_inventory
+#: help:stock.inventory,type:0
+msgid "If global, reset all quantity product  not found in this inventory"
+msgstr ""
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "Inventory %s failed\nsee below\n"
+msgstr ""
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "Inventory %s has been finished"
+msgstr ""
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "Finish the current inventory"
+msgstr ""
+
+#. module: wms_inventory
+#: field:stock.warehouse,lot_inventory_id:0
+#: help:stock.warehouse,lot_inventory_id:0
+msgid "Default inventory location"
+msgstr ""
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "Compute inventory %s done"
+msgstr ""
+
+#. module: wms_inventory
+#: selection:stock.inventory,type:0
+msgid "Partial"
+msgstr ""
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "tracking %s"
+msgstr ""
+
+#. module: wms_inventory
+#: selection:stock.inventory,type:0
+msgid "Global"
+msgstr ""
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "quantity in stock %.2f at location %s"
+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"
+msgstr ""
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "action"
+msgstr ""
+
+#. module: wms_inventory
+#: code:addons/wms_inventory/object/inventory.py:0
+#, python-format
+msgid "production lot %s"
+msgstr ""
+
+#. module: wms_inventory
 #: field:stock.inventory.line,prodlot_id:0
 msgid "Production Lot"
 msgstr ""

=== modified file 'wms_inventory/object/__init__.py'
--- wms_inventory/object/__init__.py	2010-06-29 05:35:00 +0000
+++ wms_inventory/object/__init__.py	2011-02-28 08:44:57 +0000
@@ -22,6 +22,7 @@
 #
 ##############################################################################
 
+import warehouse
 import inventory
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'wms_inventory/object/inventory.py'
--- wms_inventory/object/inventory.py	2010-07-06 06:33:28 +0000
+++ wms_inventory/object/inventory.py	2011-02-28 08:44:57 +0000
@@ -30,13 +30,15 @@
 import thread
 import pooler
 import time
+import tempfile
+import base64
 
 
 class Inventory(osv.osv):
     _inherit = 'stock.inventory'
 
     _columns = {
-        'type': fields.selection([('global','Global'),('partial','Partial')], 'Type', 
+        'type': fields.selection([('global', 'Global'), ('partial', 'Partial')], 'Type',
             help='If global, reset all quantity product  not found in this inventory'),
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True,
             help='Select the warehouse where the inventory is made'),
@@ -47,7 +49,6 @@
         'warehouse_id': lambda obj, cr, uid, context: obj.pool.get('res.users')._default_warehouse(cr, uid, context),
     }
 
-
     def action_done(self, cr, uid, ids, context=None):
         """
         Validate the inventory, it take a lot of time and must be launch in multi thread
@@ -57,66 +58,156 @@
             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')))
+
             logger = netsvc.Logger()
-            logger.notifyChannel('wms_inventory', netsvc.LOG_INFO, '[%s] Start compute the inventory *********' % cr.dbname) 
+            logger.notifyChannel('wms_inventory', netsvc.LOG_INFO, '[%s] Start compute the inventory *********' % cr.dbname)
             cr = pooler.get_db(cr.dbname).cursor()
             for inv in self.browse(cr, uid, ids):
-                logger.notifyChannel('wms_inventory', netsvc.LOG_INFO, '[%s] Inventory %s' % (cr.dbname, inv.name)) 
-                move_ids = []
-                move_line = []
-                inv_ok = True
+                logger.notifyChannel('wms_inventory', netsvc.LOG_INFO, '[%s] Inventory %s' % (cr.dbname, inv.name))
+                # For each inventory, we save all step in the log file
+                outfp = tempfile.NamedTemporaryFile(prefix='openerp', suffix='inventory')
+                log_message(outfp, _('init'), _('Inventory number %s') % inv.name)
+                if inv.type == 'partial':
+                    log_message(outfp, _('init'), _(' -> Partial Inventory'))
+                else:
+                    log_message(outfp, _('init'), _(' -> Global Inventory'))
                 inv_message = ''
-                for line in inv.inventory_line_id:
-                    pid = line.product_id.id
-                    price = line.product_id.standard_price or 0.0
-                    prodlot = line.prodlot_id and line.prodlot_id.id or False
-                    tracking = line.tracking_id and line.tracking_id.id or False
-                    amount = self.pool.get('stock.location')._stock_get(cr, uid, line.location_id.id, [pid], 
-                            {'uom': line.product_uom.id, 'prodlot': prodlot, 'tracking': tracking})
-                    change = line.product_qty - amount
-                    if change:
-                        location_id = line.product_id.product_tmpl_id.property_stock_inventory.id
-                        value = {
-                            'name': 'INV:' + str(line.inventory_id.id) + ':' + line.inventory_id.name,
-                            'product_id': line.product_id.id,
-                            'product_uom': line.product_uom.id,
-                            'date': inv.date,
-                            'date_planned': inv.date,
-                            'state': 'assigned',
-                            'prodlot_id': prodlot,
-                            'tracking_id': tracking,
-                        }
-                        if change > 0:
-                            value.update( {
-                                'product_qty': change,
-                                'location_id': location_id,
-                                'location_dest_id': line.location_id.id,
-                            })
+                # If default inventory location is missing in the warehouse, we add information in the logfile and exit properly
+                if inv.warehouse_id.lot_inventory_id:
+                    log_message(outfp, _('init'), _('Default inventory location %s') % inv.warehouse_id.lot_inventory_id.name)
+                    move_ids = []
+                    move_line = []
+                    inv_ok = True
+                    tmp_prod = []
+                    log_message(outfp, 'init', _('Start to analyse each line'))
+                    for line in inv.inventory_line_id:
+                        log_message(outfp, _('analyze'), '**********************')
+                        pid = line.product_id.id
+                        log_message(outfp, _('analyze'), _('product %s') % line.product_id.name)
+                        log_message(outfp, _('analyze'), _('        [%s]') % line.product_id.default_code)
+                        price = line.product_id.standard_price or 0.0
+                        log_message(outfp, _('analyze'), _('Cost price %.2f') % line.product_id.standard_price)
+                        prodlot = line.prodlot_id and line.prodlot_id.id or False
+                        if prodlot:
+                            log_message(outfp, _('analyze'), _('production lot %s') % line.prodlot_id.name)
+                        tracking = line.tracking_id and line.tracking_id.id or False
+                        if tracking:
+                            log_message(outfp, _('analyze'), _('tracking %s') % line.tracking_id.name)
+
+                        amount = self.pool.get('stock.location')._stock_get(cr, uid, line.location_id.id, [pid],
+                                {'uom': line.product_uom.id, 'prodlot': prodlot, 'tracking': tracking})
+                        log_message(outfp, _('analyze'), _('quantity in stock %.2f at location %s') % (amount, line.location_id.name))
+                        log_message(outfp, _('analyze'), _('quantity count %.2f') % line.product_qty)
+
+                        # for global inventory, we keep if we found this product
+                        tmp_prod.append('%d_%d_%d_%d' % (line.product_id.id, line.location_id.id, prodlot or 0, tracking or 0))
+                        change = line.product_qty - amount
+                        if not change:
+                            log_message(outfp, _('action'), _('nothing to regulate'))
                         else:
-                            value.update( {
-                                'product_qty': -change,
-                                'location_id': line.location_id.id,
+                            log_message(outfp, _('action'), _('quantity to regulate %.2f') % change)
+                            location_id = line.product_id.product_tmpl_id.property_stock_inventory.id or inv.warehouse_id.lot_inventory_id.id
+                            value = {
+                                'name': 'INV:' + str(line.inventory_id.id) + ':' + line.inventory_id.name,
+                                'product_id': line.product_id.id,
+                                'product_uom': line.product_uom.id,
+                                'date': inv.date,
+                                'date_planned': inv.date,
+                                'state': 'assigned',
+                                'prodlot_id': prodlot,
+                                'tracking_id': tracking,
+                            }
+                            if change > 0:
+                                value.update({
+                                    'product_qty': change,
+                                    'location_id': location_id,
+                                    'location_dest_id': line.location_id.id,
+                                })
+                            else:
+                                value.update({
+                                    'product_qty': -change,
+                                    'location_id': line.location_id.id,
+                                    'location_dest_id': location_id,
+                                })
+                            try:
+                                move_ids.append(self.pool.get('stock.move').create(cr, uid, value))
+                            except except_orm, e:
+                                logger.notifyChannel('wms_inventory', netsvc.LOG_INFO, '[%s] %s %s' % (cr.dbname, e.name, e.value))
+                                log_message(outfp, _('error'), '[%s] %s %s' % (cr.dbname, e.name, e.value))
+                                inv_message += '    %s: %s\n' % (e.name, e.value)
+                                inv_ok = False
+
+                    ##
+                    ## Global inventory must reset the missing product, on this warehouse
+                    log_message(outfp, _('global'), '===========================================')
+                    if inv.type == 'global':
+                        avail_obj = self.pool.get('wms.report.stock.available')
+                        args = [
+                            ('warehouse_id', '=', inv.warehouse_id.id),
+                        ]
+                        avail_ids = avail_obj.search(cr, uid, args, context=context)
+                        for a in avail_obj.browse(cr, uid, avail_ids, context=context):
+                            log_message(outfp, _('analyze'), '**********************')
+                            # Check if this product was already found at this location
+                            tmp_key = '%d_%d_%d_%d' % (a.product_id.id, a.location_id.id,
+                                        a.prodlot_id and a.prodlot_id.id or 0, a.tracking_id and a.tracking_id.id or 0)
+
+                            if tmp_key in tmp_prod:
+                                continue
+
+                            log_message(outfp, _('analyze'), _('product %s') % a.product_id.name)
+                            log_message(outfp, _('analyze'), _('        [%s]') % a.product_id.default_code)
+                            if a.prodlot_id:
+                                log_message(outfp, _('analyze'), _('production lot %s') % a.prodlot_id.name)
+                            if a.tracking_id:
+                                log_message(outfp, _('analyze'), _('tracking %s') % a.tracking_id.name)
+                            log_message(outfp, _('action'), _('quantity to reset %.2f') % a.qty)
+
+                            location_id = line.product_id.product_tmpl_id.property_stock_inventory.id or inv.warehouse_id.lot_inventory_id.id
+                            value = {
+                                'name': 'INV: reset qty: ' + line.inventory_id.name,
+                                'product_id': a.product_id.id,
+                                'product_uom': a.uom_id.id,
+                                'date': inv.date,
+                                'date_planned': inv.date,
+                                'state': 'assigned',
+                                'prodlot_id': a.prodlot_id and a.prodlot_id.id or False,
+                                'tracking_id': a.tracking_id and a.tracking_id.id or False,
+                                'product_qty': a.qty,
+                                'location_id': a.location_id.id,
                                 'location_dest_id': location_id,
-                            })
+                            }
+                            try:
+                                move_ids.append(self.pool.get('stock.move').create(cr, uid, value))
+                            except except_orm, e:
+                                logger.notifyChannel('wms_inventory', netsvc.LOG_INFO, '[%s] %s %s' % (cr.dbname, e.name, e.value))
+                                log_message(outfp, _('error'), '[%s] %s %s' % (cr.dbname, e.name, e.value))
+                                inv_message += '    %s: %s\n' % (e.name, e.value)
+                                inv_ok = False
+
+                    logger.notifyChannel('wms_inventory', netsvc.LOG_INFO, '[%s] Compute each line' % cr.dbname)
+                    log_message(outfp, _('action'), _('Validate each inventory line'))
+                    if len(move_ids) and inv_ok:
                         try:
-                            move_ids.append(self.pool.get('stock.move').create(cr, uid, value))
+                            self.pool.get('stock.move').action_done(cr, uid, move_ids,
+                                    context=context)
                         except except_orm, e:
-                            logger.notifyChannel('wms_inventory', netsvc.LOG_INFO, '[%s] %s %s' % (cr.dbname, e.name, e.value)) 
+                            logger.notifyChannel('wms_inventory', netsvc.LOG_INFO, '[%s] %s %s' % (cr.dbname, e.name, e.value))
                             inv_message += '    %s: %s\n' % (e.name, e.value)
                             inv_ok = False
-                logger.notifyChannel('wms_inventory', netsvc.LOG_INFO, '[%s] Compute each line' % cr.dbname) 
-                if len(move_ids) and inv_ok:
-                    try:
-                        self.pool.get('stock.move').action_done(cr, uid, move_ids,
-                                context=context)
-                    except except_orm, e:
-                        logger.notifyChannel('wms_inventory', netsvc.LOG_INFO, '[%s] %s %s' % (cr.dbname, e.name, e.value)) 
-                        inv_message += '    %s: %s\n' % (e.name, e.value)
-                        inv_ok = False
 
-                if inv_ok:
-                    self.write(cr, uid, [inv.id], {'state': 'done', 'date_done': time.strftime('%Y-%m-%d %H:%M:%S'), 
-                        'move_ids': [(6, 0, move_ids)]})
+                    log_message(outfp, _('action'), _('Finish the current inventory'))
+                    if inv_ok:
+                        self.write(cr, uid, [inv.id], {'state': 'done', 'date_done': time.strftime('%Y-%m-%d %H:%M:%S'),
+                            'move_ids': [(6, 0, move_ids)]})
+                else:
+                    log_message(outfp, 'error', 'defaut inventory location is missing on the warehouse %s' % inv.warehouse_id.name)
+                    inv_ok = False
 
                 ###
                 ## Send a request to the user whom launch the validation
@@ -131,12 +222,25 @@
                     'name': _('Compute inventory %s done') % inv.name,
                     'act_from': uid,
                     'act_to': uid,
-                    'body' : body,
+                    'body': body,
                 }, context=context)
 
+                # Store the logfile as attachment
+                outfp.flush()
+                outfp.seek(0)
+                vals = {
+                    'datas': base64.encodestring(outfp.read()),
+                    'datas_fname': 'inv_%s' % inv.name,
+                    'name': 'INV %s' % inv.name,
+                    'res_model': 'stock.inventory',
+                    'res_id': inv.id,
+                }
+                self.pool.get('ir.attachment').create(cr, uid, vals, context=context)
+                outfp.close()
+
                 cr.commit()
             cr.close()
-            logger.notifyChannel('wms_inventory', netsvc.LOG_INFO, '[%s] End compute the inventory ***********' % cr.dbname) 
+            logger.notifyChannel('wms_inventory', netsvc.LOG_INFO, '[%s] End compute the inventory ***********' % cr.dbname)
             return True
 
         thread.start_new_thread(threading_done, (cr, uid, ids, context))
@@ -144,6 +248,7 @@
 
 Inventory()
 
+
 class InventoryLine(osv.osv):
     _inherit = 'stock.inventory.line'
 

=== added file 'wms_inventory/object/warehouse.py'
--- wms_inventory/object/warehouse.py	1970-01-01 00:00:00 +0000
+++ wms_inventory/object/warehouse.py	2011-02-28 08:44:57 +0000
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    wms_inventory module for OpenERP, Module to extended inventory process
+#    Copyright (C) 2011 SYLEAM (<http://www.syleam.fr/>)
+#              Christophe CHAUVET <[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
+from osv import fields
+
+class StockWarehouse(osv.osv):
+    _inherit = 'stock.warehouse'
+    
+    _columns = {
+        'lot_inventory_id': fields.many2one('stock.location', 'Default inventory location', help='Default inventory location'),
+    }
+
+StockWarehouse()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'wms_inventory/view/warehouse.xml'
--- wms_inventory/view/warehouse.xml	1970-01-01 00:00:00 +0000
+++ wms_inventory/view/warehouse.xml	2011-02-28 08:44:57 +0000
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        ##############################################################################
+        #
+        #    wms_inventory module for OpenERP, Module to extended inventory process
+        #    Copyright (C) 2011 SYLEAM ([http://www.syleam.fr/])
+        #              Christophe CHAUVET [[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_stock_warehouse_inventory_form" model="ir.ui.view">
+            <field name="name">stock.warehouse - inventory</field>
+            <field name="model">stock.warehouse</field>
+            <field name="type">form</field>
+            <field name="priority" eval="18"/>
+            <field name="inherit_id" ref="stock.view_warehouse"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/field[@name='crossdock_location_id']" position="after">
+                    <field name="lot_inventory_id" domain="[('warehouse_id','=', active_id),('usage','=', 'inventory')]"/>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>

=== modified file 'wms_location/object/location.py'
--- wms_location/object/location.py	2011-01-24 21:52:52 +0000
+++ wms_location/object/location.py	2011-02-28 08:44:57 +0000
@@ -110,6 +110,7 @@
             ('product_uom', '=', context.get('uom')),
             ('prodlot_id', '=', context.get('prodlot', False)),
             ('tracking_id', '=', context.get('tracking', False)),
+            ('state', '=', 'done'),
         ]
         move_ids = move_obj.search(cr, uid, args, context=context)
         move = move_obj.read(cr, uid, move_ids, ['product_qty'], context=context)