Merge lp:~vauxoo/openerp-mexico-localization/characters_specials-dev-jc into lp:openerp-mexico-localization/7.0

[Juan Carlos Hernandez]

se agregó la siguiente función para caracteres especiales como (® ½ & > < ' " ´ ©) y mas caracteres especiales.
def string_to_xml_format(self, cr, uid, ids, text):
       return text.encode('utf-8', 'xmlcharrefreplace')

Unmerged revisions

352. By Juan Carlos Hernandez on 2014-02-08

[IMP][l10n_mx_facturae]add function string_to_xml_format() for characters ® & > < ' " ´ and more characters

=== 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-02-08 01:16:19 +0000
@@ -118,6 +118,9 @@
 class account_invoice(osv.Model):
     _inherit = 'account.invoice'
 
+    def string_to_xml_format(self, cr, uid, ids, text):
+        return text.encode('utf-8', 'xmlcharrefreplace')
+
     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 +703,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,24 +720,23 @@
             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.string_to_xml_format(cr, uid, ids, attribute)
                 else:
-                        attribute = str(attribute)
+                    attribute = str(attribute)
                 node.setAttribute(element, attribute)
-                # print "attribute",unicode( attribute, 'UTF-8')
         if not parent:
             doc.appendChild(node)
         return doc
@@ -744,7 +746,7 @@
             context = {}
         data_dict = self._get_facturae_invoice_dict_data(
             cr, uid, ids, context=context)[0]
-        doc_xml = self.dict2xml({
+        doc_xml = self.dict2xml(cr, uid, ids, {
                                 'Comprobante': data_dict.get('Comprobante')})
         invoice_number = "sn"
         (fileno_xml, fname_xml) = tempfile.mkstemp(
@@ -812,12 +814,13 @@
             return data_dict
         if context.get('type_data') == 'xml_obj':
             return doc_xml
-        data_xml = doc_xml.toxml('UTF-8')
+        data_xml = doc_xml.toxml()
         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')
+        data_xml = data_xml.replace('<?xml version="1.0" ?>', '<?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':
 
=== 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-02-08 01:16:19 +0000
@@ -133,7 +133,7 @@
             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)})
+        doc_xml = self.dict2xml(cr, uid, ids, {comprobante: data_dict.get(comprobante)})
         invoice_number = "sn"
         (fileno_xml, fname_xml) = tempfile.mkstemp(
             '.xml', 'openerp_' + (invoice_number or '') + '__facturae__')
@@ -204,13 +204,15 @@
             return data_dict
         if context.get('type_data') == 'xml_obj':
             return doc_xml
-        data_xml = doc_xml.toxml('UTF-8')
+        data_xml = doc_xml.toxml()
         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')
+        data_xml = data_xml.replace(
+            '<?xml version="1.0" ?>', '<?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
         if date_invoice  and date_invoice < '2012-07-01':
             facturae_version = '2.0'