Merge lp:~vauxoo/openerp-mexico-localization/7.0-oml_l10n_mx_attachment_try_in_signal_cancel_dev_ernesto into lp:openerp-mexico-localization/7.0

[Luis Ernesto García Medina - http://www.vauxoo.com]

Se agrega un Try para evitar que runbot marque error de open en caso de que una factura no sea cancelada

=== modified file 'l10n_mx_ir_attachment_facturae/ir_attachment_facturae.py'
--- l10n_mx_ir_attachment_facturae/ir_attachment_facturae.py	2013-10-09 23:46:53 +0000
+++ l10n_mx_ir_attachment_facturae/ir_attachment_facturae.py	2013-11-13 00:08:15 +0000
@@ -458,61 +458,67 @@
         return self.write(cr, uid, ids, {'state': 'done'}, context=context)
 
     def signal_cancel(self, cr, uid, ids, context=None):
-        invoice_obj = self.pool.get('account.invoice')
-        attach_obj = self.pool.get('ir.attachment')
-        wf_service = netsvc.LocalService("workflow")
-        inv_cancel_status = False
-        for ir_attach_facturae_mx_id in self.browse(cr, uid, ids, context=context):
-            msj = ''
-            invoice = ir_attach_facturae_mx_id.invoice_id
-            if 'cfdi' in ir_attach_facturae_mx_id.type:
-                if not ir_attach_facturae_mx_id.state in ['cancel', 'draft', 'confirmed']:
-                    type__fc = self.get_driver_fc_cancel()
-                    if ir_attach_facturae_mx_id.type in type__fc.keys():
-                        cfdi_cancel = res = type__fc[ir_attach_facturae_mx_id.type](
-                            cr, uid, [
-                                ir_attach_facturae_mx_id.id], context=context
-                        )
-                        msj += tools.ustr(cfdi_cancel.get('message', False))
-                        # TODO, validate cfdi_cancel True or False
-                        if cfdi_cancel.get('status', True):
-                            wf_service.trg_validate(
-                                uid, self._name, ir_attach_facturae_mx_id.id, 'action_cancel', cr)
-                            if invoice.state != 'cancel':
-                                inv_cancel_status = invoice_obj.action_cancel(
-                                    cr, uid, [invoice.id], context=context)
-                            else:
-                                inv_cancel_status = True
+        try:
+            invoice_obj = self.pool.get('account.invoice')
+            attach_obj = self.pool.get('ir.attachment')
+            wf_service = netsvc.LocalService("workflow")
+            inv_cancel_status = False
+            for ir_attach_facturae_mx_id in self.browse(cr, uid, ids, context=context):
+                msj = ''
+                invoice = ir_attach_facturae_mx_id.invoice_id
+                if 'cfdi' in ir_attach_facturae_mx_id.type:
+                    if not ir_attach_facturae_mx_id.state in ['cancel', 'draft', 'confirmed']:
+                        type__fc = self.get_driver_fc_cancel()
+                        if ir_attach_facturae_mx_id.type in type__fc.keys():
+                            cfdi_cancel = res = type__fc[ir_attach_facturae_mx_id.type](
+                                cr, uid, [
+                                    ir_attach_facturae_mx_id.id], context=context
+                            )
+                            msj += tools.ustr(cfdi_cancel.get('message', False))
+                            # TODO, validate cfdi_cancel True or False
+                            if cfdi_cancel.get('status', True):
+                                wf_service.trg_validate(
+                                    uid, self._name, ir_attach_facturae_mx_id.id, 'action_cancel', cr)
+                                if invoice.state != 'cancel':
+                                    inv_cancel_status = invoice_obj.action_cancel(
+                                        cr, uid, [invoice.id], context=context)
+                                else:
+                                    inv_cancel_status = True
+                        else:
+                            msj += _("Unknow cfdi driver for %s" % (ir_attach_facturae_mx_id.type))
                     else:
-                        msj += _("Unknow cfdi driver for %s" % (ir_attach_facturae_mx_id.type))
+                        wf_service.trg_validate(
+                            uid, self._name, ir_attach_facturae_mx_id.id, 'action_cancel', cr)
+                        if invoice.state != 'cancel':
+                            inv_cancel_status = invoice_obj.action_cancel(
+                                cr, uid, [invoice.id], context=context)
+                        else:
+                            inv_cancel_status = True
+                        msj = 'cancelled'
+                elif 'cfd' in ir_attach_facturae_mx_id.type and not 'cfdi' in ir_attach_facturae_mx_id.type:
+                    wf_service.trg_validate(
+                                    uid, self._name, ir_attach_facturae_mx_id.id, 'action_cancel', cr)
+                    inv_cancel_status = invoice_obj.action_cancel(cr, uid, [invoice.id], context=context)
+                    msj = 'cancelled'
+                    inv_cancel_status = True
+                elif 'cbb' in ir_attach_facturae_mx_id.type:
+                    wf_service.trg_validate(
+                                    uid, self._name, ir_attach_facturae_mx_id.id, 'action_cancel', cr)
+                    inv_cancel_status = invoice_obj.action_cancel(cr, uid, [invoice.id], context=context)
+                    msj = 'cancelled'
+                    inv_cancel_status = True
                 else:
-                    wf_service.trg_validate(
-                        uid, self._name, ir_attach_facturae_mx_id.id, 'action_cancel', cr)
-                    if invoice.state != 'cancel':
-                        inv_cancel_status = invoice_obj.action_cancel(
-                            cr, uid, [invoice.id], context=context)
-                    else:
-                        inv_cancel_status = True
-                    msj = 'cancelled'
-            elif 'cfd' in ir_attach_facturae_mx_id.type and not 'cfdi' in ir_attach_facturae_mx_id.type:
-                wf_service.trg_validate(
-                                uid, self._name, ir_attach_facturae_mx_id.id, 'action_cancel', cr)
-                inv_cancel_status = invoice_obj.action_cancel(cr, uid, [invoice.id], context=context)
-                msj = 'cancelled'
-                inv_cancel_status = True
-            elif 'cbb' in ir_attach_facturae_mx_id.type:
-                wf_service.trg_validate(
-                                uid, self._name, ir_attach_facturae_mx_id.id, 'action_cancel', cr)
-                inv_cancel_status = invoice_obj.action_cancel(cr, uid, [invoice.id], context=context)
-                msj = 'cancelled'
-                inv_cancel_status = True
-            else:
-                raise osv.except_osv(_("Type Electronic Invoice Unknow!"), _(
-                    "The Type Electronic Invoice:" + (ir_attach_facturae_mx_id.type or '')))
-            self.write(cr, uid, ids, {
-                       'last_date': time.strftime('%Y-%m-%d %H:%M:%S'),
-                       'msj': msj,
-                       })
+                    raise osv.except_osv(_("Type Electronic Invoice Unknow!"), _(
+                        "The Type Electronic Invoice:" + (ir_attach_facturae_mx_id.type or '')))
+                self.write(cr, uid, ids, {
+                           'last_date': time.strftime('%Y-%m-%d %H:%M:%S'),
+                           'msj': msj,
+                           })
+        except Exception, e:
+            error = tools.ustr( traceback.format_exc() )
+            self.write(cr, uid, ids, {'msj': error}, context=context)
+            _logger.error( error )
+            return False
         return inv_cancel_status
 
     def action_cancel(self, cr, uid, ids, context=None):