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

[Christophe CHAUVET]

[Christophe CHAUVET (christophe-chauvet)]

ok

review: Approve

=== modified file 'wms/object/move.py'
--- wms/object/move.py	2011-08-04 13:44:16 +0000
+++ wms/object/move.py	2011-08-25 12:59:23 +0000
@@ -149,7 +149,7 @@
 
             # GR: moves related to internal pickings have nothing to do
             # with the total amount of product.
-            if ( (not move.picking_id or move.picking_id.type != 'internal')
+            if ((not move.picking_id or move.picking_id.type != 'internal')
                  and move.product_id.qty_physical <= 0):
                     continue
 

=== modified file 'wms/object/warehouse.py'
--- wms/object/warehouse.py	2011-08-04 13:44:16 +0000
+++ wms/object/warehouse.py	2011-08-25 12:59:23 +0000
@@ -44,7 +44,7 @@
         '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'),
-        'forbid_unsupplied_internal_move' : fields.boolean('Forbid unsupplied internal', help="Prevent internal moves with not enough stock level"),
+        'forbid_unsupplied_internal_move': fields.boolean('Forbid unsupplied internal', help="Prevent internal moves with not enough stock level"),
     }
 
     _defaults = {

=== modified file 'wms_location/object/location.py'
--- wms_location/object/location.py	2011-07-18 12:24:41 +0000
+++ wms_location/object/location.py	2011-08-25 12:59:23 +0000
@@ -164,7 +164,7 @@
         arg_query4 = [tuple(loc_ids)]
         sql_query4 = """SELECT coalesce(sum(m14.product_qty), 0)
         FROM   stock_move m14
-        WHERE  m14.state= m0.state
+        WHERE  m14.state IN ('done', 'assigned')
         AND    m14.product_id = m0.product_id
         AND    m14.location_id = m0.location_dest_id
         AND    m14.location_dest_id not in %s"""

=== modified file 'wms_scanner/hardware/datalogic/PowerScan/hardware.py'
--- wms_scanner/hardware/datalogic/PowerScan/hardware.py	2011-08-17 10:02:40 +0000
+++ wms_scanner/hardware/datalogic/PowerScan/hardware.py	2011-08-25 12:59:23 +0000
@@ -146,7 +146,7 @@
                     scan_state = self.oerp_hwd.scanner_check(scan)
                 except Exception:
                     act = 'M'
-                    rec_oerp = [self._str_center('Please contact'), self._str_center('your'), self._str_center('adminitrator')]
+                    rec_oerp = [self._str_center('Terminal'), self._str_center(scan), self._str_center('not exists!')]
                     self.log_info(scan, 'This scanner is not declare on OpenERP')
                     self._choice(scan, act, rec_oerp, c)
                     continue

=== modified file 'wms_scanner/object/scanner.py'
--- wms_scanner/object/scanner.py	2011-08-23 07:27:37 +0000
+++ wms_scanner/object/scanner.py	2011-08-25 12:59:23 +0000
@@ -66,6 +66,7 @@
 
 ScannerScenario()
 
+
 class ScannerScenarioCustom(osv.osv):
     _name = 'scanner.scenario.custom'
     _description = 'Tempori value for scenario'
@@ -114,22 +115,41 @@
          'text_val': lambda *a: '',
     }
 
-
-    def _get_values(self, cr, uid, scenario_id, scanner_id, model='', res_id=None, domain=[], context=None):
+    def _get_values(self, cr, uid, scenario_id, scanner_id, model='', res_id=None, domain=None, context=None):
         """
         return read customs line
+        @param domain : list of tuple for search method
         """
-        domain.extend([('scenario_id', '=', scenario_id), ('scanner_id', '=', scanner_id)])
+        if domain is None:
+            domain = [('scenario_id', '=', scenario_id), ('scanner_id', '=', scanner_id)]
+        else:
+            domain.extend([('scenario_id', '=', scenario_id), ('scanner_id', '=', scanner_id)])
         if model:
             domain.append(('model', '=', model))
         if res_id:
             domain.append(('res_id', '=', res_id))
+        print domain
         ids = self.search(cr, uid, domain, context=context)
+        print ids
         if ids:
             return self.read(cr, uid, ids, [], context=context)
         return []
 
-
+    def _set_values(self, cr, uid, values, context=None):
+        """
+        values is a dict read. get id in values and delete of dict unchanging field
+        """
+        vals = values.copy()
+        ids = [vals.get('id')]
+        try:
+            del vals['id']
+            del vals['scenario_id']
+            del vals['scanner_id']
+            del vals['model']
+            del vals['res_id']
+        except:
+            pass
+        return self.write(cr, uid, ids, vals, context=context)
 
     def _remove_values(self, cr, uid, scenario_id, scanner_id, context=None):
         """
@@ -310,7 +330,8 @@
         """
         custom_obj = self.pool.get('scanner.scenario.custom')
         for read in self.read(cr, uid, ids, ['scenario_id'], context=context):
-            custom_obj._remove_values(cr, uid, read['scenario_id'][0], read['id'], context=context)
+            if read.get('scenario_id'):
+                custom_obj._remove_values(cr, uid, read['scenario_id'][0], read['id'], context=context)
         self.write(cr, uid, ids, {'scenario_id': False, 'step_id': False, 'ref_doc': 0, 'tmp_val1': '', 'tmp_val2': '', 'tmp_val3': '', 'tmp_val4': '', 'tmp_val5': ''}, context=context)
         return True
 
@@ -397,6 +418,7 @@
                     'pool': self.pool,
                     'uid': uid,
                     'message': message,
+                    't': term.browse(cr, uid, term_id, context=context),
                 }
                 expr = eval(str(transition.condition), cxt)
 

=== modified file 'wms_wave/object/stock.py'
--- wms_wave/object/stock.py	2011-08-24 20:45:55 +0000
+++ wms_wave/object/stock.py	2011-08-25 12:59:23 +0000
@@ -60,7 +60,7 @@
                 ('cancel', 'Cancel'),
             ], 'State', readonly=True, help="State of the current Wave"),
         'date_confirm': fields.datetime('Date Confirm', states={'cancel': [('readonly', True)]}, help="Date when wave have been confirmed"),
-        'picking_ids': fields.one2many('stock.picking', 'wave_id', 'Pickings', domain=[('type', '=', 'out'), ('state', 'in', ['assigned', 'confirmed']), ('wave_id', '=', False)],
+        'picking_ids': fields.one2many('stock.picking', 'wave_id', 'Pickings', domain=[('type', '=', 'out'), ('state', '=', 'assigned'), ('wave_id', '=', False)],
             states={
                 'draft': [('readonly', False)],
                 'confirmed': [('readonly', True)],
@@ -113,7 +113,7 @@
         picking_ids = stock_picking_obj.search(cr, uid, [('wave_id', 'in', ids)], context=context)
         # release picking
         if picking_ids:
-            self.pool.get('stock.picking').write(cr, uid, picking_ids, {'wave_id': False}, context=context)
+            self.pool.get('stock.picking').write(cr, uid, picking_ids, {'wave_id': False, 'wave_cart_id': False}, context=context)
         return self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
 
     def action_done(self, cr, uid, ids, context=None):
@@ -126,7 +126,7 @@
         picking_ids = stock_picking_obj.search(cr, uid, [('wave_id', 'in', ids), ('state', '!=', 'done')], context=context)
         # release picking
         if picking_ids:
-            self.pool.get('stock.picking').write(cr, uid, picking_ids, {'wave_id': False}, context=context)
+            self.pool.get('stock.picking').write(cr, uid, picking_ids, {'wave_id': False, 'wave_cart_id': False}, context=context)
         return self.write(cr, uid, ids, {'state': 'done'}, context=context)
 
     def create(self, cr, uid, values, context=None):
@@ -178,6 +178,16 @@
             self.write(cr, uid, [id], vals, context=context)
         return wave_id, name, seq
 
+    def unlink(self, cr, uid, ids, context=None):
+        """
+        delete unlink wave_cart_id
+        """
+        picking_ids = []
+        for wave in self.browse(cr, uid, ids, context=context):
+            picking_ids.extend([p.id for p in wave.picking_ids])
+        self.pool.get('stock.picking').write(cr, uid, picking_ids, {'wave_cart_id': False}, context=context)
+        return super(StockWave, self).unlink(cr, uid, ids, context=context)
+
     #########################################################################################
     # function call by wizard: can be easier inherit
     #########################################################################################
@@ -185,7 +195,7 @@
         """
         This method is called by wizard to search the picking to use to make wave
         """
-        return self.pool.get('stock.picking').search(cr, uid, [('type', '=', 'out'), ('wave_id', '=', False), ('state', 'in', ['confirmed', 'assigned'])], context=context)
+        return self.pool.get('stock.picking').search(cr, uid, [('type', '=', 'out'), ('wave_id', '=', False), ('state', '=', 'assigned')], context=context)
 
     def wizard_assign_picking_in_wave(self, cr, uid, picking_ids, context=None):
         """