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

[Christophe CHAUVET]

[Christophe CHAUVET (christophe-chauvet)]

review: Approve

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

218. By Christophe CHAUVET on 2011-03-15

merge from lp:~syleam/wms/5.0-christophe-chauvet

=== modified file 'wms/i18n/fr_FR.po'
--- wms/i18n/fr_FR.po	2011-03-02 08:08:10 +0000
+++ wms/i18n/fr_FR.po	2011-03-15 16:48:33 +0000
@@ -1,20 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* wms
-#	* stock
-#
+# * wms
+# * stock
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.15\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-02-28 21:58:44+0000\n"
-"PO-Revision-Date: 2011-03-02 09:07+0100\n"
+"POT-Creation-Date: 2011-03-15 13:45:18+0000\n"
+"PO-Revision-Date: 2011-03-15 14:48+0100\n"
 "Last-Translator: Christophe Chauvet <[e-mail]>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: \n"
+"X-Generator: Translate Toolkit 1.3.0\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -78,6 +77,11 @@
 msgstr "STOCK_MEDIA_FORWARD"
 
 #. module: wms
+#: field:stock.warehouse,return_location_id:0
+msgid "Return location"
+msgstr "Emplacement de retourn"
+
+#. module: wms
 #: help:stock.warehouse,parent_id:0
 msgid "Define the parent warehouse"
 msgstr "Définir l'entrepôt parent"
@@ -173,12 +177,6 @@
 msgstr "Est ce que le contenu est à l'intérieur ?"
 
 #. module: stock
-#: code:addons/stock/wizard/wizard_return.py:0
-#, python-format
-msgid "Warning !"
-msgstr "Avertissement !"
-
-#. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree4
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree4
 msgid "Incoming Products"
@@ -190,12 +188,12 @@
 msgid "Reference"
 msgstr "Référence"
 
-#. modules: wms, stock
-#: wizard_view:wms.burst,init:0
+#. 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"
@@ -251,10 +249,9 @@
 msgstr "STOCK_CANCEL"
 
 #. module: stock
-#: code:addons/stock/wizard/inventory_merge.py:0
-#, python-format
-msgid "Please select at least two inventories."
-msgstr "Merci de sélectionner au moins deux inventaires"
+#: selection:stock.location,usage:0
+msgid "Internal Location"
+msgstr "Emplacement interne"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -566,8 +563,8 @@
 #: field:stock.move,product_qty:0
 #: rml:stock.picking.list:0
 #: field:stock.report.prodlots,name:0
+#: field:stock.burst.line,quantity:0
 #: wizard_field:wms.burst,init,quantity:0
-#: field:stock.burst.line,quantity:0
 msgid "Quantity"
 msgstr "Quantité"
 
@@ -622,6 +619,16 @@
 msgstr "Fournisseurs IT"
 
 #. module: wms
+#: field:stock.picking,transporter_number:0
+msgid "Tracking number"
+msgstr "Numéro de suivi"
+
+#. module: wms
+#: help:stock.warehouse,return_location_id:0
+msgid "Choose the return location on this warehouse"
+msgstr "Choisir un emplacement de retour pour cet entrepôt"
+
+#. module: wms
 #: view:res.company:0
 msgid "Average price calculate on stock picking"
 msgstr "Calcul du PUMP sur les mouvements de stock de type :"
@@ -689,6 +696,37 @@
 msgstr "Cet emplacement de stock sera utilisé au lieu de celui par défaut, comme emplacement source sur les movements de stock générés quand vous effectuez un inventaire"
 
 #. module: wms
+#: model:product.template,description:wms.product_ipad2_product_template
+msgid ""
+" * Wi-Fi + 3G model: UMTS/HSDPA/HSUPA (850, 900, 1900, 2100 MHz); GSM/EDGE (850, 900, 1800, 1900 MHz)\n"
+"                * Wi-Fi + 3G for Verizon model: CDMA EV-DO Rev. A (800, 1900 MHz)\n"
+"                * Data only3\n"
+"                * Wi-Fi (802.11a/b/g/n)\n"
+"                * Bluetooth 2.1 + EDR technology\n"
+"                * 9.7-inch (diagonal) LED-backlit glossy widescreen Multi-Touch display with IPS technology\n"
+"                * 1024-by-768-pixel resolution at 132 pixels per inch (ppi)\n"
+"                * Fingerprint-resistant oleophobic coating\n"
+"                * Support for display of multiple languages and characters simultaneously\n"
+"                * Back camera: Video recording, HD (720p) up to 30 frames per second with audio; still camera with 5x digital zoom\n"
+"                * Front camera: Video recording, VGA up to 30 frames per second with audio; VGA-quality still camera\n"
+"                * Tap to control exposure for video or stills\n"
+"                * Photo and video geotagging over Wi-Fi"
+msgstr ""
+" * Wi-Fi + 3G model: UMTS/HSDPA/HSUPA (850, 900, 1900, 2100 MHz); GSM/EDGE (850, 900, 1800, 1900 MHz)\n"
+"                * Wi-Fi + 3G for Verizon model: CDMA EV-DO Rev. A (800, 1900 MHz)\n"
+"                * Data only3\n"
+"                * Wi-Fi (802.11a/b/g/n)\n"
+"                * Bluetooth 2.1 + EDR technology\n"
+"                * 9.7-inch (diagonal) LED-backlit glossy widescreen Multi-Touch display with IPS technology\n"
+"                * 1024-by-768-pixel resolution at 132 pixels per inch (ppi)\n"
+"                * Fingerprint-resistant oleophobic coating\n"
+"                * Support for display of multiple languages and characters simultaneously\n"
+"                * Back camera: Video recording, HD (720p) up to 30 frames per second with audio; still camera with 5x digital zoom\n"
+"                * Front camera: Video recording, VGA up to 30 frames per second with audio; VGA-quality still camera\n"
+"                * Tap to control exposure for video or stills\n"
+"                * Photo and video geotagging over Wi-Fi"
+
+#. module: wms
 #: model:stock.location,name:wms.stock_location_chariot1
 msgid "Chariot 1"
 msgstr "Chariot 1"
@@ -715,12 +753,6 @@
 msgstr "Vague"
 
 #. module: stock
-#: code:addons/stock/wizard/wizard_return.py:0
-#, python-format
-msgid "You cannot return a packing which is not completed yet! Make sure the packing is in \"done\" state!"
-msgstr "Vous ne pouvez pas retourner un colisage qui n'est pas encore terminé! Assurez vous que le colisage est en état \"terminé\"!"
-
-#. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ZOOM_FIT"
 msgstr "STOCK_ZOOM_FIT"
@@ -773,6 +805,11 @@
 msgstr "Stock virtuel"
 
 #. module: stock
+#: selection:stock.location,usage:0
+msgid "View"
+msgstr "Vue"
+
+#. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_ERROR"
 msgstr "STOCK_DIALOG_ERROR"
@@ -1149,6 +1186,7 @@
 
 #. module: stock
 #: field:res.partner,property_stock_customer:0
+#: selection:stock.location,usage:0
 msgid "Customer Location"
 msgstr "Emplacement Client"
 
@@ -1185,9 +1223,9 @@
 msgid "Downstream traceability"
 msgstr "Traçabilté aval"
 
-#. modules: wms, stock
+#. module: wms
+#: field:stock.burst.line,remark_id:0
 #: wizard_field:wms.burst,init,remark_id:0
-#: field:stock.burst.line,remark_id:0
 msgid "Observation"
 msgstr "Observation"
 
@@ -1223,6 +1261,7 @@
 
 #. module: stock
 #: field:res.partner,property_stock_supplier:0
+#: selection:stock.location,usage:0
 msgid "Supplier Location"
 msgstr "Emplacement fournisseur"
 
@@ -1364,6 +1403,12 @@
 msgid "Merging is only allowed on draft inventories."
 msgstr "La fusion est seulement autorisée sur les inventaires en brouillon."
 
+#. module: stock
+#: code:addons/stock/wizard/inventory_merge.py:0
+#, python-format
+msgid "Please select at least two inventories."
+msgstr "Merci de sélectionner au moins deux inventaires"
+
 #. module: wms
 #: field:stock.move,crossdock_ok:0
 msgid "Crossdock_ok"
@@ -1505,6 +1550,7 @@
 #: model:ir.model,name:stock.model_stock_inventory
 #: field:stock.inventory,name:0
 #: field:stock.inventory.line,inventory_id:0
+#: selection:stock.location,usage:0
 msgid "Inventory"
 msgstr "Inventaire"
 
@@ -1777,6 +1823,11 @@
 msgid "Select the warehouse where the category must be seen"
 msgstr "Selectionner le ou les entrepot(s) ou sera visible cette catégorie"
 
+#. module: wms
+#: model:ir.actions.act_window,name:wms.act_product_product_2_stock_move_out
+msgid "Outging stock"
+msgstr "Stock sortant"
+
 #. module: stock
 #: field:product.product,track_incoming:0
 msgid "Track Incoming Lots"
@@ -1801,7 +1852,7 @@
 msgid "Future Qty"
 msgstr "Qté prévisionnelle"
 
-#. modules: wms, stock
+#. module: wms
 #: wizard_button:wms.burst,init,end:0
 msgid "Finnish"
 msgstr "Terminé"
@@ -2060,6 +2111,11 @@
 msgid "Outgoing Products"
 msgstr "Produits à expédier"
 
+#. module: wms
+#: model:stock.location,name:wms.stock_location_input_w0
+msgid "Input"
+msgstr "Entrée"
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_COLOR_PICKER"
@@ -2091,6 +2147,11 @@
 msgstr "Date de création"
 
 #. module: stock
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr "Réapprovisionnement"
+
+#. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Maxtor Suppliers"
 msgstr "Fournisseur Maxtor"
@@ -2250,12 +2311,6 @@
 msgstr "STOCK_DND_MULTIPLE"
 
 #. module: stock
-#: code:addons/stock/wizard/wizard_return.py:0
-#, python-format
-msgid "You cannot return a packing with a product quantity zero or less!"
-msgstr "You cannot return a packing with a product quantity zero or less!"
-
-#. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SPELL_CHECK"
 msgstr "STOCK_SPELL_CHECK"
@@ -2377,6 +2432,7 @@
 #. modules: wms, stock
 #: selection:stock.inventory,state:0
 #: selection:stock.move,state:0
+#: view:stock.picking:0
 #: selection:stock.picking,state:0
 #: view:stock.burst:0
 #: selection:stock.burst,state:0
@@ -2493,11 +2549,11 @@
 #: field:stock.move,product_id:0
 #: field:stock.production.lot,product_id:0
 #: field:stock.report.prodlots,product_id:0
-#: wizard_field:wms.burst,init,product_id:0
 #: field:product.ul,product_id:0
 #: 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"
@@ -2664,9 +2720,9 @@
 msgstr "Lots"
 
 #. module: wms
-#: model:ir.actions.act_window,name:wms.act_product_product_2_stock_move_out
-msgid "Outging stock"
-msgstr "Stock sortant"
+#: field:stock.move,move_crossdock_ids:0
+msgid "Crossdock movement"
+msgstr "Mouvement de crossdock"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
@@ -2752,8 +2808,7 @@
 "This is used only if you selected a chained location type.\n"
 "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 employé seulement si vous choisissiez un type d'emplacement chaîné. \n"
-"La valeur \"Mouvement automatique\" créera un mouvement de stock, après le mouvement courant, qui sera validé automatiquement.\n"
+"Ceci est employé seulement si vous choisissiez un type d'emplacement chaîné. La valeur \"Mouvement automatique\" créera un mouvement de stock, après le mouvement courant, qui sera validé automatiquement.\n"
 "Avec \"Opération manuelle\", le mouvement de stock doit être validé par un opérateur.\n"
 "Avec \"Automatique sans étape supplémentaire\", l'emplacement est remplacé dans le mouvement de stock initial."
 
@@ -2853,9 +2908,9 @@
 msgid "Max. Planned Date"
 msgstr "Date précu maxi."
 
-#. modules: wms, stock
+#. module: wms
+#: wizard_button:picking.generate.wave,init,valid:0
 #: wizard_button:wms.burst,init,valid:0
-#: wizard_button:picking.generate.wave,init,valid:0
 msgid "OK"
 msgstr "OK"
 
@@ -2883,7 +2938,6 @@
 #. module: stock
 #: code:addons/stock/wizard/inventory_merge.py:0
 #: code:addons/stock/wizard/inventory_merge_zero.py:0
-#: code:addons/stock/wizard/wizard_return.py:0
 #, python-format
 msgid "Warning"
 msgstr "Averstissement"
@@ -2990,8 +3044,7 @@
 msgid "Reporting"
 msgstr "Rapport"
 
-#. modules: wms, stock
-#: model:ir.actions.wizard,name:stock.burst
+#. module: wms
 #: model:ir.actions.wizard,name:wms.stock_burst
 msgid "Fast entry"
 msgstr "Saisie rapide"
@@ -3061,9 +3114,9 @@
 msgstr "Poids"
 
 #. module: wms
-#: field:stock.picking,transporter_number:0
-msgid "Tracking number"
-msgstr "Numéro de suivi"
+#: help:stock.warehouse,force_reserved_location:0
+msgid "Force move product in reserved location"
+msgstr "Forcer le mouvement de produit vers en emplacement de réservation"
 
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
@@ -3086,6 +3139,12 @@
 msgid "Usefull when sale module not installed"
 msgstr "Utile lorsque le module vente n'est pas installé"
 
+#. module: wms
+#: code:addons/wms/object/picking.py:0
+#, python-format
+msgid "Message"
+msgstr "Message !"
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_LAST"
@@ -3129,6 +3188,16 @@
 msgid "STOCK_JUSTIFY_CENTER"
 msgstr "STOCK_JUSTIFY_CENTER"
 
+#. module: wms
+#: model:product.template,name:wms.product_ipad2_product_template
+msgid "IPAD2"
+msgstr "IPAD2"
+
+#. module: wms
+#: field:stock.warehouse,force_reserved_location:0
+msgid "Force reserved"
+msgstr "Forcer la réservation"
+
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree3
 #: model:ir.actions.act_window,name:stock.action_picking_tree8
@@ -3346,6 +3415,7 @@
 
 #. module: stock
 #: model:stock.location,name:stock.location_production
+#: selection:stock.location,usage:0
 msgid "Production"
 msgstr "Production"
 
@@ -3552,3 +3622,19 @@
 msgid "Physical Locations"
 msgstr "Emplacements physiques"
 
+#, fuzzy
+#~ msgid "Virtuals location"
+#~ msgstr "Emplacements Virtuels"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Avertissement !"
+
+#, python-format
+#~ msgid "You cannot return a packing which is not completed yet! Make sure the packing is in \"done\" state!"
+#~ msgstr "Vous ne pouvez pas retourner un colisage qui n'est pas encore terminé! Assurez vous que le colisage est en état \"terminé\"!"
+
+#, python-format
+#~ msgid "You cannot return a packing with a product quantity zero or less!"
+#~ msgstr "You cannot return a packing with a product quantity zero or less!"
+

=== modified file 'wms/object/move.py'
--- wms/object/move.py	2011-03-07 13:17:46 +0000
+++ wms/object/move.py	2011-03-15 16:48:33 +0000
@@ -58,6 +58,7 @@
         'invoice_uom_id': fields.many2one('product.uom', 'Invoice UOM', help='Store the invoice UOM'),
         'crossdock_ok': fields.boolean('Crossdock_ok', help='If check, the crossdoc process have been made'),
         'order_qty': fields.float('Order Qty.', help='Usefull when sale module not installed'),
+        'move_crossdock_ids': fields.many2many('stock.move', 'stock_move_crossdock_rel', 'receipt_id', 'prepare_id', 'Crossdock movement', ),
     }
 
     _defaults = {
@@ -135,6 +136,7 @@
         The assignement must be keep the production_lot and tracking
         and purpose
         """
+        print 'check_assign'
         done = []
         count = 0
         pickings = {}
@@ -149,6 +151,7 @@
                 continue
 
             if move.state in ('confirmed', 'waiting'):
+                print 'plop'
                 prodlot = move.prodlot_id and move.prodlot_id.id or False
                 tracking = move.tracking_id and move.tracking_id.id or False
                 res = self.pool.get('stock.location')._product_reserve(cr, uid, [move.location_id.id], move.product_id.id, move.product_qty,

=== modified file 'wms/object/picking.py'
--- wms/object/picking.py	2011-03-07 13:17:46 +0000
+++ wms/object/picking.py	2011-03-15 16:48:33 +0000
@@ -155,6 +155,24 @@
         move_ids = self.pool.get('wms.report.stock.available').search(cr, uid, [('product_id', '=', product_id), ('location_id', 'in', loc_ids)], context=context)
         return [x.location_id.id for x in self.pool.get('wms.report.stock.available').browse(cr, uid, move_ids, context=context)]
 
+    def product_crossdock_quantity(self, cr, uid, product_id, warehouse_id, context=None):
+        """
+        Retrieve the quantity available for this product on his crossdock location
+        """
+        if context is None:
+            context = {}
+
+        res = 0.0
+        cr_ids = self.product_crossdock_location(cr, uid, product_id, warehouse_id, context=context)
+        if cr_ids:
+            ctx = context.copy()
+            ctx['states'] = ('assigned','done',)
+            ctx['what'] = ('in', 'out')
+            ctx['location'] = cr_ids[0]
+            res = self.pool.get('product.product').get_product_available(cr, uid, [product_id], context=ctx)[product_id]
+
+        return res
+
     def crossdock_location_available(self, cr, uid, warehouse_ids, context=None):
         """
         Return the list ids of empty crossdock location for these warehouse
@@ -198,11 +216,11 @@
         :return: True if the movement is correct
         :rtype: boolean
         """
+        print '[I] create_crossdock_move'
         if context is None:
             context = {}
 
         move_obj = self.pool.get('stock.move')
-
         if crossdock_id is None:
             default_crossdock = self.pool.get('stock.warehouse').read(cr, uid, move.location_dest_id.warehouse_id.id,
                                         ['crossdock_location_id'], context=context)['crossdock_location_id']
@@ -215,40 +233,85 @@
         ##
         new_id = False
         print 'produit: %s' % move.product_id.name
-        if abs(move.product_id.outgoing_qty) > 0:
-
-            # Search how many quantity must be put in crossdock
-            picking_ids = self.search(cr, uid, [('type', '=', 'out'), ('state', 'in', ['confirmed', 'assigned'])],
-                                context=context)
-            args = [
-                ('picking_id', 'in', picking_ids),
-                ('product_id', '=', move.product_id.id),
-                ('state', 'in', ['assigned', 'confirmed', 'waiting']),
-                ('crossdock_ok', '=', False),
-            ]
-            reserve_ids = move_obj.search(cr, uid, args, order='date_planned', context=context)
-            print 'reserve_ids ', reserve_ids
-
+        print 'quantite manquante %.2f' % move.product_id.outgoing_qty
+        #if abs(move.product_id.outgoing_qty) > 0:
+
+        ###
+        ## Search how many quantity have been reserved, and move all of them to the crossdock location
+        ##
+        picking_ids = self.search(cr, uid, [('type', '=', 'out'), ('state', 'in', ['confirmed', 'assigned'])],
+                            context=context)
+        args = [
+            ('picking_id', 'in', picking_ids),
+            ('product_id', '=', move.product_id.id),
+            ('state', 'in', ['assigned', 'confirmed', 'waiting']),
+            ('crossdock_ok', '=', False),
+        ]
+        reserve_ids = move_obj.search(cr, uid, args, order='date_planned', context=context)
+        print 'reserve_ids ', reserve_ids
+
+        if reserve_ids:
             reserves = move_obj.browse(cr, uid, reserve_ids, context=context)
+
+            ###
+            ## Check if this product have available quantity in te crossdock location
+            ##
+            cross_qty = self.product_crossdock_quantity(cr, uid, move.product_id.id, move.picking_id.warehouse_id.id)
+            print 'cross_qty ', cross_qty
+
+
             total_ids = []
             total_crossdock = 0.0
+            partial_ids = []
+            partial_crossdock = 0.0
             for r in reserves:
+                res_qty = r.product_qty
+                if cross_qty >= res_qty:
+                    print 'cross_qty >= res_qty (%.2f >= %.2f)' % (cross_qty, res_qty)
+                    cross_qty = cross_qty - res_qty
+                    res_qty = 0.0
+                else:
+                    print 'cross_qty < res_qty (%.2f < %.2f)' % (cross_qty, res_qty)
+                    res_qty = res_qty - cross_qty
+                    cross_qty = 0.0
+
+                print '------'
                 print 'total_crossdock ', total_crossdock
                 print 'r.product_qty ', r.product_qty
                 print 'move.product_qty ', move.product_qty
-                if (total_crossdock + r.product_qty) > move.product_qty:
-                    print 'on sort'
+                print 'res_qty ', res_qty
+                print '(total_crossdock + res_qty) > move.product_qty (%.2f + %.2f) > %.2f' % (total_crossdock, res_qty, move.product_qty)
+                if (total_crossdock + res_qty) > move.product_qty:
+                    print 'a pas tout, donc partiel'
+                    partial_ids.append(r.id)
+                    partial_crossdock += res_qty
                     break
                 total_ids.append(r.id)
-                total_crossdock += r.product_qty
+                total_crossdock += res_qty
 
             print '==================================='
+            print 'move.product_qty ', move.product_qty
             print 'total_ids ', total_ids
             print 'total_crossdock ', total_crossdock
+            print 'partial_ids ', partial_ids
+            print 'partial_crossdock ', partial_crossdock
             print '==================================='
 
-            # Check if we must split the line in two if there is enougth quantity available
-            if total_crossdock and move.product_qty > total_crossdock:
+            if partial_ids and move.picking_id.warehouse_id.force_reserved_location:
+                ###
+                ## if partial line is force to reserved, we move all quantity to the crossdock location
+                ##
+                args = {
+                    'location_dest_id': crossdock_id,
+                    'state': 'done',
+                    'crossdock_ok': True,
+                }
+                move_obj.write(cr, uid, [move.id], args, context=context)
+
+            elif total_crossdock and move.product_qty > total_crossdock:
+                ###
+                ## If we have more quantity that reversed one, we split the move line in two
+                ##
                 print '[ENOUGTH] ************************'
                 rest = (move.product_qty - total_crossdock)
                 args = {
@@ -267,8 +330,8 @@
                 move_obj.write(cr, uid, [move.id], args, context=context)
 
                 # Check if move_dest_id is link to an internal picking
-                if move.move_dest_id and move.move_dest_id.type == 'internal':
-                    print 'yeah ca pass'
+                if move.move_dest_id and move.move_dest_id.picking_id.type == 'internal':
+                    print 'On rectifie les quantites du bon de rangement'
                     move_obj.write(cr, uid, [move.move_dest_id.id], {'product_qty': rest}, context=context)
 
             elif total_crossdock:
@@ -280,6 +343,9 @@
                 }
                 move_obj.write(cr, uid, [move.id], args, context=context)
 
+            ###
+            ## made all movement on out picking available
+            ##
             if total_ids:
                 args = {
                     'location_id': crossdock_id,
@@ -288,14 +354,31 @@
                 }
                 move_obj.write(cr, uid, total_ids, args, context=context)
 
+            ###
+            ## If checkbox "force_reserved_location" move product to the reserved location
+            ##
+            if partial_ids and move.picking_id.warehouse_id.force_reserved_location:
+                print 'pas assez mais reserver'
+                args = {
+                    'location_id': crossdock_id,
+                }
+                move_obj.write(cr, uid, partial_ids, args, context=context)
+
+        print '[O] create_crossdock_move'
         return new_id or move.id
 
     def affect_reserved_product(self, cr, uid, move_id, location_id=False, context=None):
         """
         When product is reserved, we must affect receipt quantity to this one
+
+        :param move_id: Movement ID
+        :type  move_id: integer
+        :param location_id: Location id for the product of this movement
+        :type  location_id: integer
         :return: The quantity reserved by the picking out
         :rtype: float
         """
+        print '[I] affect_reserved_product'
         if context is None:
             context = {}
 
@@ -339,6 +422,7 @@
         # On the receipt link, change the location_dest_id to replace by the available one
         move_obj.write(cr, uid, [move_id], {'location_dest_id': location_id}, context=context)
 
+        print '[O] affect_reserved_product'
         return move.move_dest_id.product_qty
 
     def test_finnished(self, cr, uid, ids):
@@ -347,6 +431,7 @@
         1) check if all move are finnished
         2) if not return False
         """
+        print '[I] test_finished ************************************************'
         in_ids = []
         other_ids = []
         for p in self.browse(cr, uid, ids):
@@ -384,7 +469,7 @@
                 # If product is reserved to one picking, check it first
                 # if not, check if product is in crossdock mode and if out picking is available
                 if move.move_dest_id and move.move_dest_id.picking_id and move.move_dest_id.picking_id.type == 'out':
-                    print 'WHAT ELSE'
+                    print 'This product is reserved'
                     pro_crossdock = self.product_crossdock_location(cr, uid, move.product_id.id,
                                         move.location_dest_id.warehouse_id.id)
                     if pro_crossdock:
@@ -395,13 +480,17 @@
                     self.affect_reserved_product(cr, uid, move.id, tmp_crossdock)
 
                 elif not move.crossdock_ok and move.product_id.location_type == 'crossdock' and move.product_qty > 0:
-
+                    ###
+                    ## Check if product is already assigned to a crossdock location
+                    ## If not retrieve one crossodck location or use the default one on the warehouse
+                    ##
                     pro_crossdock = self.product_crossdock_location(cr, uid, move.product_id.id,
                                         move.location_dest_id.warehouse_id.id)
                     if pro_crossdock:
                         tmp_crossdock = pro_crossdock[0]
                     else:
                         tmp_crossdock = cd_ids and cd_ids.pop() or None
+
                     m_id = self.create_crossdock_move(cr, uid, move, crossdock_id=tmp_crossdock)
                     new_move_ids.append(m_id)
 
@@ -427,6 +516,7 @@
             for i in pick_list:
                 self.force_assign(cr, uid, [i])
 
+        print '[O] test_finished'
         return super(StockPicking, self).test_finnished(cr, uid, ids)
 
     def move_merge(self, cr, uid, picking_id, context=None):

=== modified file 'wms/object/warehouse.py'
--- wms/object/warehouse.py	2011-03-04 11:09:39 +0000
+++ wms/object/warehouse.py	2011-03-15 16:48:33 +0000
@@ -43,11 +43,13 @@
             help='Choose the return 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'),
+        'force_reserved_location': fields.boolean('Force reserved', help='Force move product in reserved location'),
     }
 
     _defaults = {
         'check_tracking_burst': lambda *a: False,
         'keep_missing_product_in': lambda *a: True,
+        'force_reserved_location': lambda *a: False,
     }
 
     def _check_recursion(self, cr, uid, ids):

=== modified file 'wms/view/warehouse.xml'
--- wms/view/warehouse.xml	2011-03-04 11:09:39 +0000
+++ wms/view/warehouse.xml	2011-03-15 16:48:33 +0000
@@ -60,6 +60,7 @@
                                 <separator string="burst" colspan="4"/>
                                 <field name="check_tracking_burst"/>
                                 <field name="keep_missing_product_in" invisible="1"/>
+                                <field name="force_reserved_location"/>
                             </page>
                         </notebook>
                     </xpath>