Merge lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_facturae-Jinja2-template-CFD-CFDI-dev_jc into lp:openerp-mexico-localization/7.0

[Juan Carlos Hernandez]

se agregó Jinja para crear los XML CFD y CFDI version 3.2.Es decir una plantilla para CFD y CFDI
se agregó una función para quitar los acentos.

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

Merged to Trunk

=== modified file 'l10n_mx_facturae/__openerp__.py'
--- l10n_mx_facturae/__openerp__.py	2013-10-04 23:02:23 +0000
+++ l10n_mx_facturae/__openerp__.py	2014-01-25 00:46:46 +0000
@@ -68,6 +68,7 @@
             "l10n_mx_facturae_report",
             "l10n_mx_facturae_group_show_wizards",
             "l10n_mx_settings_facturae",
+            "l10n_mx_params_pac",
         ],
     "demo" : [
         "demo/l10n_mx_facturae_seq_demo.xml",

=== modified file 'l10n_mx_facturae/invoice.py'
--- l10n_mx_facturae/invoice.py	2013-12-10 01:11:31 +0000
+++ l10n_mx_facturae/invoice.py	2014-01-25 00:46:46 +0000
@@ -45,6 +45,9 @@
 import os
 import codecs
 from datetime import datetime, timedelta
+import jinja2
+import xml
+import unicodedata
 
 
 def exec_command_pipe(name, *args):
@@ -80,37 +83,6 @@
                 return val
     return None
 
-# TODO: Agregar una libreria para esto
-
-
-def conv_ascii(text):
-    """
-    @param text : text that need convert vowels accented & characters to ASCII
-    Converts accented vowels, ñ and ç to their ASCII equivalent characters
-    """
-    old_chars = [
-        'á', 'é', 'í', 'ó', 'ú', 'à', 'è', 'ì', 'ò', 'ù', 'ä', 'ë', 'ï', 'ö',
-        'ü', 'â', 'ê', 'î', 'ô', 'û', 'Á', 'É', 'Í', 'Ó', 'Ú', 'À', 'È', 'Ì',
-        'Ò', 'Ù', 'Ä', 'Ë', 'Ï', 'Ö', 'Ü', 'Â', 'Ê', 'Î', 'Ô', 'Û', 'ñ', 'Ñ',
-        'ç', 'Ç', 'ª', 'º', '°', ' ', 'Ã', 'Ø'
-    ]
-    new_chars = [
-        'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o',
-        'u', 'a', 'e', 'i', 'o', 'u', 'A', 'E', 'I', 'O', 'U', 'A', 'E', 'I',
-        'O', 'U', 'A', 'E', 'I', 'O', 'U', 'A', 'E', 'I', 'O', 'U', 'n', 'N',
-        'c', 'C', 'a', 'o', 'o', ' ', 'A', '0'
-    ]
-    for old, new in zip(old_chars, new_chars):
-        try:
-            text = text.replace(unicode(old, 'UTF-8'), new)
-        except:
-            try:
-                text = text.replace(old, new)
-            except:
-                raise osv.except_osv(_('Warning !'), _(
-                    "Can't recode the string [%s] in the letter [%s]") % (text, old))
-    return text
-
 # Cambiar el error
 msg2 = "Contact you administrator &/or to [e-mail]"
 
@@ -118,6 +90,39 @@
 class account_invoice(osv.Model):
     _inherit = 'account.invoice'
 
+    def remove_accents(self, cr, uid, ids, input_str):
+        nkfd_form = unicodedata.normalize('NFKD', unicode(input_str))
+        only_ascii = nkfd_form.encode('ASCII', 'ignore')
+        return self.conv_ascii(cr, uid, ids, only_ascii)
+    
+    def conv_ascii(self, cr, uid, ids, text):
+        """
+        @param text : text that need convert vowels accented & characters to ASCII
+        Converts accented vowels, ñ and ç to their ASCII equivalent characters
+        """
+        old_chars = [
+            'á', 'é', 'í', 'ó', 'ú', 'à', 'è', 'ì', 'ò', 'ù', 'ä', 'ë', 'ï', 'ö',
+            'ü', 'â', 'ê', 'î', 'ô', 'û', 'Á', 'É', 'Í', 'Ó', 'Ú', 'À', 'È', 'Ì',
+            'Ò', 'Ù', 'Ä', 'Ë', 'Ï', 'Ö', 'Ü', 'Â', 'Ê', 'Î', 'Ô', 'Û', 'ñ', 'Ñ',
+            'ç', 'Ç', 'ª', 'º', '°', ' ', 'Ã', 'Ø', '&', '´'
+        ]
+        new_chars = [
+            'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o',
+            'u', 'a', 'e', 'i', 'o', 'u', 'A', 'E', 'I', 'O', 'U', 'A', 'E', 'I',
+            'O', 'U', 'A', 'E', 'I', 'O', 'U', 'A', 'E', 'I', 'O', 'U', 'n', 'N',
+            'c', 'C', 'a', 'o', 'o', ' ', 'A', '0' ,'y', ''
+        ]
+        for old, new in zip(old_chars, new_chars):
+            try:
+                text = text.replace(unicode(old, 'UTF-8'), new)
+            except:
+                try:
+                    text = text.replace(old, new)
+                except:
+                    raise osv.except_osv(_('Warning !'), _(
+                        "Can't recode the string [%s] in the letter [%s]") % (text, old))
+        return text
+
     def create_report(self, cr, uid, res_ids, report_name=False, file_name=False, context=None):
         """
         @param report_name : Name of report with the name of object more type
@@ -700,7 +705,7 @@
             key_item_sort.append([key_too, data_dict[key_too]])
         return key_item_sort
 
-    def dict2xml(self, data_dict, node=False, doc=False):
+    def dict2xml(self, cr, uid, ids, data_dict, node=False, doc=False):
         """
         @param data_dict : Dictionary of attributes for add in the XML 
                     that will be generated
@@ -717,20 +722,20 @@
             if isinstance(attribute, dict):
                 if not parent:
                     node = doc.createElement(element)
-                    self.dict2xml(attribute, node, doc)
+                    self.dict2xml(cr, uid, ids, attribute, node, doc)
                 else:
                     child = doc.createElement(element)
-                    self.dict2xml(attribute, child, doc)
+                    self.dict2xml(cr, uid, ids, attribute, child, doc)
                     node.appendChild(child)
             elif isinstance(attribute, list):
                 child = doc.createElement(element)
                 for attr in attribute:
                     if isinstance(attr, dict):
-                        self.dict2xml(attr, child, doc)
+                        self.dict2xml(cr, uid, ids, attr, child, doc)
                 node.appendChild(child)
             else:
                 if isinstance(attribute, str) or isinstance(attribute, unicode):
-                    attribute = conv_ascii(attribute)
+                    attribute = self.remove_accents(cr, uid, ids, attribute)
                 else:
                         attribute = str(attribute)
                 node.setAttribute(element, attribute)
@@ -742,88 +747,104 @@
     def _get_facturae_invoice_xml_data(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        data_dict = self._get_facturae_invoice_dict_data(
-            cr, uid, ids, context=context)[0]
-        doc_xml = self.dict2xml({
-                                'Comprobante': data_dict.get('Comprobante')})
-        invoice_number = "sn"
-        (fileno_xml, fname_xml) = tempfile.mkstemp(
+        data_dict = self._get_facturae_invoice_dict_data(cr, uid, ids, context=context)[0]
+        data_xml=False
+        fname_xml=False
+        ir_seq_app_obj = self.pool.get('ir.sequence.approval')
+        invoice = self.browse(cr, uid, ids[0], context=context)
+        sequence_app_id = ir_seq_app_obj.search(cr, uid, [(
+            'sequence_id', '=', invoice.invoice_sequence_id.id)], context=context)
+        if sequence_app_id:
+            type_inv = ir_seq_app_obj.browse(cr, uid, sequence_app_id[0], context=context).type
+        if not 'cfdi' in type_inv:
+            #doc_xml = self.dict2xml(cr, uid, ids, {'Comprobante': data_dict.get('Comprobante')})
+            all_paths = tools.config["addons_path"].split(",")
+            for my_path in all_paths:
+                if os.path.isdir(os.path.join(my_path, 'l10n_mx_facturae', 'template')):
+                    fname_jinja_tmpl = my_path and os.path.join(my_path, 'l10n_mx_facturae', 'template', 'cfd' + '.xml') or ''
+            dictargs = {
+                'o': data_dict
+                }
+            invoice_number = "sn"
+            (fileno_xml, fname_xml) = tempfile.mkstemp('.xml', 'openerp_' + (invoice_number or '') + '__facturae__')
+            with open(fname_jinja_tmpl, 'r') as f_jinja_tmpl:
+                jinja_tmpl_str = f_jinja_tmpl.read().encode('utf-8')
+                tmpl = jinja2.Template( jinja_tmpl_str )
+                with open(fname_xml, 'w') as new_xml:
+                    new_xml.write( tmpl.render(**dictargs) )
+            with open(fname_xml,'rb') as b:
+                jinja2_xml = b.read().encode('utf-8')
+                doc_xml = xml.dom.minidom.parseString(jinja2_xml)
+            (fileno_xml, fname_xml) = tempfile.mkstemp(
             '.xml', 'openerp_' + (invoice_number or '') + '__facturae__')
-        fname_txt = fname_xml + '.txt'
-        f = open(fname_xml, 'w')
-        doc_xml.writexml(
-            f, indent='    ', addindent='    ', newl='\r\n', encoding='UTF-8')
-        f.close()
-        os.close(fileno_xml)
-
-        (fileno_sign, fname_sign) = tempfile.mkstemp('.txt', 'openerp_' + (
-            invoice_number or '') + '__facturae_txt_md5__')
-        os.close(fileno_sign)
-
-        context.update({
-            'fname_xml': fname_xml,
-            'fname_txt': fname_txt,
-            'fname_sign': fname_sign,
-        })
-        context.update(self._get_file_globals(cr, uid, ids, context=context))
-        fname_txt, txt_str = self._xml2cad_orig(
-            cr=False, uid=False, ids=False, context=context)
-        data_dict['cadena_original'] = txt_str
-
-        if not txt_str:
-            raise osv.except_osv(_('Error en Cadena original!'), _(
-                "Can't get the string original of the voucher.\nCkeck your configuration.\n%s" % (msg2)))
-
-        if not data_dict['Comprobante'].get('folio', ''):
-            raise osv.except_osv(_('Error in Folio!'), _(
-                "Can't get the folio of the voucher.\nBefore generating the XML, click on the button, generate invoice.\nCkeck your configuration.\n%s" % (msg2)))
-
-        # time.strftime('%Y-%m-%dT%H:%M:%S',
-        # time.strptime(invoice.date_invoice, '%Y-%m-%d %H:%M:%S'))
-        context.update({'fecha': data_dict['Comprobante']['fecha']})
-        sign_str = self._get_sello(
-            cr=False, uid=False, ids=False, context=context)
-        if not sign_str:
-            raise osv.except_osv(_('Error in Stamp !'), _(
-                "Can't generate the stamp of the voucher.\nCkeck your configuration.\ns%s") % (msg2))
-
-        nodeComprobante = doc_xml.getElementsByTagName("Comprobante")[0]
-        nodeComprobante.setAttribute("sello", sign_str)
-        data_dict['Comprobante']['sello'] = sign_str
-
-        noCertificado = self._get_noCertificado(cr, uid, ids, context['fname_cer'])
-        if not noCertificado:
-            raise osv.except_osv(_('Error in No. Certificate !'), _(
-                "Can't get the Certificate Number of the voucher.\nCkeck your configuration.\n%s") % (msg2))
-        nodeComprobante.setAttribute("noCertificado", noCertificado)
-        data_dict['Comprobante']['noCertificado'] = noCertificado
-
-        cert_str = self._get_certificate_str(context['fname_cer'])
-        if not cert_str:
-            raise osv.except_osv(_('Error in Certificate!'), _(
-                "Can't generate the Certificate of the voucher.\nCkeck your configuration.\n%s") % (msg2))
-        cert_str = cert_str.replace(' ', '').replace('\n', '')
-        nodeComprobante.setAttribute("certificado", cert_str)
-        data_dict['Comprobante']['certificado'] = cert_str
-
-        self.write_cfd_data(cr, uid, ids, data_dict, context=context)
-
-        if context.get('type_data') == 'dict':
-            return data_dict
-        if context.get('type_data') == 'xml_obj':
-            return doc_xml
-        data_xml = doc_xml.toxml('UTF-8')
-        data_xml = codecs.BOM_UTF8 + data_xml
-        fname_xml = (data_dict['Comprobante']['Emisor']['rfc'] or '') + '_' + (
-            data_dict['Comprobante'].get('serie', '') or '') + '_' + (
-            data_dict['Comprobante'].get('folio', '') or '') + '.xml'
-        data_xml = data_xml.replace('<?xml version="1.0" encoding="UTF-8"?>', '<?xml version="1.0" encoding="UTF-8"?>\n')
-        date_invoice = data_dict.get('Comprobante',{}) and datetime.strptime( data_dict.get('Comprobante',{}).get('fecha',{}), '%Y-%m-%dT%H:%M:%S').strftime('%Y-%m-%d') or False
-        facturae_version = '2.2'
-        if date_invoice  and date_invoice < '2012-07-01':
-            facturae_version = '2.0'
-        self.validate_scheme_facturae_xml(cr, uid, ids, [data_xml], facturae_version)
-        data_dict.get('Comprobante',{})
+            fname_txt = fname_xml + '.txt'
+            f = open(fname_xml, 'w')
+            doc_xml.writexml(f, indent='    ', addindent='    ', newl='\r\n', encoding='UTF-8')
+            f.close()
+            os.close(fileno_xml)
+            (fileno_sign, fname_sign) = tempfile.mkstemp('.txt', 'openerp_' + (
+                invoice_number or '') + '__facturae_txt_md5__')
+            os.close(fileno_sign)
+            context.update({
+                'fname_xml': fname_xml,
+                'fname_txt': fname_txt,
+                'fname_sign': fname_sign,
+            })
+            context.update(self._get_file_globals(cr, uid, ids, context=context))
+            fname_txt, txt_str = self._xml2cad_orig(cr=False, uid=False, ids=False, context=context)
+            data_dict['cadena_original'] = txt_str
+
+            if not txt_str:
+                raise osv.except_osv(_('Error en Cadena original!'), _(
+                    "Can't get the string original of the voucher.\nCkeck your configuration.\n%s" % (msg2)))
+
+            if not data_dict['Comprobante'].get('folio', ''):
+                raise osv.except_osv(_('Error in Folio!'), _(
+                    "Can't get the folio of the voucher.\nBefore generating the XML, click on the button, generate invoice.\nCkeck your configuration.\n%s" % (msg2)))
+
+            # time.strftime('%Y-%m-%dT%H:%M:%S',
+            # time.strptime(invoice.date_invoice, '%Y-%m-%d %H:%M:%S'))
+            context.update({'fecha': data_dict['Comprobante']['fecha']})
+            sign_str = self._get_sello(cr=False, uid=False, ids=False, context=context)
+            if not sign_str:
+                raise osv.except_osv(_('Error in Stamp !'), _(
+                    "Can't generate the stamp of the voucher.\nCkeck your configuration.\ns%s") % (msg2))
+
+            nodeComprobante = doc_xml.getElementsByTagName("Comprobante")[0]
+            nodeComprobante.setAttribute("sello", sign_str)
+            data_dict['Comprobante']['sello'] = sign_str
+
+            noCertificado = self._get_noCertificado(cr, uid, ids, context['fname_cer'])
+            if not noCertificado:
+                raise osv.except_osv(_('Error in No. Certificate !'), _(
+                    "Can't get the Certificate Number of the voucher.\nCkeck your configuration.\n%s") % (msg2))
+            nodeComprobante.setAttribute("noCertificado", noCertificado)
+            data_dict['Comprobante']['noCertificado'] = noCertificado
+
+            cert_str = self._get_certificate_str(context['fname_cer'])
+            if not cert_str:
+                raise osv.except_osv(_('Error in Certificate!'), _(
+                    "Can't generate the Certificate of the voucher.\nCkeck your configuration.\n%s") % (msg2))
+            cert_str = cert_str.replace(' ', '').replace('\n', '')
+            nodeComprobante.setAttribute("certificado", cert_str)
+            data_dict['Comprobante']['certificado'] = cert_str
+                
+            self.write_cfd_data(cr, uid, ids, data_dict, context=context)
+            if context.get('type_data') == 'dict':
+                return data_dict
+            if context.get('type_data') == 'xml_obj':
+                return doc_xml
+            data_xml = doc_xml.toxml('UTF-8')
+            data_xml = codecs.BOM_UTF8 + data_xml
+            fname_xml = (data_dict['Comprobante']['Emisor']['rfc'] or '') + '_' + (
+                data_dict['Comprobante'].get('serie', '') or '') + '_' + (
+                data_dict['Comprobante'].get('folio', '') or '') + '.xml'
+            data_xml = data_xml.replace('<?xml version="1.0" encoding="UTF-8"?>', '<?xml version="1.0" encoding="UTF-8"?>\n')
+            date_invoice = data_dict.get('Comprobante',{}) and datetime.strptime( data_dict.get('Comprobante',{}).get('fecha',{}), '%Y-%m-%dT%H:%M:%S').strftime('%Y-%m-%d') or False
+            facturae_version = '2.2'
+            if date_invoice  and date_invoice < '2012-07-01':
+                facturae_version = '2.0'
+            self.validate_scheme_facturae_xml(cr, uid, ids, [data_xml], facturae_version)
         return fname_xml, data_xml
 
     def validate_scheme_facturae_xml(self, cr, uid, ids, datas_xmls=[], facturae_version = None, facturae_type="cfdv", scheme_type='xsd'):
@@ -842,7 +863,6 @@
                 if os.path.isdir(os.path.join(my_path, 'l10n_mx_facturae', 'SAT')):
                     # If dir is in path, save it on real_path
                     fname_scheme = my_path and os.path.join(my_path, 'l10n_mx_facturae', 'SAT', facturae_type + facturae_version +  '.' + scheme_type) or ''
-                    #fname_scheme = os.path.join(tools.config["addons_path"], u'l10n_mx_facturae', u'SAT', facturae_type + facturae_version +  '.' + scheme_type )
                     fname_out = certificate_lib.b64str_to_tempfile(cr, uid, ids, base64.encodestring(''), file_suffix='.txt', file_prefix='openerp__' + (False or '') + '__schema_validation_result__' )
                     result = certificate_lib.check_xml_scheme(cr, uid, ids, fname_data_xml, fname_scheme, fname_out)
                     if result: #Valida el xml mediante el archivo xsd
@@ -865,8 +885,7 @@
             cfd_data = cfd_datas
             noCertificado = cfd_data.get(
                 'Comprobante', {}).get('noCertificado', '')
-            certificado = cfd_data.get(
-                'Comprobante', {}).get('certificado', '')
+            certificado = cfd_data.get('Comprobante', {}).get('certificado', '')
             sello = cfd_data.get('Comprobante', {}).get('sello', '')
             cadena_original = cfd_data.get('cadena_original', '')
             data = {
@@ -996,7 +1015,7 @@
                 invoice.date_invoice_tz, '%Y-%m-%d %H:%M:%S'))
                 or '',
                 'tipoDeComprobante': tipoComprobante,
-                'formaDePago': u'Pago en una sola exhibición',
+                'formaDePago': "Pago en una sola exhibicion",
                 'noCertificado': '@',
                 'sello': '@',
                 'certificado': '@',
@@ -1036,22 +1055,70 @@
 
             invoice_data = invoice_data_parent['Comprobante']
             invoice_data['Emisor'] = {}
+            name = self.remove_accents(cr, uid, ids, address_invoice_parent.name)
+            calle = address_invoice_parent.street and \
+                        address_invoice_parent.street.replace('\n\r', ' ').\
+                        replace('\r\n', ' ').replace('\n', ' ').replace(
+                        '\r', ' ') or ''
+            calle = self.remove_accents(cr, uid, ids, calle)
+            colonia = address_invoice_parent.street2 and \
+                        address_invoice_parent.street2.replace('\n\r', ' ').\
+                        replace('\r\n', ' ').replace('\n', ' ').replace(
+                        '\r', ' ') or False
+            colonia = self.remove_accents(cr, uid, ids, colonia)
+            localidad = address_invoice_parent.l10n_mx_city2 and \
+                        address_invoice_parent.l10n_mx_city2.replace(
+                        '\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').\
+                        replace('\r', ' ') or False
+            localidad = self.remove_accents(cr, uid, ids, localidad)
+            municipio = address_invoice_parent.city and \
+                        address_invoice_parent.city.replace('\n\r', ' ').\
+                        replace('\r\n', ' ').replace('\n', ' ').replace(
+                        '\r', ' ') or ''
+            municipio = self.remove_accents(cr, uid, ids, municipio)
+            estado = address_invoice_parent.state_id and \
+                        address_invoice_parent.state_id.name and \
+                        address_invoice_parent.state_id.name.replace(
+                        '\n\r', ' ').replace('\r\n', ' ').replace(
+                        '\n', ' ').replace('\r', ' ') or ''
+            estado = self.remove_accents(cr, uid, ids, estado)
+            pais = address_invoice_parent.country_id and address_invoice_parent.\
+                        country_id.name and address_invoice_parent.country_id.name.\
+                        replace('\n\r', ' ').replace('\r\n', ' ').replace(
+                        '\n', ' ').replace('\r', ' ') or ''
+            pais = self.remove_accents(cr, uid, ids, pais)
+            
+            ExpedidoEncalle = address_invoice.street and address_invoice.\
+                        street.replace('\n\r', ' ').replace('\r\n', ' ').\
+                        replace('\n', ' ').replace('\r', ' ') or ''
+            ExpedidoEncalle = self.remove_accents(cr, uid, ids, ExpedidoEncalle)
+            ExpedidoEncolonia = address_invoice.street2 and address_invoice.\
+                        street2.replace('\n\r', ' ').replace('\r\n', ' ').\
+                        replace('\n', ' ').replace('\r', ' ') or False
+            ExpedidoEncolonia = self.remove_accents(cr, uid, ids, ExpedidoEncolonia)
+            ExpedidoEnlocalidad = address_invoice.l10n_mx_city2 and \
+                        address_invoice.l10n_mx_city2.replace('\n\r', ' ').\
+                        replace('\r\n', ' ').replace('\n', ' ').replace(
+                        '\r', ' ') or False
+            ExpedidoEnlocalidad = self.remove_accents(cr, uid, ids, ExpedidoEnlocalidad)
+            ExpedidoEnmunicipio = address_invoice.city and address_invoice.\
+                        city.replace('\n\r', ' ').replace('\r\n', ' ').replace(
+                        '\n', ' ').replace('\r', ' ') or ''
+            ExpedidoEnmunicipio = self.remove_accents(cr, uid, ids, ExpedidoEnmunicipio)
+            ExpedidoEnestado = address_invoice.state_id and address_invoice.\
+                        state_id.name and address_invoice.state_id.name.replace(
+                        '\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').\
+                        replace('\r', ' ') or ''
+            ExpedidoEnestado = self.remove_accents(cr, uid, ids, ExpedidoEnestado)
+            
+            
             invoice_data['Emisor'].update({
-
                 'rfc': (('vat_split' in address_invoice_parent._columns and \
                 address_invoice_parent.vat_split or address_invoice_parent.vat) \
                 or '').replace('-', ' ').replace(' ', ''),
-                'nombre': address_invoice_parent.name or '',
-                # Obtener domicilio dinamicamente
-                # virtual_invoice.append( (invoice.company_id and
-                # invoice.company_id.partner_id and
-                # invoice.company_id.partner_id.vat or '').replac
-
+                'nombre': name or '',
                 'DomicilioFiscal': {
-                    'calle': address_invoice_parent.street and \
-                        address_invoice_parent.street.replace('\n\r', ' ').\
-                        replace('\r\n', ' ').replace('\n', ' ').replace(
-                        '\r', ' ') or '',
+                    'calle': calle or '',
                     'noExterior': address_invoice_parent.l10n_mx_street3 and \
                         address_invoice_parent.l10n_mx_street3.replace(
                         '\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').\
@@ -1060,37 +1127,18 @@
                         address_invoice_parent.l10n_mx_street4.replace(
                         '\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').\
                         replace('\r', ' ') or 'N/A',  # "Numero Interior"
-                    'colonia':  address_invoice_parent.street2 and \
-                        address_invoice_parent.street2.replace('\n\r', ' ').\
-                        replace('\r\n', ' ').replace('\n', ' ').replace(
-                        '\r', ' ') or False,
-                    'localidad': address_invoice_parent.l10n_mx_city2 and \
-                        address_invoice_parent.l10n_mx_city2.replace(
-                        '\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').\
-                        replace('\r', ' ') or False,
-                    'municipio': address_invoice_parent.city and \
-                        address_invoice_parent.city.replace('\n\r', ' ').\
-                        replace('\r\n', ' ').replace('\n', ' ').replace(
-                        '\r', ' ') or '',
-                    'estado': address_invoice_parent.state_id and \
-                        address_invoice_parent.state_id.name and \
-                        address_invoice_parent.state_id.name.replace(
-                        '\n\r', ' ').replace('\r\n', ' ').replace(
-                        '\n', ' ').replace('\r', ' ') or '',
-                    'pais': address_invoice_parent.country_id and \
-                        address_invoice_parent.country_id.name and \
-                        address_invoice_parent.country_id.name.replace(
-                        '\n\r', ' ').replace('\r\n', ' ').replace(
-                        '\n', ' ').replace('\r', ' ')or '',
+                    'colonia': colonia or False,
+                    'localidad': localidad or False,
+                    'municipio': municipio or '',
+                    'estado': estado or '',
+                    'pais': pais or '',
                     'codigoPostal': address_invoice_parent.zip and \
                         address_invoice_parent.zip.replace('\n\r', ' ').\
                         replace('\r\n', ' ').replace('\n', ' ').replace(
                         '\r', ' ').replace(' ', '') or '',
                 },
                 'ExpedidoEn': {
-                    'calle': address_invoice.street and address_invoice.\
-                        street.replace('\n\r', ' ').replace('\r\n', ' ').\
-                        replace('\n', ' ').replace('\r', ' ') or '',
+                    'calle': ExpedidoEncalle or '',
                     'noExterior': address_invoice.l10n_mx_street3 and \
                         address_invoice.l10n_mx_street3.replace(
                         '\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').\
@@ -1099,24 +1147,11 @@
                         address_invoice.l10n_mx_street4.replace('\n\r', ' ').\
                         replace('\r\n', ' ').replace('\n', ' ').replace(
                         '\r', ' ') or 'N/A',  # "Numero Interior"
-                    'colonia':  address_invoice.street2 and address_invoice.\
-                        street2.replace('\n\r', ' ').replace('\r\n', ' ').\
-                        replace('\n', ' ').replace('\r', ' ') or False,
-                    'localidad': address_invoice.l10n_mx_city2 and \
-                        address_invoice.l10n_mx_city2.replace('\n\r', ' ').\
-                        replace('\r\n', ' ').replace('\n', ' ').replace(
-                        '\r', ' ') or False,
-                    'municipio': address_invoice.city and address_invoice.\
-                        city.replace('\n\r', ' ').replace('\r\n', ' ').replace(
-                        '\n', ' ').replace('\r', ' ') or '',
-                    'estado': address_invoice.state_id and address_invoice.\
-                        state_id.name and address_invoice.state_id.name.replace(
-                        '\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').\
-                        replace('\r', ' ') or '',
-                    'pais': address_invoice.country_id and address_invoice.\
-                        country_id.name and address_invoice.country_id.name.\
-                        replace('\n\r', ' ').replace('\r\n', ' ').replace(
-                        '\n', ' ').replace('\r', ' ')or '',
+                    'colonia':  ExpedidoEncolonia or False,
+                    'localidad': ExpedidoEnlocalidad or False,
+                    'municipio': ExpedidoEnmunicipio or '',
+                    'estado': ExpedidoEnestado or '',
+                    'pais': pais or '',
                     'codigoPostal': address_invoice.zip and address_invoice.\
                         zip.replace('\n\r', ' ').replace('\r\n', ' ').replace(
                         '\n', ' ').replace('\r', ' ').replace(' ', '') or '',
@@ -1148,13 +1183,40 @@
             address_invoice = partner_obj.browse(cr, uid, \
                 invoice.partner_id.id, context=context)
             invoice_data['Receptor'] = {}
+            parent_name = self.remove_accents(cr, uid, ids, parent_obj.name)
+            Receptorcalle = address_invoice.street and address_invoice.\
+                        street.replace('\n\r', ' ').replace('\r\n', ' ').replace(
+                        '\n', ' ').replace('\r', ' ') or ''
+            Receptorcalle = self.remove_accents(cr, uid, ids, Receptorcalle)
+            Receptorpais = address_invoice.country_id and address_invoice.\
+                        country_id.name and address_invoice.country_id.name.\
+                        replace('\n\r', ' ').replace('\r\n', ' ').replace(
+                        '\n', ' ').replace('\r', ' ')or ''
+            Receptorpais = self.remove_accents(cr, uid, ids, Receptorpais)
+            Receptorcolonia = address_invoice.street2 and address_invoice.\
+                        street2.replace('\n\r', ' ').replace('\r\n', ' ').\
+                        replace('\n', ' ').replace('\r', ' ') or False
+            Receptorcolonia = self.remove_accents(cr, uid, ids, Receptorcolonia)
+            Receptorlocalidad = address_invoice.l10n_mx_city2 and \
+                        address_invoice.l10n_mx_city2.replace('\n\r', ' ').\
+                        replace('\r\n', ' ').replace('\n', ' ').replace(
+                        '\r', ' ') or False
+            Receptorlocalidad = self.remove_accents(cr, uid, ids, Receptorlocalidad)
+            Receptormunicipio = address_invoice.city and address_invoice.\
+                        city.replace('\n\r', ' ').replace('\r\n', ' ').replace(
+                        '\n', ' ').replace('\r', ' ') or ''
+            Receptormunicipio = self.remove_accents(cr, uid, ids, Receptormunicipio)
+            Receptorestado = address_invoice.state_id and address_invoice.\
+                        state_id.name and address_invoice.state_id.name.replace(
+                        '\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').\
+                        replace('\r', ' ') or ''
+            Receptorestado = self.remove_accents(cr, uid, ids, Receptorestado)
+            
             invoice_data['Receptor'].update({
                 'rfc': rfc,
-                'nombre': (parent_obj.name or ''),
+                'nombre': parent_name or '',
                 'Domicilio': {
-                    'calle': address_invoice.street and address_invoice.\
-                        street.replace('\n\r', ' ').replace('\r\n', ' ').replace(
-                        '\n', ' ').replace('\r', ' ') or '',
+                    'calle': Receptorcalle or '',
                     'noExterior': address_invoice.l10n_mx_street3 and \
                         address_invoice.l10n_mx_street3.replace('\n\r', ' ').\
                         replace('\r\n', ' ').replace('\n', ' ').replace(
@@ -1163,24 +1225,11 @@
                         address_invoice.l10n_mx_street4.replace('\n\r', ' ').\
                         replace('\r\n', ' ').replace('\n', ' ').replace(
                         '\r', ' ') or 'N/A',  # "Numero Interior"
-                    'colonia':  address_invoice.street2 and address_invoice.\
-                        street2.replace('\n\r', ' ').replace('\r\n', ' ').\
-                        replace('\n', ' ').replace('\r', ' ') or False,
-                    'localidad': address_invoice.l10n_mx_city2 and \
-                        address_invoice.l10n_mx_city2.replace('\n\r', ' ').\
-                        replace('\r\n', ' ').replace('\n', ' ').replace(
-                        '\r', ' ') or False,
-                    'municipio': address_invoice.city and address_invoice.\
-                        city.replace('\n\r', ' ').replace('\r\n', ' ').replace(
-                        '\n', ' ').replace('\r', ' ') or '',
-                    'estado': address_invoice.state_id and address_invoice.\
-                        state_id.name and address_invoice.state_id.name.replace(
-                        '\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').\
-                        replace('\r', ' ') or '',
-                    'pais': address_invoice.country_id and address_invoice.\
-                        country_id.name and address_invoice.country_id.name.\
-                        replace('\n\r', ' ').replace('\r\n', ' ').replace(
-                        '\n', ' ').replace('\r', ' ')or '',
+                    'colonia':  Receptorcolonia or False,
+                    'localidad': Receptorlocalidad or False,
+                    'municipio': Receptormunicipio or '',
+                    'estado': Receptorestado or '',
+                    'pais': Receptorpais or '',
                     'codigoPostal': address_invoice.zip and address_invoice.\
                         zip.replace('\n\r', ' ').replace('\r\n', ' ').replace(
                         '\n', ' ').replace('\r', ' ') or '',
@@ -1202,7 +1251,7 @@
                     line.quantity or 0.0
                 concepto = {
                     'cantidad': "%.2f" % (line.quantity or 0.0),
-                    'descripcion': line.name or '',
+                    'descripcion': self.remove_accents(cr, uid, ids, line.name) or '',
                     'valorUnitario': "%.2f" % (price_unit or 0.0),
                     'importe': "%.2f" % (line.price_subtotal or 0.0),  # round(line.price_unit *(1-(line.discount/100)),2) or 0.00),#Calc: iva, disc, qty
                     # Falta agregar discount
@@ -1259,7 +1308,7 @@
                     totalImpuestosRetenidos += line_tax_id_amount
                 impuesto_dict = {impuesto_str:
                                 {
-                                 'impuesto': tax_name,
+                                 'impuesto': self.remove_accents(cr, uid, ids, tax_name),
                                  'importe': "%.2f" % (line_tax_id_amount),
                                  }
                                  }
@@ -1281,7 +1330,7 @@
                 if tax_required in tax_names:
                     continue
                 invoice_data_impuestos['Traslados'].append({'Traslado': {
-                    'impuesto': tax_required,
+                    'impuesto': self.remove_accents(cr, uid, ids, tax_required),
                     'tasa': "%.2f" % (0.0),
                     'importe': "%.2f" % (0.0),
                 }})
@@ -1349,11 +1398,12 @@
             invoice_data_parents[0]['Comprobante'][
                 'NumCtaPago'] = invoice.acc_payment.last_acc_number\
                     or 'No identificado'
+            metodoDePago = invoice.pay_method_id.name or 'No identificado'
             invoice_data_parents[0]['Comprobante'][
-                'metodoDePago'] = invoice.pay_method_id.name or 'No identificado'
-            invoice_data_parents[0]['Comprobante']['Emisor']['RegimenFiscal'] = {
-                'Regimen': invoice.company_emitter_id.partner_id.\
-                    regimen_fiscal_id.name or ''}
+                'metodoDePago'] = self.remove_accents(cr, uid, ids, metodoDePago)
+            regimen = invoice.company_emitter_id.partner_id.regimen_fiscal_id.name or ''
+            regimen = self.remove_accents(cr, uid, ids, regimen)
+            invoice_data_parents[0]['Comprobante']['Emisor']['RegimenFiscal'] ={'Regimen': regimen}
             invoice_data_parents[0]['Comprobante']['LugarExpedicion'] = address
         return invoice_data_parents
 

=== added directory 'l10n_mx_facturae/template'
=== added file 'l10n_mx_facturae/template/cfd.xml'
--- l10n_mx_facturae/template/cfd.xml	1970-01-01 00:00:00 +0000
+++ l10n_mx_facturae/template/cfd.xml	2014-01-25 00:46:46 +0000
@@ -0,0 +1,1 @@
+<?xml version="1.0" encoding="UTF-8"?><Comprobante LugarExpedicion="{{ o['Comprobante']['LugarExpedicion'] }}" Moneda="{{ o['Comprobante']['Moneda'] }}" NumCtaPago="{{ o['Comprobante']['NumCtaPago'] }}" TipoCambio="{{ o['Comprobante']['TipoCambio'] }}" anoAprobacion="{{ o['Comprobante']['anoAprobacion'] }}" certificado="{{ o['Comprobante']['certificado'] }}" descuento="{{ o['Comprobante']['descuento'] }}" fecha="{{ o['Comprobante']['fecha'] }}" folio="{{ o['Comprobante']['folio'] }}" formaDePago="{{ o['Comprobante']['formaDePago'] }}" metodoDePago="{{ o['Comprobante']['metodoDePago'] }}" noAprobacion="{{ o['Comprobante']['noAprobacion'] }}" noCertificado="{{ o['Comprobante']['noCertificado'] }}" sello="{{ o['Comprobante']['sello'] }}" serie="{{ o['Comprobante']['serie'] }}" subTotal="{{ o['Comprobante']['subTotal'] }}" tipoDeComprobante="{{ o['Comprobante']['tipoDeComprobante'] }}" total="{{ o['Comprobante']['total'] }}" version="{{ o['Comprobante']['version'] }}" xmlns="{{ o['Comprobante']['xmlns'] }}" xmlns:xsi="{{ o['Comprobante']['xmlns:xsi'] }}" xsi:schemaLocation="{{ o['Comprobante']['xsi:schemaLocation'] }}"><Emisor nombre="{{ o['Comprobante']['Emisor']['nombre'] }}" rfc="{{ o['Comprobante']['Emisor']['rfc'] }}"><DomicilioFiscal calle="{{ o['Comprobante']['Emisor']['DomicilioFiscal']['calle'] }}" codigoPostal="{{ o['Comprobante']['Emisor']['DomicilioFiscal']['codigoPostal'] }}" colonia="{{ o['Comprobante']['Emisor']['DomicilioFiscal']['colonia'] }}" estado="{{ o['Comprobante']['Emisor']['DomicilioFiscal']['estado'] }}" localidad="{{ o['Comprobante']['Emisor']['DomicilioFiscal']['localidad'] }}" municipio="{{ o['Comprobante']['Emisor']['DomicilioFiscal']['municipio'] }}" noExterior="{{ o['Comprobante']['Emisor']['DomicilioFiscal']['noExterior'] }}" noInterior="{{ o['Comprobante']['Emisor']['DomicilioFiscal']['noInterior'] }}" pais="{{ o['Comprobante']['Emisor']['DomicilioFiscal']['pais'] }}"/><ExpedidoEn calle="{{ o['Comprobante']['Emisor']['ExpedidoEn']['calle'] }}" codigoPostal="{{ o['Comprobante']['Emisor']['ExpedidoEn']['codigoPostal'] }}" colonia="{{ o['Comprobante']['Emisor']['ExpedidoEn']['colonia'] }}" estado="{{ o['Comprobante']['Emisor']['ExpedidoEn']['estado'] }}" localidad="{{ o['Comprobante']['Emisor']['ExpedidoEn']['localidad'] }}" municipio="{{ o['Comprobante']['Emisor']['ExpedidoEn']['municipio'] }}" noExterior="{{ o['Comprobante']['Emisor']['ExpedidoEn']['noExterior'] }}" noInterior="{{ o['Comprobante']['Emisor']['ExpedidoEn']['noInterior'] }}" pais="{{ o['Comprobante']['Emisor']['ExpedidoEn']['pais'] }}"/><RegimenFiscal Regimen="{{ o['Comprobante']['Emisor']['RegimenFiscal']['Regimen'] }}"/></Emisor><Receptor nombre="{{ o['Comprobante']['Receptor']['nombre'] }}" rfc="{{ o['Comprobante']['Receptor']['rfc'] }}"><Domicilio calle="{{ o['Comprobante']['Receptor']['Domicilio']['calle'] }}" codigoPostal="{{ o['Comprobante']['Receptor']['Domicilio']['codigoPostal'] }}" colonia="{{ o['Comprobante']['Receptor']['Domicilio']['colonia'] }}" estado="{{ o['Comprobante']['Receptor']['Domicilio']['estado'] }}" localidad="{{ o['Comprobante']['Receptor']['Domicilio']['localidad'] }}" municipio="{{ o['Comprobante']['Receptor']['Domicilio']['municipio'] }}" noExterior="{{ o['Comprobante']['Receptor']['Domicilio']['noExterior'] }}" noInterior="{{ o['Comprobante']['Receptor']['Domicilio']['noInterior'] }}" pais="{{ o['Comprobante']['Receptor']['Domicilio']['pais'] }}"/></Receptor>{% if o['Comprobante']['Conceptos']%}<Conceptos>{% for i in o['Comprobante']['Conceptos'] %}<Concepto cantidad="{{ i['Concepto']['cantidad'] }}" descripcion="{{ i['Concepto']['descripcion'] }}" importe="{{ i['Concepto']['importe'] }}" noIdentificacion="{{ i['Concepto']['noIdentificacion'] }}" unidad="{{ i['Concepto']['unidad'] }}" valorUnitario="{{ i['Concepto']['valorUnitario'] }}"/>{% endfor %}{% endif %}</Conceptos>{% if o['Comprobante']['Impuestos']['totalImpuestosTrasladados'] %}<Impuestos totalImpuestosTrasladados="{{ o['Comprobante']['Impuestos']['totalImpuestosTrasladados'] }}"><Traslados>{% for i in o['Comprobante']['Impuestos']['Traslados'] %}<Traslado importe="{{ i['Traslado']['importe'] }}" impuesto="{{ i['Traslado']['impuesto'] }}" tasa="{{ i['Traslado']['tasa'] }}"/>{% endfor %}</Traslados></Impuestos>{% endif %}</Comprobante>
\ No newline at end of file

=== modified file 'l10n_mx_facturae_pac/invoice.py'
--- l10n_mx_facturae_pac/invoice.py	2013-11-20 23:20:47 +0000
+++ l10n_mx_facturae_pac/invoice.py	2014-01-25 00:46:46 +0000
@@ -29,7 +29,6 @@
 import os
 import codecs
 import base64
-import xml.dom.minidom
 from datetime import datetime, timedelta
 from openerp.tools.translate import _
 try:
@@ -39,6 +38,8 @@
     pass
 import time
 from openerp import tools
+import jinja2
+import xml
 
 
 class account_invoice(osv.Model):
@@ -54,7 +55,6 @@
         invoice = self.browse(cr, uid, ids[0], context=context)
         sequence_app_id = ir_seq_app_obj.search(cr, uid, [(
             'sequence_id', '=', invoice.invoice_sequence_id.id)], context=context)
-        type_inv = 'cfd22'
         if sequence_app_id:
             type_inv = ir_seq_app_obj.browse(
                 cr, uid, sequence_app_id[0], context=context).type
@@ -114,6 +114,7 @@
         invoice = self.browse(cr, uid, ids[0], context=context)
         sequence_app_id = ir_seq_app_obj.search(cr, uid, [(
             'sequence_id', '=', invoice.invoice_sequence_id.id)], context=context)
+        all_paths = tools.config["addons_path"].split(",")
         type_inv = 'cfd22'
         if sequence_app_id:
             type_inv = ir_seq_app_obj.browse(
@@ -124,6 +125,10 @@
             receptor = 'cfdi:Receptor'
             concepto = 'cfdi:Conceptos'
             facturae_version = '3.2'
+            for my_path in all_paths:
+                if os.path.isdir(os.path.join(my_path, 'l10n_mx_facturae_pac_sf', 'template')):
+                    fname_jinja_tmpl = my_path and os.path.join(my_path, 'l10n_mx_facturae_pac_sf',
+                                                                'template', 'cfdi' + '.xml') or ''
         else:
             comprobante = 'Comprobante'
             emisor = 'Emisor'
@@ -131,16 +136,30 @@
             receptor = 'Receptor'
             concepto = 'Conceptos'
             facturae_version = '2.2'
-        data_dict = self._get_facturae_invoice_dict_data(
-            cr, uid, ids, context=context)[0]
-        doc_xml = self.dict2xml({comprobante: data_dict.get(comprobante)})
+            for my_path in all_paths:
+                if os.path.isdir(os.path.join(my_path, 'l10n_mx_facturae', 'template')):
+                    fname_jinja_tmpl = my_path and os.path.join(my_path, 'l10n_mx_facturae', 
+                                                                'template', 'cfd' + '.xml') or ''
+            
+        data_dict = self._get_facturae_invoice_dict_data(cr, uid, ids, context=context)[0]
+        dictargs = {
+                    'o': data_dict
+                    }
         invoice_number = "sn"
+        (fileno_xml, fname_xml) = tempfile.mkstemp('.xml', 'openerp_' + (invoice_number or '') + '__facturae__')
+        with open(fname_jinja_tmpl, 'r') as f_jinja_tmpl:
+            jinja_tmpl_str = f_jinja_tmpl.read().encode('utf-8')
+            tmpl = jinja2.Template( jinja_tmpl_str )
+            with open(fname_xml, 'w') as new_xml:
+                new_xml.write( tmpl.render(**dictargs) )
+        with open(fname_xml,'rb') as b:
+            jinja2_xml = b.read().encode('utf-8')
+            doc_xml = xml.dom.minidom.parseString(jinja2_xml)
         (fileno_xml, fname_xml) = tempfile.mkstemp(
             '.xml', 'openerp_' + (invoice_number or '') + '__facturae__')
         fname_txt = fname_xml + '.txt'
         f = open(fname_xml, 'w')
-        doc_xml.writexml(
-            f, indent='    ', addindent='    ', newl='\r\n', encoding='UTF-8')
+        doc_xml.writexml(f, indent='    ', addindent='    ', newl='\r\n', encoding='UTF-8')
         f.close()
         os.close(fileno_xml)
         (fileno_sign, fname_sign) = tempfile.mkstemp('.txt', 'openerp_' + (
@@ -152,8 +171,7 @@
             'fname_sign': fname_sign,
         })
         context.update(self._get_file_globals(cr, uid, ids, context=context))
-        fname_txt, txt_str = self._xml2cad_orig(
-            cr=False, uid=False, ids=False, context=context)
+        fname_txt, txt_str = self._xml2cad_orig(cr=False, uid=False, ids=False, context=context)
         data_dict['cadena_original'] = txt_str
         msg2=''
 
@@ -166,8 +184,7 @@
                 "Can't get the folio of the voucher.\nBefore generating the XML, click on the button, generate invoice.\nCkeck your configuration.\n%s" % (msg2)))
 
         context.update({'fecha': data_dict[comprobante]['fecha']})
-        sign_str = self._get_sello(
-            cr=False, uid=False, ids=False, context=context)
+        sign_str = self._get_sello(cr=False, uid=False, ids=False, context=context)
         if not sign_str:
             raise osv.except_osv(_('Error in Stamp !'), _(
                 "Can't generate the stamp of the voucher.\nCkeck your configuration.\ns%s") % (msg2))
@@ -190,13 +207,11 @@
         cert_str = cert_str.replace(' ', '').replace('\n', '')
         nodeComprobante.setAttribute("certificado", cert_str)
         data_dict[comprobante]['certificado'] = cert_str
+        
+
         if 'cfdi' in type_inv:
             nodeComprobante.removeAttribute('anoAprobacion')
             nodeComprobante.removeAttribute('noAprobacion')
-        x = doc_xml.documentElement
-        nodeReceptor = doc_xml.getElementsByTagName(receptor)[0]
-        nodeConcepto = doc_xml.getElementsByTagName(concepto)[0]
-        x.insertBefore(nodeReceptor, nodeConcepto)
 
         self.write_cfd_data(cr, uid, ids, data_dict, context=context)
 
@@ -215,28 +230,4 @@
         if date_invoice  and date_invoice < '2012-07-01':
             facturae_version = '2.0'
         self.validate_scheme_facturae_xml(cr, uid, ids, [data_xml], facturae_version)
-        data_dict.get('Comprobante',{})
         return fname_xml, data_xml
-
-    def validate_scheme_facturae_xml(self, cr, uid, ids, datas_xmls=[], facturae_version = None, facturae_type="cfdv", scheme_type='xsd'):
-    #TODO: bzr add to file fname_schema
-        if not datas_xmls:
-            datas_xmls = []
-        certificate_lib = self.pool.get('facturae.certificate.library')
-        for data_xml in datas_xmls:
-            (fileno_data_xml, fname_data_xml) = tempfile.mkstemp('.xml', 'openerp_' + (False or '') + '__facturae__' )
-            f = open(fname_data_xml, 'wb')
-            f.write( data_xml )
-            f.close()
-            os.close(fileno_data_xml)
-            all_paths = tools.config["addons_path"].split(",")
-            for my_path in all_paths:
-                if os.path.isdir(os.path.join(my_path, 'l10n_mx_facturae', 'SAT')):
-                    # If dir is in path, save it on real_path
-                    fname_scheme = my_path and os.path.join(my_path, 'l10n_mx_facturae', 'SAT', facturae_type + facturae_version +  '.' + scheme_type) or ''
-                    #fname_scheme = os.path.join(tools.config["addons_path"], u'l10n_mx_facturae', u'SAT', facturae_type + facturae_version +  '.' + scheme_type )
-                    fname_out = certificate_lib.b64str_to_tempfile(cr, uid, ids, base64.encodestring(''), file_suffix='.txt', file_prefix='openerp__' + (False or '') + '__schema_validation_result__' )
-                    result = certificate_lib.check_xml_scheme(cr, uid, ids, fname_data_xml, fname_scheme, fname_out)
-                    if result: #Valida el xml mediante el archivo xsd
-                        raise osv.except_osv('Error al validar la estructura del xml!', 'Validación de XML versión %s:\n%s'%(facturae_version, result))
-        return True

=== modified file 'l10n_mx_facturae_pac_sf/ir_attachment_facturae.py'
--- l10n_mx_facturae_pac_sf/ir_attachment_facturae.py	2013-12-10 01:11:31 +0000
+++ l10n_mx_facturae_pac_sf/ir_attachment_facturae.py	2014-01-25 00:46:46 +0000
@@ -148,8 +148,8 @@
                     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')
+                        'cfdi_fecha_cancelacion': time.strftime('%Y-%m-%d %H:%M:%S'),
+                        'pac_id' : pac_params_id or False
                     })
                     status = True
                 else:
@@ -169,8 +169,7 @@
         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)
+            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(

=== added directory 'l10n_mx_facturae_pac_sf/template'
=== added file 'l10n_mx_facturae_pac_sf/template/cfdi.xml'
--- l10n_mx_facturae_pac_sf/template/cfdi.xml	1970-01-01 00:00:00 +0000
+++ l10n_mx_facturae_pac_sf/template/cfdi.xml	2014-01-25 00:46:46 +0000
@@ -0,0 +1,1 @@
+<?xml version="1.0" encoding="UTF-8"?><cfdi:Comprobante xmlns:cfdi="http://www.sat.gob.mx/cfd/3" LugarExpedicion="{{ o['cfdi:Comprobante']['LugarExpedicion'] }}" Moneda="{{ o['cfdi:Comprobante']['Moneda'] }}" NumCtaPago="{{ o['cfdi:Comprobante']['NumCtaPago'] }}" TipoCambio="{{ o['cfdi:Comprobante']['TipoCambio'] }}" anoAprobacion="{{ o['cfdi:Comprobante']['anoAprobacion'] }}" certificado="{{ o['cfdi:Comprobante']['certificado'] }}" descuento="{{ o['cfdi:Comprobante']['descuento'] }}" fecha="{{ o['cfdi:Comprobante']['fecha'] }}" folio="{{ o['cfdi:Comprobante']['folio'] }}" formaDePago="{{ o['cfdi:Comprobante']['formaDePago'] }}" metodoDePago="{{ o['cfdi:Comprobante']['metodoDePago'] }}" noAprobacion="{{ o['cfdi:Comprobante']['noAprobacion'] }}" noCertificado="{{ o['cfdi:Comprobante']['noCertificado'] }}" sello="{{ o['cfdi:Comprobante']['sello'] }}" serie="{{ o['cfdi:Comprobante']['serie'] }}" subTotal="{{ o['cfdi:Comprobante']['subTotal'] }}" tipoDeComprobante="{{ o['cfdi:Comprobante']['tipoDeComprobante'] }}" total="{{ o['cfdi:Comprobante']['total'] }}" version="{{ o['cfdi:Comprobante']['version'] }}" xmlns="{{ o['cfdi:Comprobante']['xmlns'] }}" xmlns:xsi="{{ o['cfdi:Comprobante']['xmlns:xsi'] }}" xsi:schemaLocation="{{ o['cfdi:Comprobante']['xsi:schemaLocation'] }}"><cfdi:Emisor nombre="{{ o['cfdi:Comprobante']['cfdi:Emisor']['nombre'] }}" rfc="{{ o['cfdi:Comprobante']['cfdi:Emisor']['rfc'] }}"><cfdi:DomicilioFiscal calle="{{ o['cfdi:Comprobante']['cfdi:Emisor']['cfdi:DomicilioFiscal']['calle'] }}" codigoPostal="{{ o['cfdi:Comprobante']['cfdi:Emisor']['cfdi:DomicilioFiscal']['codigoPostal'] }}" colonia="{{ o['cfdi:Comprobante']['cfdi:Emisor']['cfdi:DomicilioFiscal']['colonia'] }}" estado="{{ o['cfdi:Comprobante']['cfdi:Emisor']['cfdi:DomicilioFiscal']['estado'] }}" localidad="{{ o['cfdi:Comprobante']['cfdi:Emisor']['cfdi:DomicilioFiscal']['localidad'] }}" municipio="{{ o['cfdi:Comprobante']['cfdi:Emisor']['cfdi:DomicilioFiscal']['municipio'] }}" noExterior="{{ o['cfdi:Comprobante']['cfdi:Emisor']['cfdi:DomicilioFiscal']['noExterior'] }}" noInterior="{{ o['cfdi:Comprobante']['cfdi:Emisor']['cfdi:DomicilioFiscal']['noInterior'] }}" pais="{{ o['cfdi:Comprobante']['cfdi:Emisor']['cfdi:DomicilioFiscal']['pais'] }}"/><cfdi:ExpedidoEn calle="{{ o['cfdi:Comprobante']['cfdi:Emisor']['cfdi:ExpedidoEn']['calle'] }}" codigoPostal="{{ o['cfdi:Comprobante']['cfdi:Emisor']['cfdi:ExpedidoEn']['codigoPostal'] }}" colonia="{{ o['cfdi:Comprobante']['cfdi:Emisor']['cfdi:ExpedidoEn']['colonia'] }}" estado="{{ o['cfdi:Comprobante']['cfdi:Emisor']['cfdi:ExpedidoEn']['estado'] }}" localidad="{{ o['cfdi:Comprobante']['cfdi:Emisor']['cfdi:ExpedidoEn']['localidad'] }}" municipio="{{ o['cfdi:Comprobante']['cfdi:Emisor']['cfdi:ExpedidoEn']['municipio'] }}" noExterior="{{ o['cfdi:Comprobante']['cfdi:Emisor']['cfdi:ExpedidoEn']['noExterior'] }}" noInterior="{{ o['cfdi:Comprobante']['cfdi:Emisor']['cfdi:ExpedidoEn']['noInterior'] }}" pais="{{ o['cfdi:Comprobante']['cfdi:Emisor']['cfdi:ExpedidoEn']['pais'] }}"/><cfdi:RegimenFiscal Regimen="{{ o['cfdi:Comprobante']['cfdi:Emisor']['cfdi:RegimenFiscal']['Regimen'] }}"/></cfdi:Emisor><cfdi:Receptor nombre="{{ o['cfdi:Comprobante']['cfdi:Receptor']['nombre'] }}" rfc="{{ o['cfdi:Comprobante']['cfdi:Receptor']['rfc'] }}"><cfdi:Domicilio calle="{{ o['cfdi:Comprobante']['cfdi:Receptor']['cfdi:Domicilio']['calle'] }}" codigoPostal="{{ o['cfdi:Comprobante']['cfdi:Receptor']['cfdi:Domicilio']['codigoPostal'] }}" colonia="{{ o['cfdi:Comprobante']['cfdi:Receptor']['cfdi:Domicilio']['colonia'] }}" estado="{{ o['cfdi:Comprobante']['cfdi:Receptor']['cfdi:Domicilio']['estado'] }}" localidad="{{ o['cfdi:Comprobante']['cfdi:Receptor']['cfdi:Domicilio']['localidad'] }}" municipio="{{ o['cfdi:Comprobante']['cfdi:Receptor']['cfdi:Domicilio']['municipio'] }}" noExterior="{{ o['cfdi:Comprobante']['cfdi:Receptor']['cfdi:Domicilio']['noExterior'] }}" noInterior="{{ o['cfdi:Comprobante']['cfdi:Receptor']['cfdi:Domicilio']['noInterior'] }}" pais="{{ o['cfdi:Comprobante']['cfdi:Receptor']['cfdi:Domicilio']['pais'] }}"/></cfdi:Receptor>{% if o['cfdi:Comprobante']['cfdi:Conceptos']%}<cfdi:Conceptos>{% for i in o['cfdi:Comprobante']['cfdi:Conceptos'] %}<cfdi:Concepto cantidad="{{ i['cfdi:Concepto']['cantidad'] }}" descripcion="{{ i['cfdi:Concepto']['descripcion'] }}" importe="{{ i['cfdi:Concepto']['importe'] }}" noIdentificacion="{{ i['cfdi:Concepto']['noIdentificacion'] }}" unidad="{{ i['cfdi:Concepto']['unidad'] }}" valorUnitario="{{ i['cfdi:Concepto']['valorUnitario'] }}"/>{% endfor %}{% endif %}</cfdi:Conceptos>{% if o['cfdi:Comprobante']['cfdi:Impuestos']['totalImpuestosTrasladados'] %}<cfdi:Impuestos totalImpuestosTrasladados="{{ o['cfdi:Comprobante']['cfdi:Impuestos']['totalImpuestosTrasladados'] }}"><cfdi:Traslados>{% for i in o['cfdi:Comprobante']['cfdi:Impuestos']['cfdi:Traslados'] %}<cfdi:Traslado importe="{{ i['cfdi:Traslado']['importe'] }}" impuesto="{{ i['cfdi:Traslado']['impuesto'] }}" tasa="{{ i['cfdi:Traslado']['tasa'] }}"/>{% endfor %}</cfdi:Traslados></cfdi:Impuestos>{% endif %}</cfdi:Comprobante>
\ No newline at end of file