Merge lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_facturae_mx-remove_cr_commit_dev_carlos-ref-moy into lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_facturae_mx-remove_cr_commit_dev_carlos

[Moisés López - http://www.vauxoo.com]

Refactory and changes for multi-driver and test

=== modified file 'l10n_mx_facturae/invoice.py'
--- l10n_mx_facturae/invoice.py	2013-08-16 19:13:46 +0000
+++ l10n_mx_facturae/invoice.py	2013-08-25 06:44:24 +0000
@@ -457,7 +457,7 @@
                 cr, uid, sequence_app_id[0], context=context).type
         if invoice_datetime < '2012-07-01 00:00:00':
             return file_globals
-        elif type_inv == 'cfd22':
+        elif 'cfd' in type_inv and not 'cfdi' in type_inv:
             # Search char "," for addons_path, now is multi-path
             all_paths = tools.config["addons_path"].split(",")
             for my_path in all_paths:
@@ -467,7 +467,7 @@
                         my_path, 'l10n_mx_facturae', 'SAT',
                         'cadenaoriginal_2_2_l.xslt') or ''
                     break
-        elif type_inv == 'cfdi32':
+        elif 'cfdi' in type_inv:
             # Search char "," for addons_path, now is multi-path
             all_paths = tools.config["addons_path"].split(",")
             for my_path in all_paths:

=== modified file 'l10n_mx_facturae/test/account_invoice_cfd.yml'
--- l10n_mx_facturae/test/account_invoice_cfd.yml	2013-08-23 23:07:47 +0000
+++ l10n_mx_facturae/test/account_invoice_cfd.yml	2013-08-25 06:44:24 +0000
@@ -11,7 +11,7 @@
     name: 'Test cfd Customer Invoice'
     invoice_line:
       - product_id: product.product_product_5
-        quantity: 20.0
+        quantity: 22.0
 -
   I rewrite the journal field (BUG I need overwrite two times this field for done! only in test yaml)
 -
@@ -40,12 +40,39 @@
   I confirm l10n_mx attachment facturae cfd by clicking on confirm button
 -
   !python {model: ir.attachment.facturae.mx}: |
-    import netsvc
+    import netsvc, tools, os, base64
     wf_service = netsvc.LocalService("workflow")
     cfd_ids = self.search(cr, uid, [('invoice_id', '=', ref("account_invoice_cfd0") ), ('state', '<>', 'cancel')], limit=1)
     cfd_id = cfd_ids and cfd_ids[0] or False
     if cfd_id:
-        wf_service.trg_validate(uid, 'ir.attachment.facturae.mx', cfd_id, 'action_confirm', cr)
+        cfd = self.browse(cr, uid, [cfd_id])[0]
+        self.signal_confirm(cr, uid , cfd_ids ,context=context)
+        print "cfd_state",cfd.state
+        print "cfd_msj",cfd.msj
+        state = cfd.state
+-
+  I check that the state in l10n_mx attachment facturae cfd is "Confirmed"
+-
+  !python {model: ir.attachment.facturae.mx}: |
+    import netsvc, tools, os, base64
+    cfd_ids = self.search(cr, uid, [('invoice_id', '=', ref("account_invoice_cfd0") ), ('state', '<>', 'cancel')], limit=1)
+    cfd_id = cfd_ids and cfd_ids[0] or False
+    state = 'no attach file'
+    if cfd_id:
+        cfd = self.browse(cr, uid, [cfd_id])[0]
+        print "cfd_state",cfd.state
+        print "cfd_msj",cfd.msj
+        state = cfd.state
+        ir_attach_facturae_mx = cfd.file_input and cfd.file_input or False
+        fdata = ir_attach_facturae_mx and ir_attach_facturae_mx.db_datas or False
+        if fdata:
+            if tools.config['test_report_directory']:
+                open(os.path.join(tools.config['test_report_directory'], 'l10n_mx_facturae' + '_' + \
+                  'account_invoice_cfd0' + '_' + 'confirmed' + '-' + ir_attach_facturae_mx.datas_fname)\
+                  , 'wb+').write( base64.decodestring( fdata ) )
+        else:
+            state = 'no data in attach file'
+    assert state=='confirmed', 'No confirmed state l10n_mx attachment facturae cfd'
 -
   I sign l10n_mx attachment facturae cfd by clicking on sign button
 -
@@ -55,17 +82,33 @@
     cfd_ids = self.search(cr, uid, [('invoice_id', '=', ref("account_invoice_cfd0") ), ('state', '<>', 'cancel')], limit=1)
     cfd_id = cfd_ids and cfd_ids[0] or False
     if cfd_id:
-        wf_service.trg_validate(uid, 'ir.attachment.facturae.mx', cfd_id, 'action_sign', cr)
+        cfd = self.browse(cr, uid, [cfd_id], context=context)[0]
+        self.signal_sign(cr, uid, cfd_ids, context=context)
+        print "cfd_state",cfd.state
+        print "cfd_msj",cfd.msj
+        state = cfd.state
 -
   I check that the state in l10n_mx attachment facturae cfd is "Signed"
 -
   !python {model: ir.attachment.facturae.mx}: |
+    import netsvc, tools, os, base64
     cfd_ids = self.search(cr, uid, [('invoice_id', '=', ref("account_invoice_cfd0") ), ('state', '<>', 'cancel')], limit=1)
-    cfd_id = cfd_ids and cfd_ids[0] or False
-    state = None
+    cfd_id = len(cfd_ids) and cfd_ids[0] or False
+    state = 'no attach file'
     if cfd_id:
-        cfd = self.browse(cr, uid, [cfd_id])[0]
+        cfd = self.browse(cr, uid, [cfd_id], context=context)[0]
         state = cfd.state
+        ir_attach_facturae_mx = cfd.file_xml_sign and cfd.file_xml_sign or False
+        fdata = ir_attach_facturae_mx and ir_attach_facturae_mx.db_datas or False
+        if fdata:
+            state = cfd.state
+            if tools.config['test_report_directory']:
+                open(os.path.join(tools.config['test_report_directory'], 'l10n_mx_facturae' + '_' + \
+                  'account_invoice_cfd0' + '_' + 'signed' + '-' + ir_attach_facturae_mx.datas_fname),\
+                  'wb+').write( base64.decodestring( fdata ) )
+        else:
+            state = 'no data in attach file'
+    print "state",state
     assert state=='signed', 'No signed state l10n_mx attachment facturae cfd'
 -
   I generate a printable l10n_mx attachment facturae cfd by clicking on printable button
@@ -76,17 +119,32 @@
     cfd_ids = self.search(cr, uid, [('invoice_id', '=', ref("account_invoice_cfd0") ), ('state', '<>', 'cancel')], limit=1)
     cfd_id = cfd_ids and cfd_ids[0] or False
     if cfd_id:
-        wf_service.trg_validate(uid, 'ir.attachment.facturae.mx', cfd_id, 'action_printable', cr)
+        cfd = self.browse(cr, uid, [cfd_id])[0]
+        self.signal_printable(cr, uid , cfd_ids ,context=context)
+        print "cfd_state",cfd.state
+        print "cfd_msj",cfd.msj
+        state = cfd.state
 -
   I check that the state in l10n_mx attachment facturae cfd is Printable
 -
   !python {model: ir.attachment.facturae.mx}: |
+    import netsvc, tools, os, base64
     cfd_ids = self.search(cr, uid, [('invoice_id', '=', ref("account_invoice_cfd0") ), ('state', '<>', 'cancel')], limit=1)
     cfd_id = cfd_ids and cfd_ids[0] or False
     state = None
+    state = 'no attach file'
     if cfd_id:
-        cfd = self.browse(cr, uid, [cfd_id])[0]
-        state = cfd.state
+        cfd = self.browse(cr, uid, [cfd_id], context=context)[0]
+        ir_attach_facturae_mx = cfd.file_pdf and cfd.file_pdf or False
+        fdata = ir_attach_facturae_mx and ir_attach_facturae_mx.db_datas or False
+        if fdata:
+            state = cfd.state
+            if tools.config['test_report_directory']:
+                open(os.path.join(tools.config['test_report_directory'], 'l10n_mx_facturae' + '_' + \
+                  'account_invoice_cfd0' + '_' + 'printable' + '-' + ir_attach_facturae_mx.datas_fname),\
+                  'wb+').write( base64.decodestring( fdata ) )
+        else:
+            state = 'no data in attach file'
     assert state=='printable', 'No printable state l10n_mx attachment facturae cfd'
 -
   I added update_posted in journal
@@ -102,7 +160,7 @@
     cfd_id = cfd_ids and cfd_ids[0] or False
     if cfd_id:
         self.signal_cancel(cr, uid , cfd_ids ,context=context)
-        cfd= self.browse(cr, uid, [cfd_id])[0]
+        cfd = self.browse(cr, uid, [cfd_id])[0]
         state = cfd.state
     assert state=='cancel', 'No cancel state l10n_mx attachment facturae cfd'
 -
@@ -115,4 +173,3 @@
 -
   !assert {model: account.invoice, id: account_invoice_cfd0}:
     - move_id.name == None
-

=== modified file 'l10n_mx_facturae_cbb/test/account_invoice_cbb.yml'
--- l10n_mx_facturae_cbb/test/account_invoice_cbb.yml	2013-08-23 23:07:47 +0000
+++ l10n_mx_facturae_cbb/test/account_invoice_cbb.yml	2013-08-25 06:44:24 +0000
@@ -1,5 +1,5 @@
 -
-  To test the Mexican Electronic Invoice CBB
+  To test the Mexican Electronic Invoice cbb
 -
   I create a cbb customer invoice
 -
@@ -40,12 +40,40 @@
   I confirm l10n_mx attachment facturae cbb by clicking on confirm button
 -
   !python {model: ir.attachment.facturae.mx}: |
-    import netsvc
+    import netsvc, tools, os, base64
     wf_service = netsvc.LocalService("workflow")
     cbb_ids = self.search(cr, uid, [('invoice_id', '=', ref("account_invoice_cbb0") ), ('state', '<>', 'cancel')], limit=1)
     cbb_id = cbb_ids and cbb_ids[0] or False
     if cbb_id:
-        wf_service.trg_validate(uid, 'ir.attachment.facturae.mx', cbb_id, 'action_confirm', cr)
+        cbb = self.browse(cr, uid, [cbb_id])[0]
+        self.signal_confirm(cr, uid , cbb_ids ,context=context)
+        print "cbb_state",cbb.state
+        print "cbb_msj",cbb.msj
+        state = cbb.state
+-
+  I check that the state in l10n_mx attachment facturae cbb is "Confirmed"
+-
+  !python {model: ir.attachment.facturae.mx}: |
+    import netsvc, tools, os, base64
+    cbb_ids = self.search(cr, uid, [('invoice_id', '=', ref("account_invoice_cbb0") ), ('state', '<>', 'cancel')], limit=1)
+    cbb_id = cbb_ids and cbb_ids[0] or False
+    state = 'no attach file'
+    if cbb_id:
+        cbb = self.browse(cr, uid, [cbb_id])[0]
+        print "cbb_state",cbb.state
+        print "cbb_msj",cbb.msj
+        state = cbb.state
+        #This state no generate a new attch
+        #ir_attach_facturae_mx = cbb.file_input and cbb.file_input or False
+        #fdata = ir_attach_facturae_mx and ir_attach_facturae_mx.db_datas or False
+        #if fdata:
+            #if tools.config['test_report_directory']:
+                #open(os.path.join(tools.config['test_report_directory'], 'l10n_mx_facturae_cbb' + '_' + \
+                  #'account_invoice_cbb0' + '_' + 'confirmed' + '-' + ir_attach_facturae_mx.datas_fname)\
+                  #, 'wb+').write( base64.decodestring( fdata ) )
+        #else:
+            #state = 'no data in attach file'
+    assert state=='confirmed', 'No confirmed state l10n_mx attachment facturae cbb'
 -
   I sign l10n_mx attachment facturae cbb by clicking on sign button
 -
@@ -55,17 +83,32 @@
     cbb_ids = self.search(cr, uid, [('invoice_id', '=', ref("account_invoice_cbb0") ), ('state', '<>', 'cancel')], limit=1)
     cbb_id = cbb_ids and cbb_ids[0] or False
     if cbb_id:
-        wf_service.trg_validate(uid, 'ir.attachment.facturae.mx', cbb_id, 'action_sign', cr)
+        cbb = self.browse(cr, uid, [cbb_id], context=context)[0]
+        self.signal_sign(cr, uid, cbb_ids, context=context)
+        print "cbb_state",cbb.state
+        print "cbb_msj",cbb.msj
+        state = cbb.state
 -
   I check that the state in l10n_mx attachment facturae cbb is "Signed"
 -
   !python {model: ir.attachment.facturae.mx}: |
+    import netsvc, tools, os, base64
     cbb_ids = self.search(cr, uid, [('invoice_id', '=', ref("account_invoice_cbb0") ), ('state', '<>', 'cancel')], limit=1)
-    cbb_id = cbb_ids and cbb_ids[0] or False
-    state = None
+    cbb_id = len(cbb_ids) and cbb_ids[0] or False
+    state = 'no attach file'
     if cbb_id:
-        cbb = self.browse(cr, uid, [cbb_id])[0]
+        cbb = self.browse(cr, uid, [cbb_id], context=context)[0]
         state = cbb.state
+        ir_attach_facturae_mx = cbb.file_xml_sign and cbb.file_xml_sign or False
+        fdata = ir_attach_facturae_mx and ir_attach_facturae_mx.db_datas or False
+        #~ if fdata:
+            #~ if tools.config['test_report_directory']:
+                #~ open(os.path.join(tools.config['test_report_directory'], 'l10n_mx_facturae_cbb' + '_' + \
+                  #~ 'account_invoice_cbb0' + '_' + 'signed' + '-' + ir_attach_facturae_mx.datas_fname),\
+                  #~ 'wb+').write( base64.decodestring( fdata ) )
+        #~ else:
+            #~ state = 'no data in attach file'
+    print "state",state
     assert state=='signed', 'No signed state l10n_mx attachment facturae cbb'
 -
   I generate a printable l10n_mx attachment facturae cbb by clicking on printable button
@@ -76,17 +119,32 @@
     cbb_ids = self.search(cr, uid, [('invoice_id', '=', ref("account_invoice_cbb0") ), ('state', '<>', 'cancel')], limit=1)
     cbb_id = cbb_ids and cbb_ids[0] or False
     if cbb_id:
-        wf_service.trg_validate(uid, 'ir.attachment.facturae.mx', cbb_id, 'action_printable', cr)
+        cbb = self.browse(cr, uid, [cbb_id])[0]
+        self.signal_printable(cr, uid , cbb_ids ,context=context)
+        print "cbb_state",cbb.state
+        print "cbb_msj",cbb.msj
+        state = cbb.state
 -
   I check that the state in l10n_mx attachment facturae cbb is Printable
 -
   !python {model: ir.attachment.facturae.mx}: |
+    import netsvc, tools, os, base64
     cbb_ids = self.search(cr, uid, [('invoice_id', '=', ref("account_invoice_cbb0") ), ('state', '<>', 'cancel')], limit=1)
     cbb_id = cbb_ids and cbb_ids[0] or False
     state = None
+    state = 'no attach file'
     if cbb_id:
-        cbb = self.browse(cr, uid, [cbb_id])[0]
+        cbb = self.browse(cr, uid, [cbb_id], context=context)[0]
+        ir_attach_facturae_mx = cbb.file_pdf and cbb.file_pdf or False
+        fdata = ir_attach_facturae_mx and ir_attach_facturae_mx.db_datas or False
         state = cbb.state
+        if fdata:
+            if tools.config['test_report_directory']:
+                open(os.path.join(tools.config['test_report_directory'], 'l10n_mx_facturae_cbb' + '_' + \
+                  'account_invoice_cbb0' + '_' + 'printable' + '-' + ir_attach_facturae_mx.datas_fname),\
+                  'wb+').write( base64.decodestring( fdata ) )
+        else:
+            state = 'no data in attach file'
     assert state=='printable', 'No printable state l10n_mx attachment facturae cbb'
 -
   I added update_posted in journal

=== modified file 'l10n_mx_facturae_pac/invoice.py'
--- l10n_mx_facturae_pac/invoice.py	2013-07-18 23:34:53 +0000
+++ l10n_mx_facturae_pac/invoice.py	2013-08-25 06:44:24 +0000
@@ -55,7 +55,7 @@
             type_inv = ir_seq_app_obj.browse(
                 cr, uid, sequence_app_id[0], context=context).type
         for data in datas:
-            if type_inv == 'cfdi32':
+            if 'cfdi' in type_inv:
                 comprobante = data['Comprobante']
                 rfc = comprobante['Emisor']['rfc']
                 nombre = comprobante['Emisor']['nombre']
@@ -113,7 +113,7 @@
         if sequence_app_id:
             type_inv = ir_seq_app_obj.browse(
                 cr, uid, sequence_app_id[0], context=context).type
-        if type_inv == 'cfdi32':
+        if 'cfdi' in type_inv:
             comprobante = 'cfdi:Comprobante'
             emisor = 'cfdi:Emisor'
             receptor = 'cfdi:Receptor'

=== modified file 'l10n_mx_facturae_pac_sf/demo/l10n_mx_facturae_seq_demo.xml'
--- l10n_mx_facturae_pac_sf/demo/l10n_mx_facturae_seq_demo.xml	2013-08-24 21:10:22 +0000
+++ l10n_mx_facturae_pac_sf/demo/l10n_mx_facturae_seq_demo.xml	2013-08-25 06:44:24 +0000
@@ -19,7 +19,7 @@
             <field name="approval_year" eval="time.strftime('%Y')"/>
             <field name="number_start">1</field>
             <field name="number_end">9999</field>
-            <field name="type">cfdi32</field>
+            <field name="type">cfdi32_pac_sf</field>
         </record>
 
         <record id="l10n_mx_cfdi_pac_sf_journal_0" model="account.journal">

=== modified file 'l10n_mx_facturae_pac_sf/invoice.py'
--- l10n_mx_facturae_pac_sf/invoice.py	2013-08-16 15:09:57 +0000
+++ l10n_mx_facturae_pac_sf/invoice.py	2013-08-25 06:44:24 +0000
@@ -48,11 +48,6 @@
 import pytz
 import time
 from datetime import datetime, timedelta
-try:
-    from SOAPpy import WSDL
-except:
-    print "Package SOAPpy missed"
-    pass
 import time
 
 
@@ -243,7 +238,7 @@
         if sequence_app_id:
             type_inv = ir_seq_app_obj.browse(
                 cr, uid, sequence_app_id[0], context=context).type
-        if type_inv == 'cfdi32':
+        if 'cfdi' in type_inv:
             comprobante = 'cfdi:Comprobante'
         else:
             comprobante = 'Comprobante'
@@ -268,144 +263,7 @@
             a = timezone_original + ((
                 timezone_present + timezone_original)*-1)
         return a
-
-    def _upload_ws_file(self, cr, uid, inv_ids, fdata=None, context={}):
-        """
-        @params fdata : File.xml codification in base64
-        """
-        comprobante = self._get_type_sequence(
-            cr, uid, inv_ids, context=context)
-        pac_params_obj = self.pool.get('params.pac')
-        cfd_data = base64.decodestring(fdata or self.fdata)
-        xml_res_str = xml.dom.minidom.parseString(cfd_data)
-        xml_res_addenda = self.add_addenta_xml(
-            cr, uid, xml_res_str, comprobante, context=context)
-        xml_res_str_addenda = xml_res_addenda.toxml('UTF-8')
-        compr = xml_res_addenda.getElementsByTagName(comprobante)[0]
-        date = compr.attributes['fecha'].value
-        date_format = datetime.strptime(
-            date, '%Y-%m-%dT%H:%M:%S').strftime('%Y-%m-%d')
-        context['date'] = date_format
-        invoice_ids = inv_ids
-        invoice = self.browse(cr, uid, invoice_ids, context=context)[0]
-        currency = invoice.currency_id.name
-        currency_enc = currency.encode('UTF-8', 'strict')
-        rate = invoice.currency_id.rate and (1.0/invoice.currency_id.rate) or 1
-        file = False
-        msg = ''
-        cfdi_xml = False
-        pac_params_ids = pac_params_obj.search(cr, uid, [
-            ('method_type', '=', 'pac_sf_firmar'), (
-                'company_id', '=', invoice.company_emitter_id.id), (
-                    'active', '=', True)], limit=1, context=context)
-        if pac_params_ids:
-            pac_params = pac_params_obj.browse(
-                cr, uid, pac_params_ids, context)[0]
-            user = pac_params.user
-            password = pac_params.password
-            wsdl_url = pac_params.url_webservice
-            namespace = pac_params.namespace
-            url = 'https://solucionfactible.com/ws/services/Timbrado'
-            testing_url = 'http://testing.solucionfactible.com/ws/services/Timbrado'
-            if (wsdl_url == url) or (wsdl_url == testing_url):
-                pass
-            else:
-                raise osv.except_osv(_('Warning'), _('Web Service URL \
-                    o PAC incorrect'))
-            if namespace == 'http://timbrado.ws.cfdi.solucionfactible.com':
-                pass
-            else:
-                raise osv.except_osv(_('Warning'), _(
-                    'Namespace of PAC incorrect'))
-            if 'testing' in wsdl_url:
-                msg += _(u'WARNING, SIGNED IN TEST!!!!\n\n')
-            wsdl_client = WSDL.SOAPProxy(wsdl_url, namespace)
-            if True:  # if wsdl_client:
-                file_globals = self._get_file_globals(
-                    cr, uid, invoice_ids, context=context)
-                fname_cer_no_pem = file_globals['fname_cer']
-                cerCSD = fname_cer_no_pem and base64.encodestring(
-                    open(fname_cer_no_pem, "r").read()) or ''
-                fname_key_no_pem = file_globals['fname_key']
-                keyCSD = fname_key_no_pem and base64.encodestring(
-                    open(fname_key_no_pem, "r").read()) or ''
-                cfdi = base64.encodestring(
-                    xml_res_str_addenda.replace(codecs.BOM_UTF8, ''))
-                zip = False  # Validar si es un comprimido zip, con la extension del archivo
-                contrasenaCSD = file_globals.get('password', '')
-                params = [
-                    user, password, cfdi, zip]
-                wsdl_client.soapproxy.config.dumpSOAPOut = 0
-                wsdl_client.soapproxy.config.dumpSOAPIn = 0
-                wsdl_client.soapproxy.config.debug = 0
-                wsdl_client.soapproxy.config.dict_encoding = 'UTF-8'
-                resultado = wsdl_client.timbrar(*params)
-                htz = int(self._get_time_zone(
-                    cr, uid, inv_ids, context=context))
-                mensaje = _(tools.ustr(resultado['mensaje']))
-                resultados_mensaje = resultado['resultados'] and \
-                    resultado['resultados']['mensaje'] or ''
-                folio_fiscal = resultado['resultados'] and \
-                    resultado['resultados']['uuid'] or ''
-                codigo_timbrado = resultado['status'] or ''
-                codigo_validacion = resultado['resultados'] and \
-                    resultado['resultados']['status'] or ''
-                if codigo_timbrado == '311' or codigo_validacion == '311':
-                    raise osv.except_osv(_('Warning'), _(
-                        'Unauthorized.\nCode 311'))
-                elif codigo_timbrado == '312' or codigo_validacion == '312':
-                    raise osv.except_osv(_('Warning'), _(
-                        'Failed to consult the SAT.\nCode 312'))
-                elif codigo_timbrado == '200' and codigo_validacion == '200':
-                    fecha_timbrado = resultado[
-                        'resultados']['fechaTimbrado'] or False
-                    fecha_timbrado = fecha_timbrado and time.strftime(
-                        '%Y-%m-%d %H:%M:%S', time.strptime(
-                            fecha_timbrado[:19], '%Y-%m-%dT%H:%M:%S')) or False
-                    fecha_timbrado = fecha_timbrado and datetime.strptime(
-                        fecha_timbrado, '%Y-%m-%d %H:%M:%S') + timedelta(
-                            hours=htz) or False
-                    cfdi_data = {
-                        'cfdi_cbb': resultado['resultados']['qrCode'] or False,  # ya lo regresa en base64
-                        'cfdi_sello': resultado['resultados'][
-                        'selloSAT'] or False,
-                        'cfdi_no_certificado': resultado['resultados'][
-                        'certificadoSAT'] or False,
-                        'cfdi_cadena_original': resultado['resultados'][
-                        'cadenaOriginal'] or False,
-                        'cfdi_fecha_timbrado': fecha_timbrado,
-                        'cfdi_xml': base64.decodestring(resultado[
-                        'resultados']['cfdiTimbrado'] or ''),  # este se necesita en uno que no es base64
-                        'cfdi_folio_fiscal': resultado['resultados']['uuid'] or '',
-                    }
-                    msg += mensaje + "." + resultados_mensaje + \
-                        " Folio Fiscal: " + folio_fiscal + "."
-                    msg += _(
-                            u"\nMake Sure to the file really has generated correctly to the SAT\nhttps://www.consulta.sat.gob.mx/sicofi_web/moduloECFD_plus/ValidadorCFDI/Validador%20cfdi.html")
-                    if cfdi_data.get('cfdi_xml', False):
-                        url_pac = '</"%s"><!--Para validar el XML CFDI puede descargar el certificado del PAC desde la siguiente liga: https://solucionfactible.com/cfdi/00001000000102699425.zip-->' % (
-                            comprobante)
-                        cfdi_data['cfdi_xml'] = cfdi_data[
-                            'cfdi_xml'].replace('</"%s">' % (comprobante), url_pac)
-                        file = base64.encodestring(
-                            cfdi_data['cfdi_xml'] or '')
-                        # self.cfdi_data_write(cr, uid, [invoice.id],
-                        # cfdi_data, context=context)
-                        cfdi_xml = cfdi_data.pop('cfdi_xml')
-                    if cfdi_xml:
-                        self.write(cr, uid, inv_ids, cfdi_data)
-                        cfdi_data['cfdi_xml'] = cfdi_xml
-                    else:
-                        msg += _(u"Can't extract the file XML of PAC")
-                else:
-                    raise orm.except_orm(_('Warning'), _('Stamped Code: %s.-Validation code %s.-Folio Fiscal: %s.-Stamped Message: %s.-Validation Message: %s.') % (
-                        codigo_timbrado, codigo_validacion, folio_fiscal, mensaje, resultados_mensaje))
-        else:
-            msg += 'Not found information from web services of PAC, verify that the configuration of PAC is correct'
-            raise osv.except_osv(_('Warning'), _(
-                'Not found information from web services of PAC, verify that the configuration of PAC is correct'))
-        return {'file': file, 'msg': msg, 'cfdi_xml': cfdi_xml}
-
+    
     def _get_file_cancel(self, cr, uid, inv_ids, context={}):
         inv_ids = inv_ids[0]
         atta_obj = self.pool.get('ir.attachment')
@@ -421,80 +279,6 @@
                 "This invoice hasn't stamped, so that not possible cancel."))
         return {'file': inv_xml}
 
-    def sf_cancel(self, cr, uid, inv_ids, context=None):
-        msg = ''
-        context_id = inv_ids[0]
-        company_obj = self.pool.get('res.company.facturae.certificate')
-        pac_params_obj = self.pool.get('params.pac')
-        invoice_brw = self.browse(cr, uid, context_id, context)
-        company_brw = company_obj.browse(cr, uid, [
-            invoice_brw.company_id.id], context)[0]
-        pac_params_srch = pac_params_obj.search(cr, uid, [(
-            'method_type', '=', 'pac_sf_cancelar'), ('company_id', '=',
-                                                     invoice_brw.company_emitter_id.id), (
-                                                         'active', '=', True)],
-            context=context)
-        if pac_params_srch:
-            pac_params_brw = pac_params_obj.browse(
-                cr, uid, pac_params_srch, context)[0]
-            user = pac_params_brw.user
-            password = pac_params_brw.password
-            wsdl_url = pac_params_brw.url_webservice
-            namespace = pac_params_brw.namespace
-            #---------constantes
-            #~ user = '[e-mail]'
-            #~ password = 'timbrado.SF.16672'
-            #~ wsdl_url = 'http://testing.solucionfactible.com/ws/services/Timbrado?wsdl'
-            #~ namespace = 'http://timbrado.ws.cfdi.solucionfactible.com'
-            wsdl_client = False
-            wsdl_client = WSDL.SOAPProxy(wsdl_url, namespace)
-            if True:  # if wsdl_client:
-                file_globals = self._get_file_globals(
-                    cr, uid, [context_id], context=context)
-                fname_cer_no_pem = file_globals['fname_cer']
-                cerCSD = fname_cer_no_pem and base64.encodestring(
-                    open(fname_cer_no_pem, "r").read()) or ''
-                fname_key_no_pem = file_globals['fname_key']
-                keyCSD = fname_key_no_pem and base64.encodestring(
-                    open(fname_key_no_pem, "r").read()) or ''
-                zip = False  # Validar si es un comprimido zip, con la extension del archivo
-                contrasenaCSD = file_globals.get('password', '')
-                uuids = invoice_brw.cfdi_folio_fiscal  # cfdi_folio_fiscal
-                params = [
-                    user, password, uuids, cerCSD, keyCSD, contrasenaCSD]
-                wsdl_client.soapproxy.config.dumpSOAPOut = 0
-                wsdl_client.soapproxy.config.dumpSOAPIn = 0
-                wsdl_client.soapproxy.config.debug = 0
-                wsdl_client.soapproxy.config.dict_encoding = 'UTF-8'
-                result = wsdl_client.cancelar(*params)
-                codigo_cancel = result['status'] or ''
-                status_cancel = result['resultados'] and result[
-                    'resultados']['status'] or ''
-                uuid_nvo = result['resultados'] and result[
-                    'resultados']['uuid'] or ''
-                mensaje_cancel = _(tools.ustr(result['mensaje']))
-                msg_nvo = result['resultados'] and result[
-                    'resultados']['mensaje'] or ''
-                status_uuid = result['resultados'] and result[
-                    'resultados']['statusUUID'] or ''
-                folio_cancel = result['resultados'] and result[
-                    'resultados']['uuid'] or ''
-                if codigo_cancel == '200' and status_cancel == '200' and\
-                        status_uuid == '201':
-                    msg +=  mensaje_cancel + _('\n- The process of cancellation\
-                    has completed correctly.\n- The uuid cancelled is:\
-                    ') + folio_cancel
-                    self.write(cr, uid, context_id, {
-                        'cfdi_fecha_cancelacion': time.strftime(
-                        '%Y-%m-%d %H:%M:%S')})
-                else:
-                    raise orm.except_orm(_('Warning'), _('Cancel Code: %s.-Status code %s.-Status UUID: %s.-Folio Cancel: %s.-Cancel Message: %s.-Answer Message: %s.') % (
-                        codigo_cancel, status_cancel, status_uuid, folio_cancel, mensaje_cancel, msg_nvo))
-        else:
-            msg = _(
-                'Not found information of webservices of PAC, verify that the configuration of PAC is correct')
-        return {'message': msg, 'status_uuid': status_uuid}
-
     def write_cfd_data(self, cr, uid, ids, cfd_datas, context={}):
         """
         @param cfd_datas : Dictionary with data that is used in facturae CFDI

=== modified file 'l10n_mx_facturae_pac_sf/ir_attachment_facturae.py'
--- l10n_mx_facturae_pac_sf/ir_attachment_facturae.py	2013-07-25 00:23:58 +0000
+++ l10n_mx_facturae_pac_sf/ir_attachment_facturae.py	2013-08-25 06:44:24 +0000
@@ -25,9 +25,35 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
-from openerp.tools.translate import _
-
+from openerp.tools.translate import _
+from openerp.osv import fields, osv, orm
+from openerp import tools
+from openerp import netsvc
+from openerp.tools.misc import ustr
+import wizard
+import base64
+import xml.dom.minidom
+import time
+import StringIO
+import csv
+import tempfile
+import os
+import sys
+import codecs
+from xml.dom import minidom
+import urllib
+import pooler
+from openerp.tools.translate import _
+from datetime import datetime, timedelta
+from pytz import timezone
+import pytz
+import time
+from openerp import tools
+try:
+    from SOAPpy import WSDL
+except:
+    print "Package SOAPpy missed"#TODO: Warning message
+    pass
 
 class ir_attachment_facturae_mx(osv.Model):
     _inherit = 'ir.attachment.facturae.mx'
@@ -36,12 +62,240 @@
         types = super(ir_attachment_facturae_mx, self)._get_type(
             cr, uid, ids, context=context)
         types.extend([
-            ('cfdi32', 'CFDI 3.2 Solución Factible'),
+            ('cfdi32_pac_sf', 'CFDI 3.2 Solución Factible'),
         ])
         return types
-
+    
+    def get_driver_fc_sign(self):
+        factura_mx_type__fc = super(ir_attachment_facturae_mx, self).get_driver_fc_sign()
+        if factura_mx_type__fc == None:
+            factura_mx_type__fc = {}
+        factura_mx_type__fc.update({'cfdi32_pac_sf': self._upload_ws_file})
+        return factura_mx_type__fc
+    
+    def get_driver_fc_cancel(self):
+        factura_mx_type__fc = super(ir_attachment_facturae_mx, self).get_driver_fc_cancel()
+        if factura_mx_type__fc == None:
+            factura_mx_type__fc = {}
+        factura_mx_type__fc.update({'cfdi32_pac_sf': self.sf_cancel})
+        return factura_mx_type__fc
+        
     _columns = {
         'type': fields.selection(_get_type, 'Type', type='char', size=64,
                                  required=True, readonly=True, help="Type of Electronic Invoice"),
     }
+    
+    def sf_cancel(self, cr, uid, ids, context=None):
+        msg = ''
+        certificate_obj = self.pool.get('res.company.facturae.certificate')
+        pac_params_obj = self.pool.get('params.pac')
+        invoice_obj = self.pool.get('account.invoice')
+        for ir_attachment_facturae_mx_id in self.browse(cr, uid, ids, context=context):
+            status = False
+            invoice = ir_attachment_facturae_mx_id.invoice_id
+            pac_params_ids = pac_params_obj.search(cr, uid, [
+                ('method_type', '=', 'pac_sf_cancelar'),
+                ('company_id', '=', invoice.company_emitter_id.id),
+                ('active', '=', True),
+            ], limit=1, context=context)
+            pac_params_id = pac_params_ids and pac_params_ids[0] or False
+            if pac_params_id:
+                file_globals = invoice_obj._get_file_globals(
+                    cr, uid, [invoice.id], context=context)
+                pac_params_brw = pac_params_obj.browse(
+                    cr, uid, [pac_params_id], context=context)[0]
+                user = pac_params_brw.user
+                password = pac_params_brw.password
+                wsdl_url = pac_params_brw.url_webservice
+                namespace = pac_params_brw.namespace
+                wsdl_client = False
+                wsdl_client = WSDL.SOAPProxy(wsdl_url, namespace)
+                fname_cer_no_pem = file_globals['fname_cer']
+                cerCSD = fname_cer_no_pem and base64.encodestring(
+                    open(fname_cer_no_pem, "r").read()) or ''
+                fname_key_no_pem = file_globals['fname_key']
+                keyCSD = fname_key_no_pem and base64.encodestring(
+                    open(fname_key_no_pem, "r").read()) or ''
+                zip = False  # Validar si es un comprimido zip, con la extension del archivo
+                contrasenaCSD = file_globals.get('password', '')
+                uuids = invoice.cfdi_folio_fiscal  # cfdi_folio_fiscal
+                params = [
+                    user, password, uuids, cerCSD, keyCSD, contrasenaCSD]
+                wsdl_client.soapproxy.config.dumpSOAPOut = 0
+                wsdl_client.soapproxy.config.dumpSOAPIn = 0
+                wsdl_client.soapproxy.config.debug = 0
+                wsdl_client.soapproxy.config.dict_encoding = 'UTF-8'
+                result = wsdl_client.cancelar(*params)
+                codigo_cancel = result['status'] or ''
+                status_cancel = result['resultados'] and result[
+                    'resultados']['status'] or ''
+                uuid_nvo = result['resultados'] and result[
+                    'resultados']['uuid'] or ''
+                mensaje_cancel = _(tools.ustr(result['mensaje']))
+                msg_nvo = result['resultados'] and result[
+                    'resultados']['mensaje'] or ''
+                status_uuid = result['resultados'] and result[
+                    'resultados']['statusUUID'] or ''
+                folio_cancel = result['resultados'] and result[
+                    'resultados']['uuid'] or ''
+                if codigo_cancel == '200' and status_cancel == '200' and\
+                        status_uuid == '201':
+                    msg +=  mensaje_cancel + _('\n- The process of cancellation\
+                    has completed correctly.\n- The uuid cancelled is:\
+                    ') + folio_cancel
+                    invoice_obj.write(cr, uid, [invoice.id], {
+                        'cfdi_fecha_cancelacion': time.strftime(
+                        '%Y-%m-%d %H:%M:%S')
+                    })
+                    status = True
+                else:
+                    raise orm.except_orm(_('Warning'), _('Cancel Code: %s.-Status code %s.-Status UUID: %s.-Folio Cancel: %s.-Cancel Message: %s.-Answer Message: %s.') % (
+                        codigo_cancel, status_cancel, status_uuid, folio_cancel, mensaje_cancel, msg_nvo))
+        else:
+            msg = _(
+                'Not found information of webservices of PAC, verify that the configuration of PAC is correct')
+        return {'message': msg, 'status_uuid': status_uuid, 'status': status}
+    
+    def _upload_ws_file(self, cr, uid, ids, fdata=None, context={}):
+        """
+        @params fdata : File.xml codification in base64
+        """
+        invoice_obj = self.pool.get('account.invoice')
+        pac_params_obj = invoice_obj.pool.get('params.pac')
+        for ir_attachment_facturae_mx_id in self.browse(cr, uid, ids, context=context):
+            invoice = ir_attachment_facturae_mx_id.invoice_id
+            comprobante = invoice_obj._get_type_sequence(
+                cr, uid, [invoice.id], context=context)
+            cfd_data = base64.decodestring(fdata or invoice_obj.fdata)
+            xml_res_str = xml.dom.minidom.parseString(cfd_data)
+            xml_res_addenda = invoice_obj.add_addenta_xml(
+                cr, uid, xml_res_str, comprobante, context=context)
+            xml_res_str_addenda = xml_res_addenda.toxml('UTF-8')
+            xml_res_str_addenda = xml_res_str_addenda.replace(codecs.BOM_UTF8, '')
+            
+            if tools.config['test_report_directory']:#TODO: Add if test-enabled:
+                ir_attach_facturae_mx_file_input = ir_attachment_facturae_mx_id.file_input and ir_attachment_facturae_mx_id.file_input or False
+                fname_suffix = ir_attach_facturae_mx_file_input and ir_attach_facturae_mx_file_input.datas_fname or ''
+                open( os.path.join(tools.config['test_report_directory'], 'l10n_mx_facturae_pac_sf' + '_' + \
+                  'before_upload' + '-' + fname_suffix), 'wb+').write( xml_res_str_addenda )
+            compr = xml_res_addenda.getElementsByTagName(comprobante)[0]
+            date = compr.attributes['fecha'].value
+            date_format = datetime.strptime(
+                date, '%Y-%m-%dT%H:%M:%S').strftime('%Y-%m-%d')
+            context['date'] = date_format
+            invoice_ids = [invoice.id]
+            file = False
+            msg = ''
+            cfdi_xml = False
+            pac_params_ids = pac_params_obj.search(cr, uid, [
+                ('method_type', '=', 'pac_sf_firmar'), (
+                    'company_id', '=', invoice.company_emitter_id.id), (
+                        'active', '=', True)], limit=1, context=context)
+            if pac_params_ids:
+                pac_params = pac_params_obj.browse(
+                    cr, uid, pac_params_ids, context)[0]
+                user = pac_params.user
+                password = pac_params.password
+                wsdl_url = pac_params.url_webservice
+                namespace = pac_params.namespace
+                url = 'https://solucionfactible.com/ws/services/Timbrado'
+                testing_url = 'http://testing.solucionfactible.com/ws/services/Timbrado'
+                if (wsdl_url == url) or (wsdl_url == testing_url):
+                    pass
+                else:
+                    raise osv.except_osv(_('Warning'), _('Web Service URL \
+                        o PAC incorrect'))
+                if namespace == 'http://timbrado.ws.cfdi.solucionfactible.com':
+                    pass
+                else:
+                    raise osv.except_osv(_('Warning'), _(
+                        'Namespace of PAC incorrect'))
+                if 'testing' in wsdl_url:
+                    msg += _(u'WARNING, SIGNED IN TEST!!!!\n\n')
+                wsdl_client = WSDL.SOAPProxy(wsdl_url, namespace)
+                if True:  # if wsdl_client:
+                    file_globals = invoice_obj._get_file_globals(
+                        cr, uid, invoice_ids, context=context)
+                    fname_cer_no_pem = file_globals['fname_cer']
+                    cerCSD = fname_cer_no_pem and base64.encodestring(
+                        open(fname_cer_no_pem, "r").read()) or ''
+                    fname_key_no_pem = file_globals['fname_key']
+                    keyCSD = fname_key_no_pem and base64.encodestring(
+                        open(fname_key_no_pem, "r").read()) or ''
+                    cfdi = base64.encodestring(xml_res_str_addenda)
+                    zip = False  # Validar si es un comprimido zip, con la extension del archivo
+                    contrasenaCSD = file_globals.get('password', '')
+                    params = [
+                        user, password, cfdi, zip]
+                    wsdl_client.soapproxy.config.dumpSOAPOut = 0
+                    wsdl_client.soapproxy.config.dumpSOAPIn = 0
+                    wsdl_client.soapproxy.config.debug = 0
+                    wsdl_client.soapproxy.config.dict_encoding = 'UTF-8'
+                    resultado = wsdl_client.timbrar(*params)
+                    htz = int(invoice_obj._get_time_zone(
+                        cr, uid, [ir_attachment_facturae_mx_id.invoice_id.id], context=context))
+                    mensaje = _(tools.ustr(resultado['mensaje']))
+                    resultados_mensaje = resultado['resultados'] and \
+                        resultado['resultados']['mensaje'] or ''
+                    folio_fiscal = resultado['resultados'] and \
+                        resultado['resultados']['uuid'] or ''
+                    codigo_timbrado = resultado['status'] or ''
+                    codigo_validacion = resultado['resultados'] and \
+                        resultado['resultados']['status'] or ''
+                    if codigo_timbrado == '311' or codigo_validacion == '311':
+                        raise osv.except_osv(_('Warning'), _(
+                            'Unauthorized.\nCode 311'))
+                    elif codigo_timbrado == '312' or codigo_validacion == '312':
+                        raise osv.except_osv(_('Warning'), _(
+                            'Failed to consult the SAT.\nCode 312'))
+                    elif codigo_timbrado == '200' and codigo_validacion == '200':
+                        fecha_timbrado = resultado[
+                            'resultados']['fechaTimbrado'] or False
+                        fecha_timbrado = fecha_timbrado and time.strftime(
+                            '%Y-%m-%d %H:%M:%S', time.strptime(
+                                fecha_timbrado[:19], '%Y-%m-%dT%H:%M:%S')) or False
+                        fecha_timbrado = fecha_timbrado and datetime.strptime(
+                            fecha_timbrado, '%Y-%m-%d %H:%M:%S') + timedelta(
+                                hours=htz) or False
+                        cfdi_data = {
+                            'cfdi_cbb': resultado['resultados']['qrCode'] or False,  # ya lo regresa en base64
+                            'cfdi_sello': resultado['resultados'][
+                            'selloSAT'] or False,
+                            'cfdi_no_certificado': resultado['resultados'][
+                            'certificadoSAT'] or False,
+                            'cfdi_cadena_original': resultado['resultados'][
+                            'cadenaOriginal'] or False,
+                            'cfdi_fecha_timbrado': fecha_timbrado,
+                            'cfdi_xml': base64.decodestring(resultado[
+                            'resultados']['cfdiTimbrado'] or ''),  # este se necesita en uno que no es base64
+                            'cfdi_folio_fiscal': resultado['resultados']['uuid'] or '',
+                        }
+                        msg += mensaje + "." + resultados_mensaje + \
+                            " Folio Fiscal: " + folio_fiscal + "."
+                        msg += _(
+                                u"\nMake Sure to the file really has generated correctly to the SAT\nhttps://www.consulta.sat.gob.mx/sicofi_web/moduloECFD_plus/ValidadorCFDI/Validador%20cfdi.html")
+                        if cfdi_data.get('cfdi_xml', False):
+                            url_pac = '</"%s"><!--Para validar el XML CFDI puede descargar el certificado del PAC desde la siguiente liga: https://solucionfactible.com/cfdi/00001000000102699425.zip-->' % (
+                                comprobante)
+                            cfdi_data['cfdi_xml'] = cfdi_data[
+                                'cfdi_xml'].replace('</"%s">' % (comprobante), url_pac)
+                            file = base64.encodestring(
+                                cfdi_data['cfdi_xml'] or '')
+                            # invoice_obj.cfdi_data_write(cr, uid, [invoice.id],
+                            # cfdi_data, context=context)
+                            cfdi_xml = cfdi_data.pop('cfdi_xml')
+                        if cfdi_xml:
+                            invoice_obj.write(cr, uid, [invoice.id], cfdi_data)
+                            cfdi_data['cfdi_xml'] = cfdi_xml
+                        else:
+                            msg += _(u"Can't extract the file XML of PAC")
+                    else:
+                        raise orm.except_orm(_('Warning'), _('Stamped Code: %s.-Validation code %s.-Folio Fiscal: %s.-Stamped Message: %s.-Validation Message: %s.') % (
+                            codigo_timbrado, codigo_validacion, folio_fiscal, mensaje, resultados_mensaje))
+            else:
+                msg += 'Not found information from web services of PAC, verify that the configuration of PAC is correct'
+                raise osv.except_osv(_('Warning'), _(
+                    'Not found information from web services of PAC, verify that the configuration of PAC is correct'))
+            return {'file': file, 'msg': msg, 'cfdi_xml': cfdi_xml}
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_mx_facturae_pac_sf/ir_sequence_approval.py'
--- l10n_mx_facturae_pac_sf/ir_sequence_approval.py	2013-07-31 00:21:50 +0000
+++ l10n_mx_facturae_pac_sf/ir_sequence_approval.py	2013-08-25 06:44:24 +0000
@@ -35,7 +35,7 @@
         types = super(ir_sequence_approval, self)._get_type(
             cr, uid, ids, context=context)
         types.extend([
-            ('cfdi32', 'CFDI 3.2 Solución Factible'),
+            ('cfdi32_pac_sf', 'CFDI 3.2 Solución Factible'),
         ])
         return types
 

=== modified file 'l10n_mx_facturae_pac_sf/test/account_invoice_cfdi_pac_sf.yml'
--- l10n_mx_facturae_pac_sf/test/account_invoice_cfdi_pac_sf.yml	2013-08-25 03:08:26 +0000
+++ l10n_mx_facturae_pac_sf/test/account_invoice_cfdi_pac_sf.yml	2013-08-25 06:44:24 +0000
@@ -1,7 +1,7 @@
 -
   To test the Mexican Electronic Invoice CFDI PAC SF
 -
-  I create cfdi_pac_sf a customer invoice
+  I create a cfdi_pac_sf customer invoice
 -
   !record {model: account.invoice, id: account_invoice_cfdi_pac_sf0, view: account.invoice_form}:
     payment_term: account.account_payment_term_advance
@@ -11,7 +11,7 @@
     name: 'Test cfdi_pac_sf Customer Invoice'
     invoice_line:
       - product_id: product.product_product_5
-        quantity: 30.0
+        quantity: 32.0
 -
   I rewrite the journal field (BUG I need overwrite two times this field for done! only in test yaml)
 -
@@ -47,6 +47,7 @@
     if cfdi_pac_sf_id:
         cfdi_pac_sf = self.browse(cr, uid, [cfdi_pac_sf_id])[0]
         self.signal_confirm(cr, uid , cfdi_pac_sf_ids ,context=context)
+<<<<<<< TREE
         print "cfdi_pac_sf_state",cfdi_pac_sf.state
         print "cfdi_pac_sf_msj",cfdi_pac_sf.msj
         state = cfdi_pac_sf.state
@@ -71,6 +72,34 @@
         else:
             state = 'no data in attach file'
     assert state=='confirmed', 'No confirmed state l10n_mx attachment facturae cfdi_pac_sf'
+=======
+        print "cfdi_pac_sf_state",cfdi_pac_sf.state
+        print "cfdi_pac_sf_msj",cfdi_pac_sf.msj
+        state = cfdi_pac_sf.state
+-
+  I check that the state in l10n_mx attachment facturae cfdi_pac_sf is "Confirmed"
+-
+  !python {model: ir.attachment.facturae.mx}: |
+    import netsvc, tools, os, base64
+    cfdi_pac_sf_ids = self.search(cr, uid, [('invoice_id', '=', ref("account_invoice_cfdi_pac_sf0") ), ('state', '<>', 'cancel')], limit=1)
+    cfdi_pac_sf_id = cfdi_pac_sf_ids and cfdi_pac_sf_ids[0] or False
+    state = 'no attach file'
+    if cfdi_pac_sf_id:
+        cfdi_pac_sf = self.browse(cr, uid, [cfdi_pac_sf_id])[0]
+        print "cfdi_pac_sf_state",cfdi_pac_sf.state
+        print "cfdi_pac_sf_msj",cfdi_pac_sf.msj
+        state = cfdi_pac_sf.state
+        ir_attach_facturae_mx = cfdi_pac_sf.file_input and cfdi_pac_sf.file_input or False
+        fdata = ir_attach_facturae_mx and ir_attach_facturae_mx.db_datas or False
+        if fdata:
+            if tools.config['test_report_directory']:
+                open(os.path.join(tools.config['test_report_directory'], 'l10n_mx_facturae_pac_sf' + '_' + \
+                  'account_invoice_cfdi_pac_sf0' + '_' + 'confirmed' + '-' + ir_attach_facturae_mx.datas_fname)\
+                  , 'wb+').write( base64.decodestring( fdata ) )
+        else:
+            state = 'no data in attach file'
+    assert state=='confirmed', 'No confirmed state l10n_mx attachment facturae cfdi_pac_sf'
+>>>>>>> MERGE-SOURCE
 -
   I sign l10n_mx attachment facturae cfdi_pac_sf by clicking on sign button upload pac
 -
@@ -80,10 +109,17 @@
     cfdi_pac_sf_ids = self.search(cr, uid, [('invoice_id', '=', ref("account_invoice_cfdi_pac_sf0") ), ('state', '<>', 'cancel')], limit=1)
     cfdi_pac_sf_id = cfdi_pac_sf_ids and cfdi_pac_sf_ids[0] or False
     if cfdi_pac_sf_id:
+<<<<<<< TREE
         cfdi_pac_sf = self.browse(cr, uid, [cfdi_pac_sf_id])[0]
         self.signal_sign(cr, uid, cfdi_pac_sf_ids, context=context)
         print "cfdi_pac_sf_state",cfdi_pac_sf.state
         print "cfdi_pac_sf_msj",cfdi_pac_sf.msj
+=======
+        cfdi_pac_sf = self.browse(cr, uid, [cfdi_pac_sf_id], context=context)[0]
+        self.signal_sign(cr, uid, cfdi_pac_sf_ids, context=context)
+        print "cfdi_pac_sf_state",cfdi_pac_sf.state
+        print "cfdi_pac_sf_msj",cfdi_pac_sf.msj
+>>>>>>> MERGE-SOURCE
         state = cfdi_pac_sf.state
 -
   I check that the state in l10n_mx attachment facturae cfdi_pac_sf is "Signed"
@@ -91,9 +127,15 @@
   !python {model: ir.attachment.facturae.mx}: |
     import netsvc, tools, os, base64
     cfdi_pac_sf_ids = self.search(cr, uid, [('invoice_id', '=', ref("account_invoice_cfdi_pac_sf0") ), ('state', '<>', 'cancel')], limit=1)
+<<<<<<< TREE
     cfdi_pac_sf_id = cfdi_pac_sf_ids and cfdi_pac_sf_ids[0] or False
     state = 'no attach file'
+=======
+    cfdi_pac_sf_id = len(cfdi_pac_sf_ids) and cfdi_pac_sf_ids[0] or False
+    state = 'no attach file'
+>>>>>>> MERGE-SOURCE
     if cfdi_pac_sf_id:
+<<<<<<< TREE
         cfdi_pac_sf = self.browse(cr, uid, [cfdi_pac_sf_id])[0]
         print "cfdi_pac_sf_state",cfdi_pac_sf.state
         print "cfdi_pac_sf_msj",cfdi_pac_sf.msj
@@ -104,6 +146,20 @@
                 file(os.path.join(tools.config['test_report_directory'], __name__ + 'account_invoice_cfdi_pac_sf0_signed.xml'), 'wb+').write( fdata )
         else:
             state = 'no data in attach file'
+=======
+        cfdi_pac_sf = self.browse(cr, uid, [cfdi_pac_sf_id], context=context)[0]
+        ir_attach_facturae_mx = cfdi_pac_sf.file_xml_sign and cfdi_pac_sf.file_xml_sign or False
+        fdata = ir_attach_facturae_mx and ir_attach_facturae_mx.db_datas or False
+        if fdata:
+            state = cfdi_pac_sf.state
+            if tools.config['test_report_directory']:
+                open(os.path.join(tools.config['test_report_directory'], 'l10n_mx_facturae_pac_sf' + '_' + \
+                  'account_invoice_cfdi_pac_sf0' + '_' + 'signed' + '-' + ir_attach_facturae_mx.datas_fname),\
+                  'wb+').write( base64.decodestring( fdata ) )
+        else:
+            state = 'no data in attach file'
+    print "state",state
+>>>>>>> MERGE-SOURCE
     assert state=='signed', 'No signed state l10n_mx attachment facturae cfdi_pac_sf'
 -
   I generate a printable l10n_mx attachment facturae cfdi_pac_sf by clicking on printable button
@@ -123,14 +179,30 @@
   I check that the state in l10n_mx attachment facturae cfdi_pac_sf is Printable
 -
   !python {model: ir.attachment.facturae.mx}: |
+    import netsvc, tools, os, base64
     cfdi_pac_sf_ids = self.search(cr, uid, [('invoice_id', '=', ref("account_invoice_cfdi_pac_sf0") ), ('state', '<>', 'cancel')], limit=1)
     cfdi_pac_sf_id = cfdi_pac_sf_ids and cfdi_pac_sf_ids[0] or False
     state = None
+    state = 'no attach file'
     if cfdi_pac_sf_id:
+<<<<<<< TREE
         cfdi_pac_sf = self.browse(cr, uid, [cfdi_pac_sf_id])[0]
         state = cfdi_pac_sf.state
         print "cfdi_pac_sf_state",cfdi_pac_sf.state
         print "cfdi_pac_sf_msj",cfdi_pac_sf.msj
+=======
+        cfdi_pac_sf = self.browse(cr, uid, [cfdi_pac_sf_id], context=context)[0]
+        ir_attach_facturae_mx = cfdi_pac_sf.file_pdf and cfdi_pac_sf.file_pdf or False
+        fdata = ir_attach_facturae_mx and ir_attach_facturae_mx.db_datas or False
+        if fdata:
+            state = cfdi_pac_sf.state
+            if tools.config['test_report_directory']:
+                open(os.path.join(tools.config['test_report_directory'], 'l10n_mx_facturae_pac_sf' + '_' + \
+                  'account_invoice_cfdi_pac_sf0' + '_' + 'printable' + '-' + ir_attach_facturae_mx.datas_fname),\
+                  'wb+').write( base64.decodestring( fdata ) )
+        else:
+            state = 'no data in attach file'
+>>>>>>> MERGE-SOURCE
     assert state=='printable', 'No printable state l10n_mx attachment facturae cfdi_pac_sf'
 -
   I added update_posted in journal

=== modified file 'l10n_mx_facturae_report/report/invoice_facturae_html.mako'
--- l10n_mx_facturae_report/report/invoice_facturae_html.mako	2013-06-30 06:23:55 +0000
+++ l10n_mx_facturae_report/report/invoice_facturae_html.mako	2013-08-25 06:44:24 +0000
@@ -247,12 +247,12 @@
         </table>
         <br clear="all"/>
         <!--code for cfd-->
-        %if o.invoice_sequence_id.approval_id.type == 'cfd22':
+        %if 'cfdi' in o.invoice_sequence_id.approval_id.type:
+            <font class="font">“Este documento es una representacion impresa de un CFDI”
+            <br/>CFDI, Comprobante Fiscal Digital por Internet</font>
+        %elif 'cfd' in o.invoice_sequence_id.approval_id.type:
             ${_('“Este documento es una representacion impresa de un CFD”')}<br/>
             ${_('CFD, Comprobante Fiscal Digital')}
-        %elif o.invoice_sequence_id.approval_id.type == 'cfdi32':
-            <font class="font">“Este documento es una representacion impresa de un CFDI”
-            <br/>CFDI, Comprobante Fiscal Digital por Internet</font>
         %endif
         <!-- bank info-->
         %if o.company_emitter_id.partner_id.bank_ids:
@@ -284,7 +284,7 @@
             <tr><td class="center_td">${ get_text_promissory(o.company_id, o.partner_id, o) or ''|entity }</td></tr>
         </table>
         <!--code for cfd 3.2-->
-        %if o.invoice_sequence_id.approval_id.type == 'cfdi32':
+        %if 'cfdi' in o.invoice_sequence_id.approval_id.type:
             <table class="basic_table" rules="cols" style="border:1.5px solid grey;">
                 <tr>
                     <th width="33%"> ${_('Certificado del SAT')}</th>
@@ -367,7 +367,7 @@
             </div>
         %endif
         <!--code for cfd32-->
-        %if o.invoice_sequence_id.approval_id.type == 'cfdi32':
+        %if 'cfdi' in o.invoice_sequence_id.approval_id.type:
             <div style="page-break-inside:avoid; border:1.5px solid grey;">
                 <table width="100%" class="datos_fiscales">
                     <%data_certificate=get_data_certificate(o.id)%>

=== modified file 'l10n_mx_ir_attachment_facturae/invoice.py'
--- l10n_mx_ir_attachment_facturae/invoice.py	2013-08-22 01:36:32 +0000
+++ l10n_mx_ir_attachment_facturae/invoice.py	2013-08-25 06:44:24 +0000
@@ -32,65 +32,60 @@
     _inherit = 'account.invoice'
 
     def action_cancel(self, cr, uid, ids, context=None):
-        ir_attach_obj = self.pool.get('ir.attachment.facturae.mx')
-        id_attach = ir_attach_obj.search(
-            cr, uid, [('invoice_id', '=', ids[0])], context={})
+        ir_attach_facturae_mx_obj = self.pool.get('ir.attachment.facturae.mx')
         inv_type_facturae = {
             'out_invoice': True,
             'out_refund': True,
             'in_invoice': False,
             'in_refund': False}
-        if id_attach:
-            res = super(account_invoice,
-                                self).action_cancel(cr, uid, ids, context)
-        else:
-            res = super(account_invoice,
-                                self).action_cancel(cr, uid, ids, context)
-        for inv in self.browse(cr, uid, ids):
+        for inv in self.browse(cr, uid, ids, context=context):
             if inv_type_facturae.get(inv.type, False):
-                for attach in ir_attach_obj.browse(cr, uid, id_attach):
+                ir_attach_facturae_mx_ids = ir_attach_facturae_mx_obj.search(
+                    cr, uid, [('invoice_id', '=', inv.id)], context=context)
+                for attach in ir_attach_facturae_mx_obj.browse(cr, uid, ir_attach_facturae_mx_ids, context=context):
                     if attach.state <> 'cancel':
-                        self.write(cr, uid, ids, {'date_invoice_cancel': time.strftime('%Y-%m-%d %H:%M:%S')})
-                        ir_attach_obj.signal_cancel(cr, uid, [attach.id], context=context)
+                        ir_attach_facturae_mx_obj.signal_cancel(cr, uid, [attach.id], context=context)
+        res = super(account_invoice, self).action_cancel(cr, uid, ids, context=context)
+        self.write(cr, uid, ids, {'date_invoice_cancel': time.strftime('%Y-%m-%d %H:%M:%S')})
         return res
 
     def create_ir_attachment_facturae(self, cr, uid, ids, context=None):
         attach = ''
         ir_attach_obj = self.pool.get('ir.attachment.facturae.mx')
-        invoice = self.browse(cr, uid, ids, context={})[0]
+        ir_model_data_obj = self.pool.get('ir.model.data')
+        attach_ids = []
         inv_type_facturae = {
             'out_invoice': True,
             'out_refund': True,
             'in_invoice': False,
             'in_refund': False}
-        for inv in self.browse(cr, uid, ids):
-            if inv_type_facturae.get(inv.type, False) and invoice.journal_id.sequence_id.id:
-                if invoice.invoice_sequence_id and invoice.invoice_sequence_id.approval_id:
-                    attach = ir_attach_obj.create(cr, uid, {
-                                                      'name': invoice.fname_invoice, 'invoice_id': ids[0],
-                                                      'type': invoice.invoice_sequence_id.approval_id.type},
-                                                      context={})
-                    ir_model_data = self.pool.get('ir.model.data')
-                    form_res = ir_model_data.get_object_reference(
-                        cr, uid, 'l10n_mx_ir_attachment_facturae',
-                        'view_ir_attachment_facturae_mx_form')
-                    form_id = form_res and form_res[1] or False
-
-                    tree_res = ir_model_data.get_object_reference(
-                        cr, uid, 'l10n_mx_ir_attachment_facturae',
-                        'view_ir_attachment_facturae_mx_tree')
-                    tree_id = tree_res and tree_res[1] or False
-
-                    return {
-                        'name': _('Attachment Factura E MX'),
-                        'view_type': 'form',
-                        'view_mode': 'form,tree',
-                        'res_model': 'ir.attachment.facturae.mx',
-                        'res_id': attach,
-                        'view_id': False,
-                        'views': [(form_id, 'form'), (tree_id, 'tree')],
-                        'type': 'ir.actions.act_window',
-                    }
-                else:
-                    raise orm.except_orm(_('Warning'), _('Folios Invalid Approval'))
+        for invoice in self.browse(cr, uid, ids, context=context):
+            if inv_type_facturae.get(invoice.type, False):
+                approval_id = invoice.invoice_sequence_id and invoice.invoice_sequence_id.approval_id or False
+                if approval_id:
+                    attach_ids.append( ir_attach_obj.create(cr, uid, {
+                      'name': invoice.fname_invoice, 'invoice_id': invoice.id,
+                      'type': invoice.invoice_sequence_id.approval_id.type},
+                      context=context)
+                    )
+        form_res = ir_model_data_obj.get_object_reference(
+            cr, uid, 'l10n_mx_ir_attachment_facturae',
+            'view_ir_attachment_facturae_mx_form')
+        form_id = form_res and form_res[1] or False
+
+        tree_res = ir_model_data_obj.get_object_reference(
+            cr, uid, 'l10n_mx_ir_attachment_facturae',
+            'view_ir_attachment_facturae_mx_tree')
+        tree_id = tree_res and tree_res[1] or False
+
+        return {
+            'name': _('Attachment Factura E MX'),
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'ir.attachment.facturae.mx',
+            'res_id': attach_ids[0],
+            'view_id': False,
+            'views': [(form_id, 'form'), (tree_id, 'tree')],
+            'type': 'ir.actions.act_window',
+        }
         return True

=== modified file 'l10n_mx_ir_attachment_facturae/ir_attachment_facturae.py'
--- l10n_mx_ir_attachment_facturae/ir_attachment_facturae.py	2013-08-22 01:00:27 +0000
+++ l10n_mx_ir_attachment_facturae/ir_attachment_facturae.py	2013-08-25 06:44:24 +0000
@@ -38,6 +38,14 @@
     def _get_type(self, cr, uid, ids=None, context=None):
         types = []
         return types
+    
+    def get_driver_fc_sign(self):
+        """function to inherit from module driver of pac and add particular function"""
+        return {}
+        
+    def get_driver_fc_cancel(self):
+        """function to inherit from module driver of pac and add particular function"""
+        return {}
 
     _columns = {
         'name': fields.char('Name', size=128, required=True, readonly=True,
@@ -89,17 +97,17 @@
     def create_ir_attachment_facturae(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        if not self.signal_confirm(cr, uid, ids, context={}):
-            return False
-        if not self.signal_sign(cr, uid, ids, context={}):
-            return False
-        if not self.signal_printable(cr, uid, ids, context={}):
-            return False
-        if not self.signal_send_customer(cr, uid, ids, context={}):
-            return False
-        if not self.signal_send_backup(cr, uid, ids, context={}):
-            return False
-        if not self.signal_done(cr, uid, ids, context={}):
+        if not self.signal_confirm(cr, uid, ids, context=context):
+            return False
+        if not self.signal_sign(cr, uid, ids, context=context):
+            return False
+        if not self.signal_printable(cr, uid, ids, context=context):
+            return False
+        if not self.signal_send_customer(cr, uid, ids, context=context):
+            return False
+        if not self.signal_send_backup(cr, uid, ids, context=context):
+            return False
+        if not self.signal_done(cr, uid, ids, context=context):
             return False
         return True
     
@@ -107,52 +115,65 @@
         try:
             if context is None:
                 context = {}
+            invoice_obj = self.pool.get('account.invoice')
             attach = ''
             msj = ''
             index_xml = ''
-            invoice = self.browse(cr, uid, ids)[0].invoice_id
-            invoice_obj = self.pool.get('account.invoice')
-            type = self.browse(cr, uid, ids)[0].type
+            attach = self.browse(cr, uid, ids[0])
+            invoice = attach.invoice_id
+            type = attach.type
             wf_service = netsvc.LocalService("workflow")
-            if type == 'cbb':
+            save_attach = None
+            if 'cbb' in type:
                 msj = _("Confirmed")
-            if type == 'cfd22':
+                save_attach = False
+            elif 'cfdi' in type:
+                fname_invoice = invoice.fname_invoice and invoice.fname_invoice + \
+                    '_V3_2.xml' or ''
+                fname, xml_data = invoice_obj._get_facturae_invoice_xml_data(
+                    cr, uid, [invoice.id], context=context)
+                attach = self.pool.get('ir.attachment').create(cr, uid, {
+                    'name': fname_invoice,
+                    'datas': base64.encodestring(xml_data),
+                    'datas_fname': fname_invoice,
+                    'res_model': 'account.invoice',
+                    'res_id': invoice.id,
+                }, context=context)
+                msj = _("Attached Successfully XML CFDI 3.2\n")
+                save_attach = True
+            elif 'cfd' in type:
                 fname_invoice = invoice.fname_invoice and invoice.fname_invoice + \
                     '.xml' or ''
                 fname, xml_data = invoice_obj._get_facturae_invoice_xml_data(
-                    cr, uid, [invoice.id], context={})
+                    cr, uid, [invoice.id], context=context)
                 attach = self.pool.get('ir.attachment').create(cr, uid, {
                     'name': fname_invoice,
                     'datas': base64.encodestring(xml_data),
                     'datas_fname': fname_invoice,
                     'res_model': 'account.invoice',
                     'res_id': invoice.id,
-                }, context={})
+                }, context=context)
                 if attach:
                     index_xml = self.pool.get('ir.attachment').browse(cr, uid, attach).index_content
                     msj = _("Attached Successfully XML CFD 2.2")
-            if type == 'cfdi32':
-                fname_invoice = invoice.fname_invoice and invoice.fname_invoice + \
-                    '_V3_2.xml' or ''
-                fname, xml_data = invoice_obj._get_facturae_invoice_xml_data(
-                    cr, uid, [invoice.id], context=context)
-                attach = self.pool.get('ir.attachment').create(cr, uid, {
-                    'name': fname_invoice,
-                    'datas': base64.encodestring(xml_data),
-                    'datas_fname': fname_invoice,
-                    'res_model': 'account.invoice',
-                    #'res_id': invoice.id,
-                }, context={})
-                msj = _("Attached Successfully XML CFDI 3.2\n")
-            self.write(cr, uid, ids,
-                          {'file_input': attach or False,
-                           'last_date': time.strftime('%Y-%m-%d %H:%M:%S'),
-                           'msj': msj,
-                           'file_xml_sign_index': index_xml }, context=context)
+                save_attach = True
+            else:
+                raise osv.except_osv(_("Type Electronic Invoice Unknow!"), _(
+                                "The Type Electronic Invoice:"+(type or '')) )
+            if save_attach:
+                self.write(cr, uid, ids,
+                              {'file_input': attach or False,
+                               'last_date': time.strftime('%Y-%m-%d %H:%M:%S'),
+                               'msj': msj,
+                               'file_xml_sign_index': index_xml }, context=context)
             wf_service.trg_validate(uid, self._name, ids[0], 'action_confirm', cr)
             return True
         except Exception, e:
-            self.write(cr, uid, ids, {'msj': tools.ustr(e)}, context={})
+            self.write(cr, uid, ids, {'msj': tools.ustr(e)}, context=context)
+            import traceback, sys
+            traceback.print_stack()
+            #traceback_str = repr(traceback.extract_stack())
+            #print traceback_str
             return False
         
     def action_confirm(self, cr, uid, ids, context=None):
@@ -170,40 +191,47 @@
             attachment_obj = self.pool.get('ir.attachment')
             type = self.browse(cr, uid, ids)[0].type
             wf_service = netsvc.LocalService("workflow")
-            if type == 'cbb':
+            if 'cbb' in type:
                 msj = _("Signed")
-            if type == 'cfd22':
+            if 'cfd' in type and not 'cfdi' in type:
                 attach = self.browse(cr, uid, ids)[0].file_input.id or False
                 index_xml = self.browse(cr, uid, ids)[0].file_xml_sign_index or False
                 msj = _("Attached Successfully XML CFD 2.2\n")
-            if type == 'cfdi32':
-                fname_invoice = invoice.fname_invoice and invoice.fname_invoice + \
-                    '.xml' or ''
-                fname, xml_data = invoice_obj._get_facturae_invoice_xml_data(
-                    cr, uid, [invoice.id], context=context)
-                fdata = base64.encodestring(xml_data)
-                res = invoice_obj._upload_ws_file(
-                    cr, uid, [invoice.id], fdata, context=context)
-                msj = tools.ustr(res.get('msg', False))
-                index_xml = res.get('cfdi_xml', False)
-                data_attach = {
-                    'name': fname_invoice,
-                    'datas': base64.encodestring(res.get('cfdi_xml', False)),
-                    'datas_fname': fname_invoice,
-                    'description': 'Factura-E XML CFD-I SIGN',
-                    'res_model': 'account.invoice',
-                    'res_id': invoice.id,
-                }
-                attach = attachment_obj.create(cr, uid, data_attach, context={})
+            if 'cfdi' in type:
+                #upload file in custom module for pac
+                type__fc = self.get_driver_fc_sign()
+                if type in type__fc.keys():
+                    fname_invoice = invoice.fname_invoice and invoice.fname_invoice + \
+                        '.xml' or ''
+                    fname, xml_data = invoice_obj._get_facturae_invoice_xml_data(
+                        cr, uid, [invoice.id], context=context)
+                    fdata = base64.encodestring(xml_data)
+                    res = type__fc[type](
+                        cr, uid, [ids[0]], fdata, context=context)
+                    msj = tools.ustr(res.get('msg', False))
+                    index_xml = res.get('cfdi_xml', False)
+                    data_attach = {
+                        'name': fname_invoice,
+                        'datas': base64.encodestring(res.get('cfdi_xml', False)),
+                        'datas_fname': fname_invoice,
+                        'description': 'Factura-E XML CFD-I SIGN',
+                        'res_model': 'account.invoice',
+                        #'res_id': invoice.id,
+                    }
+                    attach = attachment_obj.create(cr, uid, data_attach, context=context)
+                else:
+                    msj += _("Unknow driver for %s"%(type))
             self.write(cr, uid, ids,
-                              {'file_xml_sign': attach or False,
-                               'last_date': time.strftime('%Y-%m-%d %H:%M:%S'),
-                               'msj': msj,
-                               'file_xml_sign_index': index_xml}, context=context)
+                          {'file_xml_sign': attach or False,
+                           'last_date': time.strftime('%Y-%m-%d %H:%M:%S'),
+                           'msj': msj,
+                           'file_xml_sign_index': index_xml}, context=context)
             wf_service.trg_validate(uid, self._name, ids[0], 'action_sign', cr)
             return True
         except Exception, e:
-            self.write(cr, uid, ids, {'msj': tools.ustr(e)}, context={})
+            self.write(cr, uid, ids, {'msj': tools.ustr(e)}, context=context)
+            import traceback, sys
+            traceback.print_stack()
             return False
                            
     def action_sign(self, cr, uid, ids, context=None):
@@ -239,11 +267,11 @@
                         'file_pdf': aids or False,
                         'msj': msj,
                         'last_date': time.strftime('%Y-%m-%d %H:%M:%S'),
-                        'file_pdf_index': index_pdf }, context={})
+                        'file_pdf_index': index_pdf }, context=context)
             wf_service.trg_validate(uid, self._name, ids[0], 'action_printable', cr)
             return True
         except Exception, e:
-            self.write(cr, uid, ids, {'msj': tools.ustr(e)}, context={})
+            self.write(cr, uid, ids, {'msj': tools.ustr(e)}, context=context)
             return False
     
     def action_printable(self, cr, uid, ids, context=None):
@@ -347,7 +375,7 @@
                 wf_service.trg_validate(uid, self._name, ids[0], 'action_send_customer', cr)
             return True
         except Exception, e:
-            self.write(cr, uid, ids, {'msj': tools.ustr(e)}, context={})
+            self.write(cr, uid, ids, {'msj': tools.ustr(e)}, context=context)
             return False
     
     def action_send_customer(self, cr, uid, ids, context=None):
@@ -365,7 +393,7 @@
             wf_service.trg_validate(uid, self._name, ids[0], 'action_send_backup', cr)
             return True
         except Exception, e:
-            self.write(cr, uid, ids, {'msj': tools.ustr(e)}, context={})
+            self.write(cr, uid, ids, {'msj': tools.ustr(e)}, context=context)
             return False
         
     def action_send_backup(self, cr, uid, ids, context=None):
@@ -383,54 +411,49 @@
             wf_service.trg_validate(uid, self._name, ids[0], 'action_done', cr)
             return True
         except Exception, e:
-            self.write(cr, uid, ids, {'msj': tools.ustr(e)}, context={})
+            self.write(cr, uid, ids, {'msj': tools.ustr(e)}, context=context)
             return False
 
     def action_done(self, cr, uid, ids, context=None):
        return self.write(cr, uid, ids, {'state': 'done'}, context=context)
-
+    
     def signal_cancel(self, cr, uid, ids, context=None):
-        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_obj = self.pool.get('account.invoice')
-            attach_obj = self.pool.get('ir.attachment')
-            type = self.browse(cr, uid, ids)[0].type
-            state = self.browse(cr, uid, ids)[0].state
-            invoice = self.browse(cr, uid, ids)[0].invoice_id
-            invoice_state = self.browse(cr, uid, ids)[0].invoice_id.state
-            wf_service = netsvc.LocalService("workflow")
-            if invoice_state in ['cancel']:
-                if type == 'cbb':
-                    wf_service.trg_validate(uid, self._name, ids[0], 'action_cancel', cr)
-                    msj = _('Cancel\n')
-                if type == 'cfd22':
-                    wf_service.trg_validate(uid, self._name, ids[0], 'action_cancel', cr)
-                    msj = _('Cancel\n')
-                if type == 'cfdi32':
-                    if state in ['cancel', 'draft', 'confirmed']:
-                        wf_service.trg_validate(uid, self._name, ids[0], 'action_cancel', cr)
-                        msj = _('Cancel\n')
+            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))
+                        if cfdi_cancel.get('status', True):#TODO, validate cfdi_cancel True or False
+                            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:
-                        sf_cancel = invoice_obj.sf_cancel(
-                                cr, uid, [invoice.id], context=context)
-                        wf_service.trg_validate(uid, self._name, ids[0], 'action_cancel', cr)
-                        msj += tools.ustr(sf_cancel.get('message', False))
-                        #Para que no aparescan los adjuntos en facturas canceladas
-                        ##adjuntos = attach_obj.search(cr, uid, [(
-                            ##'res_model', '=', 'account.invoice'),
-                            ##('res_id', '=', invoice)])
-                        ##for attachment in self.browse(cr, uid, adjuntos, context):
-                            ##ids2 = attach_obj.write(cr, uid, [attachment.id], {
-                                ##'res_id': False, }, context=context)
+                        msj += _("Unknow cfdi driver for %s"%(ir_attach_facturae_mx_id.type))
             else:
-                invoice_obj.action_cancel(cr, uid, [invoice.id], context)
-            self.write(cr, uid, ids,
-                          {'last_date': time.strftime('%Y-%m-%d %H:%M:%S'),
-                            'msj': msj})
-            return True
-        except Exception, e:
-            self.write(cr, uid, ids, {'msj': tools.ustr(e)}, context={})
-            return False
+                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'
+                        
+            self.write(cr, uid, ids, {
+              'last_date': time.strftime('%Y-%m-%d %H:%M:%S'),
+              'msj': msj,
+            })
+        return inv_cancel_status
     
     def action_cancel(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'cancel'}, context=context)