avanzosc team mailing list archive

["Daniel Campos \(Avanzosc\)" <danielcampos@xxxxxxxxxxx>]

Daniel Campos (Avanzosc) has proposed merging lp:~dani-ds/avanzosc/dos_production_lot_additional_info into lp:~avanzosc-security-team/avanzosc/72horas.

Requested reviews:
  Avanzosc_security (avanzosc-security-team)

For more details, see:
https://code.launchpad.net/~dani-ds/avanzosc/dos_production_lot_additional_info/+merge/223383

dos_production_lot_additional_info
-- 
https://code.launchpad.net/~dani-ds/avanzosc/dos_production_lot_additional_info/+merge/223383
Your team Avanzosc_security is requested to review the proposed merge of lp:~dani-ds/avanzosc/dos_production_lot_additional_info into lp:~avanzosc-security-team/avanzosc/72horas.

=== added directory 'dos_production_lot_additional_info/models'
=== renamed file 'dos_production_lot_additional_info/stock_production_lot.py' => 'dos_production_lot_additional_info/models/stock_production_lot.py'
--- dos_production_lot_additional_info/stock_production_lot.py	2014-06-11 10:23:47 +0000
+++ dos_production_lot_additional_info/models/stock_production_lot.py	2014-06-17 10:51:26 +0000
@@ -19,85 +19,72 @@
 #
 ##############################################################################
 
-from osv import fields,osv
-import tools
-import pooler
+from openerp.osv import fields, orm
+# import tools
+# import pooler
 import re
-from tools.translate import _
-
-class stock_production_lot(osv.osv):
-
-    _name = 'stock.production.lot'
+# from openerp.tools.translate import _
+
+
+class StockProductionLot(orm.Model):
     _inherit = 'stock.production.lot'
-    
-    
-    def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=100):
+
+    def name_search(self, cr, user, name='', args=None, operator='ilike',
+                    context=None, limit=100):
         if not args:
-            args=[]
+            args = []
         if name:
-            ids = self.search(cr, user, ['|',('name',operator,name),('ref',operator,name)] + args, limit=limit, context=context)
-            
-            if not len(ids):
-                ids = self.search(cr, user, [('telefono','=',name)]+ args, limit=limit, context=context)
-            if not len(ids):
-               ptrn=re.compile('(\[(.*?)\])')
-               res = ptrn.search(name)
-               if res:
-                   ids = self.search(cr, user, [('name','=', res.group(2))] + args, limit=limit, context=context)
+            ids = self.search(cr, user, ['|', ('name', operator, name),
+                                         ('ref', operator, name)] +
+                              args, limit=limit, context=context)
+            if not len(ids):
+                ids = self.search(cr, user, [('telefono', '=', name)] + args,
+                                  limit=limit, context=context)
+            if not len(ids):
+                ptrn = re.compile('(\[(.*?)\])')
+                res = ptrn.search(name)
+                if res:
+                    ids = self.search(cr, user, [('name', '=', res.group(2))] +
+                                      args, limit=limit, context=context)
         else:
             ids = self.search(cr, user, args, limit=limit, context=context)
-            
         return self.name_get(cr, user, ids, context=context)
-    
-       
+
     _columns = {
-        'icc' : fields.char('ICC', size=64),
-        'telefono' : fields.char('Teléfono', size=20),
-        'pin' : fields.char('Número PIN', size=4),
-        'puk' : fields.char('Número PUK', size=8),
-        'fecha_alta' : fields.date('Fecha Alta'),
-        'operador' : fields.char('Operador', size=64),
+        'icc': fields.char('ICC', size=64),
+        'telefono': fields.char('Teléfono', size=20),
+        'pin': fields.char('Número PIN', size=4),
+        'puk': fields.char('Número PUK', size=8),
+        'fecha_alta': fields.date('Fecha Alta'),
+        'operador': fields.char('Operador', size=64),
         'descripcion': fields.char('Descripción', size=128),
-        'ref_cliente' : fields.char('Ref. Cliente', size=64),
-        'albaran_entrada' : fields.char('Albarán Entrada', size=64),
-        'imei' : fields.char('IMEI', size=15),
-        'n_serie' : fields.char('Núm. Serie', size=64),
-        'tipo_enlace' : fields.char('Tipo Enlace', size=64),
-        'fecha_compra' : fields.date('Fecha Compra'),
-        'precio' : fields.float('Precio'),
-        'precio_subvencionado' : fields.float('Precio Subvencionado'),
-        'propietario' : fields.char('Propietario', size=64),
-        'activo' : fields.boolean('Activo'),
-        'fecha_activacion' : fields.date('Fecha Activación'),
-        'fecha_baja' : fields.date('Fecha Baja'),
+        'ref_cliente': fields.char('Ref. Cliente', size=64),
+        'albaran_entrada': fields.char('Albarán Entrada', size=64),
+        'imei': fields.char('IMEI', size=15),
+        'n_serie': fields.char('Núm. Serie', size=64),
+        'tipo_enlace': fields.char('Tipo Enlace', size=64),
+        'fecha_compra': fields.date('Fecha Compra'),
+        'precio': fields.float('Precio'),
+        'precio_subvencionado': fields.float('Precio Subvencionado'),
+        'propietario': fields.char('Propietario', size=64),
+        'activo': fields.boolean('Activo'),
+        'fecha_activacion': fields.date('Fecha Activación'),
+        'fecha_baja': fields.date('Fecha Baja'),
         'observaciones': fields.text('Observaciones'),
     }
-    
-    
+
     def create(self, cr, user, vals, context=None):
-        
         if 'product_id' in vals and vals['product_id']:
-            
-            product_obj = self.pool.get('product.product')
+            product_obj = self.pool['product.product']
             product = product_obj.browse(cr, user, vals['product_id'])
-            
-            if product_obj._is_sim(product.categ_id) or product_obj._is_pack(product.categ_id):
+            categ_id = product.categ_id
+            if product_obj._is_sim(categ_id) or product_obj._is_pack(categ_id):
                 vals['ref'] = ('telefono' in vals) and vals['telefono'] or None
-            
-        return super(stock_production_lot, self).create(cr, user, vals, context)
-    
-    
+        return super(StockProductionLot, self).create(cr, user, vals,
+                                                      context=context)
+
     def write(self, cr, uid, ids, vals, context=None):
-        
         if not ('ref' in vals) and 'telefono' in vals:
             vals['ref'] = vals['telefono']
-                
-        return super(stock_production_lot, self).write(cr, uid, ids, vals, context=context)
-    
-
-stock_production_lot()
-
-
-
-
-
+        return super(StockProductionLot, self).write(cr, uid, ids, vals,
+                                                     context=context)

=== added directory 'dos_production_lot_additional_info/views'
=== renamed file 'dos_production_lot_additional_info/stock_production_lot_view.xml' => 'dos_production_lot_additional_info/views/stock_production_lot_view.xml'