Merge lp:~inddiana/diana-addons/fix_expired into lp:diana-addons/6.0

[Anthony]

cambios del dia 6/6/2013 entrega de suministros

=== modified file 'supply_control/model/diana_supply.py'
--- supply_control/model/diana_supply.py	2013-04-17 18:31:53 +0000
+++ supply_control/model/diana_supply.py	2013-06-07 16:23:29 +0000
@@ -193,39 +193,33 @@
         print_servers = printers_obj.search(cr, uid, [], context=context)
         read_pserververs = printers_obj.read(cr, uid, print_servers, ['ip_address', 'ssh_port', 'machine_user', 'machine_pass', 'printer_port', 'upload_dir', 'printer_status', 'local_dir', 'file_name'], context)
 
-        for n in self_read:
-            if n['expiration_date'] <= now_str:
-                supply_expiration_write = self.write(cr, uid, n['id'], {'delivery_date': None, 'state': 'Expired', 'delivered': False})
-                message = _("The selected supply has expired. Select another.")
-                self.log(cr, uid, supply_expiration_write, message, context=context)
-            else:
-                for po in self_read:
-                    nombre = self.elimina_tildes(po['employee_id'][1])
-                    recibo = ''
-                    recibo = ['800Autorizacion retiro de dotacion de productos',
-                              '800Corresponde a: ' + str(po['period_id'][1]),
-                              '800Ticket No: ' + str(po['name']),
-                              '800Empleado: ' + str(nombre),
-                              '800Cedula: ' + str(po['employee_code']),
-                              '800Vencimiento: ' + str(n['expiration_date']),
-                              '800<<INTRANSFERIBLE - NO NEGOCIABLE>>',
-                              '810PROTECCION DE PLANTA']
-                for servers in read_pserververs:
-                    frc = fiscalRemoteConn(recibo, servers['ip_address'], servers['ssh_port'], servers['machine_user'], servers['machine_pass'], servers['printer_port'], servers['local_dir'], servers['upload_dir'], servers['file_name'])
-                    frc.create_ticket()
-                    e = frc.transferAndprint()
-                    if e:
-                        raise osv.except_osv(_('Alert !'), _('Connectivity problem. Check parameters!'))
-                context.update({'printer_id': ids})
-                return {
-                    'view_type': 'form',
-                    'view_mode':'form',
-                    'res_model': 'diana.supply.printers.wizard',
-                    'type': 'ir.actions.act_window',
-                    'target': 'new',
-                    'context': context,
-                    'ref': 'sisb_diana_supply_control.printers_wizard_confirm'
-                }
+        for po in self_read:
+            nombre = self.elimina_tildes(po['employee_id'][1])
+            recibo = ''
+            recibo = ['800Autorizacion retiro de dotacion de productos',
+                      '800Corresponde a: ' + str(po['period_id'][1]),
+                      '800Ticket No: ' + str(po['name']),
+                      '800Empleado: ' + str(nombre),
+                      '800Cedula: ' + str(po['employee_code']),
+                      '800Vencimiento: ' + str(po['expiration_date']),
+                      '800<<INTRANSFERIBLE - NO NEGOCIABLE>>',
+                      '810PROTECCION DE PLANTA']
+        for servers in read_pserververs:
+            frc = fiscalRemoteConn(recibo, servers['ip_address'], servers['ssh_port'], servers['machine_user'], servers['machine_pass'], servers['printer_port'], servers['local_dir'], servers['upload_dir'], servers['file_name'])
+            frc.create_ticket()
+            e = frc.transferAndprint()
+            if e:
+                raise osv.except_osv(_('Alert !'), _('Connectivity problem. Check parameters!'))
+        context.update({'printer_id': ids})
+        return {
+            'view_type': 'form',
+            'view_mode':'form',
+            'res_model': 'diana.supply.printers.wizard',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'context': context,
+            'ref': 'sisb_diana_supply_control.printers_wizard_confirm'
+        }
 
 
     def return_to_draft(self, cr, uid, ids, context=None):