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

[Christophe CHAUVET]

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

227. By Christophe CHAUVET on 2011-05-07

merge

[Christophe CHAUVET (christophe-chauvet)]

ok

review: Approve

=== modified file 'wms_inventory/object/inventory.py'
--- wms_inventory/object/inventory.py	2011-03-25 11:39:15 +0000
+++ wms_inventory/object/inventory.py	2011-05-07 15:36:33 +0000
@@ -32,6 +32,7 @@
 import time
 import tempfile
 import base64
+import time
 
 
 class Inventory(osv.osv):
@@ -42,11 +43,13 @@
             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'),
+        'state': fields.selection([('draft', 'Draft'), ('progress', 'Progress'), ('done', 'Done')], 'Status', readonly=True),
     }
 
     _defaults = {
         'type': lambda *a: 'partial',
         'warehouse_id': lambda obj, cr, uid, context: obj.pool.get('res.users')._default_warehouse(cr, uid, context),
+        'state': lambda *a: 'draft',
     }
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -64,6 +67,9 @@
         """
         Validate the inventory, it take a lot of time and must be launch in multi thread
         """
+        if context is None:
+            context = {}
+
         def threading_done(cr, uid, ids, context=None):
             """
             Treatment launch as a new thread
@@ -242,7 +248,7 @@
                 vals = {
                     'datas': base64.encodestring(outfp.read()),
                     'datas_fname': 'inv_%s.log' % inv.name.replace(' ', '_'),
-                    'name': 'INV %s' % inv.name,
+                    'name': 'INV %s' % inv.name + ' [' +  time.strftime('%Y%m%d%H%M%S') + ']',
                     'res_model': 'stock.inventory',
                     'res_id': inv.id,
                 }
@@ -254,6 +260,8 @@
             logger.notifyChannel('wms_inventory', netsvc.LOG_INFO, '[%s] End compute the inventory ***********' % cr.dbname)
             return True
 
+        # change state fo progress
+        self.write(cr, uid, ids, {'state': 'progress'}, context=context)
         thread.start_new_thread(threading_done, (cr, uid, ids, context))
         return True
 
@@ -271,12 +279,12 @@
     def on_change_product_id(self, cr, uid, ids, location_id, product, uom=False):
         if not product:
             return {}
+
         if not uom:
             prod = self.pool.get('product.product').browse(cr, uid, [product], {'uom': uom})[0]
             uom = prod.uom_id.id
-        #amount = self.pool.get('stock.location')._product_get(cr, uid, location_id, [product], {'uom': uom})[product]
-        result = {'product_uom': uom}
-        return {'value': result}
+
+        return {'value': {'product_uom': uom}}
 
 InventoryLine()