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

[Luis Torres - http://www.vauxoo.com]

Se agregaron 2 campos a account_invoice para guardar el pac con el que fue firmado, y la secuencia utilizada, ademas el reporte de facturaE ya no tomará estos valores de funciones, sino directos

[lp:~vauxoo/openerp-mexico-localization/7.0_oml_pac_id_sequence_id_invoice-dev_luis]

336. By Luis Torres - http://www.vauxoo.com on 2013-12-03

[IMP][l10n_mx_facturae]Remove field for sequense, and used field that already existed

337. By Luis Torres - http://www.vauxoo.com on 2013-12-03

[IMP]Comment lines that call report that not was used

338. By Luis Torres - http://www.vauxoo.com on 2013-12-03

[REF]comments lines in __init__.py that call .py than not was used

339. By Luis Torres - http://www.vauxoo.com on 2013-12-03

[REF]comment report in init

340. By Luis Torres - http://www.vauxoo.com on 2013-12-04

[REM]Delete reports .rml than not was used in cbb and pac_sf

=== modified file 'l10n_mx_facturae/invoice.py'
--- l10n_mx_facturae/invoice.py	2013-11-29 02:08:04 +0000
+++ l10n_mx_facturae/invoice.py	2013-12-04 21:35:17 +0000
@@ -317,6 +317,7 @@
             help='Attachment that generated this invoice'),
         'rate': fields.float('Type of Change', readonly=True,
             help='Rate used in the date of invoice'),
+        'pac_id': fields.many2one('params.pac', 'Pac', help='Pac used in singned of the invoice'),
     }
 
     _defaults = {

=== modified file 'l10n_mx_facturae_cbb/__init__.py'
--- l10n_mx_facturae_cbb/__init__.py	2013-01-15 00:42:46 +0000
+++ l10n_mx_facturae_cbb/__init__.py	2013-12-04 21:35:17 +0000
@@ -26,6 +26,5 @@
 ##############################################################################
 
 import invoice
-import report
 import ir_sequence_approval
 import ir_attachment_facturae

=== modified file 'l10n_mx_facturae_cbb/__openerp__.py'
--- l10n_mx_facturae_cbb/__openerp__.py	2013-09-11 15:05:59 +0000
+++ l10n_mx_facturae_cbb/__openerp__.py	2013-12-04 21:35:17 +0000
@@ -56,7 +56,6 @@
     "data" : [
         #'security/l10n_mx_facturae_cbb_security.xml',
         'ir_sequence_view_v6.xml',
-        "l10n_mx_facturae_report.xml",
     ],
     "test" : ["test/account_invoice_cbb.yml"],
     "installable" : True,

=== removed file 'l10n_mx_facturae_cbb/l10n_mx_facturae_report.xml'
--- l10n_mx_facturae_cbb/l10n_mx_facturae_report.xml	2013-06-28 22:52:28 +0000
+++ l10n_mx_facturae_cbb/l10n_mx_facturae_report.xml	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <report id="account_invoice_facturae_pdf2"
-            name="account.invoice.facturae.pdf2"
-            string="Electronic Invoice CBB PDF"
-            model="account.invoice"
-            header="False"
-            rml="l10n_mx_facturae_cbb/report/invoice_facturae_pdf.rml"
-            attachment_use="1"
-            attachment="(object.state in ('open','paid')) and (object.fname_invoice and (object.fname_invoice + ''))"
-            groups="l10n_mx_facturae_groups.group_l10n_mx_facturae_user"
-            menu="False"
-        />
-
-    </data>
-</openerp>

=== removed directory 'l10n_mx_facturae_cbb/report'
=== removed file 'l10n_mx_facturae_cbb/report/__init__.py'
--- l10n_mx_facturae_cbb/report/__init__.py	2012-02-24 00:42:55 +0000
+++ l10n_mx_facturae_cbb/report/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-# -*- encoding: utf-8 -*-
-###########################################################################
-#    Module Writen to OpenERP, Open Source Management Solution
-#
-#    Copyright (c) 2010 Vauxoo - http://www.vauxoo.com/
-#    All Rights Reserved.
-#    info Vauxoo ([e-mail])
-############################################################################
-#    Coded by: moylop260 ([e-mail])
-#    Launchpad Project Manager for Publication: Nhomar Hernandez - [e-mail]
-############################################################################
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import invoice_facturae_pdf

=== removed file 'l10n_mx_facturae_cbb/report/invoice_facturae_pdf.py'
--- l10n_mx_facturae_cbb/report/invoice_facturae_pdf.py	2013-05-10 17:00:10 +0000
+++ l10n_mx_facturae_cbb/report/invoice_facturae_pdf.py	1970-01-01 00:00:00 +0000
@@ -1,303 +0,0 @@
-# -*- encoding: utf-8 -*-
-###########################################################################
-#    Module Writen to OpenERP, Open Source Management Solution
-#
-#    Copyright (c) 2010 Vauxoo - http://www.vauxoo.com/
-#    All Rights Reserved.
-#    info Vauxoo ([e-mail])
-############################################################################
-#    Coded by: moylop260 ([e-mail])
-#    Launchpad Project Manager for Publication: Nhomar Hernandez - [e-mail]
-############################################################################
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-#    Leyendas tomadas el dia 16 de noviembre de 2012 del sitio:
-#       http://www.sat.gob.mx/sitio_internet/asistencia_contribuyente/principiantes/comprobantes_fiscales/66_19207.html
-#           La leyenda “La reproducción apócrifa de este comprobante constituye un delito en los términos de las disposiciones fiscales”, con letra no menor de 5 puntos.
-#           La leyenda "Este comprobante tendrá una vigencia de dos años contados a partir de la fecha de aprobación de la asignación de folios, la cual es dd/mm/aaaa", misma que deberá ser impresa con letra no menor de 5 puntos.
-##############################################################################
-
-from openerp.report import report_sxw
-from openerp import pooler
-from openerp import tools
-import time
-# from amount_to_text_es import amount_to_text as amount_to_text_class
-
-# amount_to_text = amount_to_text_obj.amount_to_text
-# amount_to_text = amount_to_text_obj.amount_to_text_cheque
-
-# sql_delete_report = "DELETE FROM ir_act_report_xml WHERE report_name =
-# 'account.invoice.facturae.pdf'"--Si no toma la actualizacion del reporte
-# xml, borrarlo directamente desde la base de datos, con este script.
-
-
-class account_invoice_facturae_pdf2(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
-        super(account_invoice_facturae_pdf2, self).__init__(
-            cr, uid, name, context=context)
-        self.localcontext.update({
-            'set_global_data': self._set_global_data,
-            'facturae_data_dict': self._facturae_data_dict,
-            #'amount_to_text': self._get_amount_to_text,
-            'split_string': self._split_string,
-            'company_address': self._company_address,
-            'subcompany_address': self._subcompany_address,
-            'invoice_address': self._invoice_address,
-            'get_invoice_sequence': self._get_invoice_sequence,
-            'get_approval': self._get_approval,
-            'get_taxes': self._get_taxes,
-            'get_taxes_ret': self._get_taxes_ret,
-            'float': float,
-            'exists_key': self._exists_key,
-            'get_data_partner': self._get_data_partner,
-        })
-        self.taxes = []
-
-    def _exists_key(self, key):
-        return key in self.invoice._columns
-        """
-        try:
-            str= 'self.invoice.'+key
-            if eval(str):
-                return True
-        except:
-            return False
-        """
-
-    def _set_global_data(self, o):
-        try:
-            self.setLang(o.partner_id.lang)
-        except Exception, e:
-            print "exception: %s" % (e)
-            pass
-        try:
-            self._get_company_address(o.id)
-        except Exception, e:
-            print "exception: %s" % (e)
-            pass
-        try:
-            self._get_facturae_data_dict(o)
-        except Exception, e:
-            print "exception: %s" % (e)
-            pass
-        return ""
-
-    def _get_approval(self):
-        return self.approval
-
-    def _get_invoice_sequence(self):
-        return self.sequence
-
-    def _set_invoice_sequence_and_approval(self, invoice_id):
-        context = {}
-        pool = pooler.get_pool(self.cr.dbname)
-        invoice_obj = pool.get('account.invoice')
-        sequence_obj = pool.get('ir.sequence')
-        # approval_obj = pool.get('ir.sequence.approval')
-        invoice = invoice_obj.browse(self.cr, self.uid, [
-                                     invoice_id], context=context)[0]
-        context.update({'number_work': invoice.number})
-        sequence = invoice.invoice_sequence_id or False
-        sequence_id = sequence and sequence.id or False
-        # invoice_obj._get_invoice_sequence(self.cr, self.uid, [invoice_id])[invoice_id]
-        # sequence_obj.browse(self.cr, self.uid, [sequence_id])[0]
-        self.sequence = sequence
-
-        # invoice = invoice_obj.browse(self.cr, self.uid, [invoice_id])[0]
-        approval = sequence and sequence.approval_id or False
-        approval_id = approval and approval.id or False
-        # approval_id = sequence_obj._get_current_approval(self.cr, self.uid, [sequence_id], context=context)[sequence_id]
-        # approval = approval_obj.browse(self.cr, self.uid, [approval_id])[0]
-        self.approval = approval
-        return sequence, approval
-
-    def _get_taxes(self):
-        return self.taxes
-
-    def _get_taxes_ret(self):
-        try:
-            return self.taxes_ret
-        except:
-            pass
-        return []
-
-    '''
-    def _set_taxes(self, invoice_id):
-        """
-        pool = pooler.get_pool(self.cr.dbname)
-        invoice_obj = pool.get('account.invoice')
-        invoice = invoice_obj.browse(self.cr, self.uid, [invoice_id])[0]
-        taxes = []
-        for line_tax_id in invoice.tax_line:
-            tax_name = line_tax_id.name.lower().replace('.','').replace(
-                '-','').replace(' ', '')
-            if tax_name in ['iva']:
-                tax_name = 'IVA'
-            elif 'isr' in tax_name:
-                tax_name = 'ISR'
-            elif 'ieps' in tax_name:
-                tax_name = 'IEPS'
-            tax_names.append( tax_name )
-            taxes.append({
-                'name': tax_name,
-                'rate': "%.2f"%( round( line_tax_id.amount/(
-                    invoice.amount_total-line_tax_id.amount)*100, 0) ),
-                'amount': "%.2f"%( line_tax_id.amount or 0.0),
-            })
-        """
-        self.taxes = self.invoice_data_dict['Comprobante']['Impuestos']['Traslados']
-        #self.taxes = taxes
-        return taxes
-    '''
-
-    def _split_string(self, string, length=100):
-        if string:
-            for i in range(0, len(string), length):
-                string = string[:i] + ' ' + string[i:]
-        return string
-    """
-    def _get_amount_to_text(self, amount, lang, currency=""):
-        if currency.upper() in ('MXP', 'MXN', 'PESOS', 'PESOS MEXICANOS'):
-            sufijo = 'M. N.'
-            currency = 'PESOS'
-        else:
-            sufijo = 'M. E.'
-        #return amount_to_text(amount, lang, currency)
-        amount_text = amount_to_text(amount, currency, sufijo)
-        amount_text = amount_text and amount_text.upper() or ''
-        return amount_text
-    """
-    def _get_company_address(self, invoice_id):
-        pool = pooler.get_pool(self.cr.dbname)
-        invoice_obj = pool.get('account.invoice')
-        partner_obj = pool.get('res.partner')
-        address_obj = pool.get('res.partner')
-        invoice = invoice_obj.browse(self.cr, self.uid, invoice_id)
-        partner_id = invoice.company_id.parent_id and invoice.company_id.\
-            parent_id.partner_id.id or invoice.company_id.partner_id.id
-        self.invoice = invoice
-        # print "partner_id",partner_id
-        # invoice = partner_obj.browse(cr, uid, invoice_id)
-        address_id = partner_obj.address_get(
-            self.cr, self.uid, [partner_id], ['invoice'])['invoice']
-        self.partner_invoice_address = partner_obj.browse(
-            self.cr, self.uid, address_id)
-        self.company_address_invoice = address_obj.browse(
-            self.cr, self.uid, partner_id)
-
-        subpartner_id = invoice.company_id.partner_id.id
-        if partner_id == subpartner_id:
-            self.subcompany_address_invoice = self.company_address_invoice
-        else:
-            subaddress_id = partner_obj.address_get(
-                self.cr, self.uid, [subpartner_id], ['invoice'])['invoice']
-            self.subcompany_address_invoice = address_obj.browse(
-                self.cr, self.uid, subaddress_id)
-        # print "self.company_address_invoice",self.company_address_invoice
-        # print "self.company_address_invoice[0]",self.company_address_invoice[0]
-        # self.company_address_invoice  = self.company_address_invoice and self.company_address_invoice[0] or False
-        # print "self.company_address_invoice",self.company_address_invoice
-        # return [self.company_address_invoice]
-        return ""
-
-    def _company_address(self):
-        # print "self.company_address_invoice",self.company_address_invoice
-        return self.company_address_invoice
-
-    def _subcompany_address(self):
-        return self.subcompany_address_invoice
-
-    def _invoice_address(self):
-        return self.partner_invoice_address
-
-    def _facturae_data_dict(self):
-        # print "self.invoice_data_dict",self.invoice_data_dict
-        return self.invoice_data_dict
-
-    def _get_facturae_data_dict(self, invoice):
-        self._set_invoice_sequence_and_approval(invoice.id)
-        # invoice_obj = pool.get('account.invoice')
-        self.taxes = [
-            tax for tax in invoice.tax_line if tax.tax_percent > 0.01]
-        self.taxes_ret = [
-            tax for tax in invoice.tax_line if tax.tax_percent <= 0.01]
-        return ""
-        """
-        pool = pooler.get_pool(self.cr.dbname)
-        invoice_obj = pool.get('account.invoice')
-        self.invoice_data_dict = invoice_obj._get_facturae_invoice_xml_data(
-            self.cr, self.uid, [invoice_id], context={'type_data': 'dict'})
-        #print "self.invoice_data_dict['Comprobante']['Impuestos']['Traslados'\
-            ]",self.invoice_data_dict['Comprobante']['Impuestos']['Traslados']
-        try:
-            self.taxes = [ traslado['Traslado'] for traslado in self.\
-                invoice_data_dict['Comprobante']['Impuestos']['Traslados'] if \
-                float( traslado['Traslado']['tasa'] ) >0.01 ]
-            #self.taxes = [tax for tax in invoice.account_invoice_tax if \
-                tax.tax_percent > 0.01]
-            #self.taxes.extend( self.taxes_ret )
-        except Exception, e:
-            print "exception: %s"%( e )
-            pass
-
-        #self.taxes_ret = []
-        for retencion in self.invoice_data_dict['Comprobante']['Impuestos'].\
-            get('Retenciones', []):
-            amount_untaxed = float( self.invoice_data_dict['Comprobante'][
-                'subTotal'] )
-            tax_ret_amount = float( retencion['Retencion']['importe'] )
-            tasa = tax_ret_amount and amount_untaxed and tax_ret_amount * \
-                100 / amount_untaxed or 0.0
-            retencion['Retencion'].update({'tasa':  tasa})
-            self.taxes_ret.append( retencion['Retencion'] )
-        return ""
-        """
-
-    def _get_data_partner(self, partner_id):
-        partner_obj = self.pool.get('res.partner')
-        res = {}
-        address_invoice_id = partner_obj.search(self.cr, self.uid, [(
-            'parent_id', '=', partner_id.id), ('type', '=', 'invoice')])
-        if address_invoice_id:
-            address_invoice = partner_obj.browse(
-                self.cr, self.uid, address_invoice_id[0])
-            if address_invoice:
-                res.update({
-                    'street': address_invoice.street or False,
-                    'street3': address_invoice.l10n_mx_street3 or False,
-                    'street4': address_invoice.l10n_mx_street4 or False,
-                    'street2': address_invoice.street2 or False,
-                    'city': address_invoice.city or False,
-                    'state': address_invoice.state_id and \
-                        address_invoice.state_id.name or False,
-                    'city2': address_invoice.l10n_mx_city2 or False,
-                    'zip': address_invoice.zip or False,
-                    'vat': 'vat_split' in address_invoice._columns and \
-                        address_invoice.vat_split or address_invoice.vat or False,
-                    'phone': address_invoice.phone or False,
-                    'fax': address_invoice.fax or False,
-                    'mobile': address_invoice.mobile or False,
-                })
-        return res
-
-report_sxw.report_sxw(
-    'report.account.invoice.facturae.pdf2',
-    'account.invoice',
-    'addons/l10n_mx_facturae_cbb/report/invoice_facturae_pdf.rml',
-    header=False,
-    parser=account_invoice_facturae_pdf2,
-)
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== removed file 'l10n_mx_facturae_cbb/report/invoice_facturae_pdf.rml'
--- l10n_mx_facturae_cbb/report/invoice_facturae_pdf.rml	2013-01-22 19:02:40 +0000
+++ l10n_mx_facturae_cbb/report/invoice_facturae_pdf.rml	1970-01-01 00:00:00 +0000
@@ -1,364 +0,0 @@
-<?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(612.0,792.0)" title="Test" author="Martin Simon" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="56.0" width="498" height="719"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tabla1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tabla2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#000080" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000080" start="1,0" stop="1,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tabla3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tabla7">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#000000" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tabla4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#000000" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" fontName="Helvetica" alignment="RIGHT"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="10.0" leading="13"/>
-    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="6.0" leading="8" alignment="CENTER"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="6.0" leading="8" alignment="CENTER"/>
-    <paraStyle name="P7" fontName="Helvetica" textColor="#280099"/>
-    <paraStyle name="P8" fontName="Helvetica" alignment="RIGHT" textColor="#280099"/>
-    <paraStyle name="P9" fontName="Helvetica" textColor="#ff3333"/>
-    <paraStyle name="P10" fontName="Helvetica" fontSize="12.0" leading="15" textColor="#800000"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="2.0" leading="3" textColor="#800000"/>
-    <paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
-    <paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
-    <paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="18.0" leading="22" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
-    <paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
-    <paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
-    <paraStyle name="P22" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
-    <paraStyle name="P23" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P24" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P25" fontName="Helvetica" fontSize="8.0" leading="10" textColor="#280099"/>
-    <paraStyle name="P26" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" textColor="#280099"/>
-    <paraStyle name="P27" fontName="Helvetica" fontSize="8.0" leading="10"/>
-    <paraStyle name="P28" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
-    <paraStyle name="Table Contents" fontName="Helvetica"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="Quotations" rightIndent="28.0" leftIndent="28.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="14.0"/>
-    <images/>
-  </stylesheet>
-  <story>
-    <section>
-      <para style="P16">[[ repeatIn(objects,'o') ]] <font face="Helvetica" size="9.0">[[ set_global_data(o) ]]</font></para>
-      <para style="P19">[[ o.company_id.parent_id and o.company_id.parent_id.partner_id.name or o.company_id.partner_id.name ]]</para>
-      <blockTable colWidths="125.0,207.0,166.0" style="Tabla1">
-        <tr>
-          <td>
-            <para style="P24">[[ o.company_id.logo and setTag('para','image',{'width':'120.0','height':'80.0'}) ]] [[ o.company_id.logo ]]</para>
-          </td>
-          <td>
-            <para style="P18">[[ company_address()['name'] or o.company_id.partner_id.name ]]</para>
-            <para style="P21">
-              <font color="white"> </font>
-            </para>
-            <para style="P18">Calle: [[ company_address()['street'] or '' ]] Nro. Ext: [[ company_address()['street3'] or '' ]] Int: [[ company_address()['street4'] or '' ]]</para>
-            <para style="P21">
-              <font color="white"> </font>
-            </para>
-            <para style="P18">Colonia: [[ company_address()['street2'] or '' ]]</para>
-            <para style="P21">
-              <font color="white"> </font>
-            </para>
-            <para style="P18">Ciudad: [[ company_address()['city'] or '' ]] Estado: [[ company_address()['state_id'] and company_address()['state_id']['name'] or '' ]]</para>
-            <para style="P22">
-              <font color="white"> </font>
-            </para>
-            <para style="P18">Localidad: [[ company_address()['city2'] or '' ]]</para>
-            <para style="P21">
-              <font color="white"> </font>
-            </para>
-            <para style="P18">CP: [[ company_address()['zip'] or '' ]]</para>
-            <para style="P21">
-              <font color="white"> </font>
-            </para>
-            <para style="P18">RFC: [[ o.company_id.partner_id._columns.has_key('vat_split') and o.company_id.partner_id.vat_split or o.company_id.partner_id.vat ]]</para>
-            <para style="P21">
-              <font color="white"> </font>
-            </para>
-            <para style="P20">Teléfono(s): </para>
-            <para style="P20">[[ company_address()['phone'] or removeParentNode('para') ]]</para>
-            <para style="P20">[[ company_address()['fax'] or removeParentNode('para') ]]</para>
-            <para style="P20">[[ company_address()['mobile'] or removeParentNode('para') ]]</para>
-          </td>
-          <td>
-            <para style="P9">
-              <font face="Helvetica" size="18.0">Folio: [[ get_approval() and get_approval().serie or '' ]] [[ ( o.type in ['out_invoice', 'out_refund'] ) and ( o.state in ['open', 'paid', 'cancel'] ) and o.number or 'SIN FOLIO O ESTATUS NO VALIDO' ]]</font>
-            </para>
-            <para style="P11">
-              <font color="white"> </font>
-            </para>
-            <para style="P10">[[ o.state == 'cancel' and 'FACTURA CANCELADA' ]]</para>
-            <para style="P11">
-              <font color="white"> </font>
-            </para>
-            <para style="Table Contents">[[ company_address()['city'] or '' ]], [[ company_address()['state_id'] and company_address()['state_id']['name'] or '' ]] a</para>
-            <para style="Table Contents">[[ o.date_invoice_tz or '' ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <blockTable colWidths="249.0,249.0" style="Tabla2">
-        <tr>
-          <td>
-            <para style="P7">Receptor</para>
-            <para style="Table Contents"><font face="Helvetica">Nombre: </font>[[ o.partner_id.name ]]</para>
-            <para style="terp_default_8"><font face="Helvetica">Dirección:</font> [[ o.address_invoice_id.street ]] No. Ext: [[ o.address_invoice_id.street3 ]] Int: [[ o.address_invoice_id.street4 ]]</para>
-            <para style="terp_default_8"><font face="Helvetica">Colonia:</font> [[ o.address_invoice_id.street2 or '' ]]</para>
-            <para style="terp_default_8"><font face="Helvetica">Ciudad:</font> [[ o.address_invoice_id.city or '' ]] <font face="Helvetica">Estado: </font>[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]]</para>
-            <para style="terp_default_8"><font face="Helvetica">Localidad: </font>[[ o.address_invoice_id.city2 or '' ]]</para>
-            <para style="terp_default_8"><font face="Helvetica">C.P.:</font> [[ o.address_invoice_id.zip or '' ]] </para>
-            <para style="terp_default_8"><font face="Helvetica">R. F. C. :</font> [[ o.partner_id._columns.has_key('vat_split') and o.partner_id.vat_split or o.partner_id.vat ]]</para>
-            <para style="P23">Teléfono(s): </para>
-            <para style="P17">[[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
-            <para style="P17">[[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
-            <para style="P17">[[ o.address_invoice_id.mobile or removeParentNode('para') ]]</para>
-          </td>
-          <td>
-            <para style="Table Contents">Condición de pago: [[ format(o.payment_term and (o.payment_term.note or o.payment_term.name) or removeParentNode('para') ) ]]</para>
-            <para style="P3">Origen: [[ o.origin or removeParentNode('para') ]]</para>
-            <para style="P3">Expedido en:</para>
-            <para style="P3">[[ subcompany_address()['name'] or o.company_id.partner_id.name ]]</para>
-            <para style="P3">Calle: [[ subcompany_address()['street'] or '' ]] Nro. Ext: [[ subcompany_address()['street3'] or '' ]] Int: [[ subcompany_address()['street4'] or '' ]]</para>
-            <para style="P3">Colonia: [[ subcompany_address()['street2'] or '' ]]</para>
-            <para style="P3">Ciudad: [[ subcompany_address()['city'] or '' ]] </para>
-            <para style="P3">Estado: [[ subcompany_address()['state_id'] and subcompany_address()['state_id']['name'] or '' ]]</para>
-            <para style="P3">Localidad: [[ subcompany_address()['city2'] or '' ]]</para>
-            <para style="P3">CP: [[ subcompany_address()['zip'] or '' ]] </para>
-          </td>
-        </tr>
-      </blockTable>
-      <blockTable colWidths="47.0,88.0,160.0,54.0,65.0,85.0" style="Tabla3">
-        <tr>
-          <td>
-            <para style="P25">Cantidad</para>
-          </td>
-          <td>
-            <para style="P25">Unidad de medida</para>
-          </td>
-          <td>
-            <para style="P25">Descripción</para>
-          </td>
-          <td>
-            <para style="P25">Clave</para>
-          </td>
-          <td>
-            <para style="P26">P.Unitario</para>
-          </td>
-          <td>
-            <para style="P26">Importe</para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="Table Contents">
-              <font face="Helvetica" size="8.0">[[ repeatIn(o.invoice_line,'l') ]] [[ formatLang(l.quantity) ]]</font>
-            </para>
-          </td>
-          <td>
-            <para style="P2">[[ (l.uos_id and l.uos_id.name) or '' ]]</para>
-          </td>
-          <td>
-            <para style="P2">[[ l.name ]]</para>
-          </td>
-          <td>
-            <para style="P2">[[ l.product_id and l.product_id.default_code ]]</para>
-          </td>
-          <td>
-            <para style="P28">[[ formatLang(l.price_unit) ]]</para>
-          </td>
-          <td>
-            <para style="P28">[[ exists_key('global_discount_percent') and (formatLang(l.quantity * l.price_unit)) or formatLang(l.price_subtotal) ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <blockTable colWidths="427.0,71.0" style="Tabla7">
-        <tr>
-          <td>
-            <para style="P8">Suma $</para>
-          </td>
-          <td>
-            <para style="P1">[[formatLang( ( exists_key('global_discount_percent') and o.global_discount_amount or 0.0 ) + (o.amount_untaxed or 0.0) )]]</para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="P8">Descuento: [[ exists_key('global_discount_percent') and o.global_discount_percent or removeParentNode('tr')]] %</para>
-          </td>
-          <td>
-            <para style="P1">[[o.global_discount_amount and formatLang( o.global_discount_amount) or '']]</para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="P8">Sub Total $</para>
-          </td>
-          <td>
-            <para style="P1">[[ formatLang(o.amount_untaxed) ]]</para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="P8">
-              <font face="Helvetica" size="6.0">[[ repeatIn( get_taxes(), 'tax' ) ]]</font>
-              <font face="Helvetica">[[ tax['name2'] ]] ([[ round( float( tax['tax_percent'] ) ) ]]%) $</font>
-            </para>
-          </td>
-          <td>
-            <para style="P1">[[ formatLang( float( tax['amount'] ) ) ]]</para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="P8">
-              <font face="Helvetica" size="6.0">[[ repeatIn( get_taxes_ret(), 'tax_ret' ) ]]</font>
-              <font face="Helvetica">[[ tax_ret['name2'] ]] Ret ([[ round( float( tax_ret['tax_percent'] ),2 )*-1 ]]%) $</font>
-            </para>
-          </td>
-          <td>
-            <para style="P1">[[ formatLang( float( tax_ret['amount'] )*-1 ) ]]</para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="P8">Total $</para>
-          </td>
-          <td>
-            <para style="P1">[[ formatLang(o.amount_total) ]]</para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="P14">IMPORTE CON LETRA:</para>
-            <para style="P13">[[ o.amount_to_text ]]</para>
-          </td>
-          <td>
-            <para style="P1">
-              <font color="white"> </font>
-            </para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="P12">
-        <font color="white"> </font>
-      </para>
-      <para style="P12">
-        <font color="white"> </font>
-      </para>
-      <blockTable colWidths="166.0,166.0,166.0" style="Table1">
-        <tr>
-          <td>
-            <para style="P5">Régimen Fiscal:</para>
-            <para style="P6">[[o.company_id.partner_id.regimen_fiscal_id and o.company_id.partner_id.regimen_fiscal_id.name or 'No identificado']]</para>
-          </td>
-          <td>
-            <para style="P5">Método de Pago:</para>
-            <para style="P6">[[o.pay_method_id.name or 'No identificado']]</para>
-          </td>
-          <td>
-            <para style="P5">Últimos 4 dígitos de la cuenta bancaria:</para>
-            <para style="P6">[[o.acc_payment.last_acc_number or 'No identificado']]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="P12">
-        <font color="white"> </font>
-      </para>
-      <blockTable colWidths="106.0,257.0,135.0" style="Tabla4">
-        <tr>
-          <td>
-            <para style="P2">[[ get_approval() and get_approval().cbb_image and setTag('para','image',{'width':'104.0','height':'104.0'}) ]] [[ get_approval().cbb_image ]]</para>
-          </td>
-          <td>
-            <para style="P2">Número de aprobación SICOFI: [[ get_approval() and get_approval().approval_number or '' ]]</para>
-            <para style="P2">
-              <font color="white"> </font>
-            </para>
-            <para style="P2">Pago en una sola exhibición</para>
-            <para style="P2">
-              <font color="white"> </font>
-            </para>
-            <para style="P2">Efectos fiscales al pago</para>
-            <para style="P2">
-              <font color="white"> </font>
-            </para>
-            <para style="P2">La reproducción apócrifa de este comprobante constituye un delito en los términos de las disposiciones fiscales.</para>
-            <para style="P2">
-              <font color="white"> </font>
-            </para>
-            <para style="P2">Este comprobante tendrá una vigencia de dos años contados a partir de la fecha de aprobación de la asignación de folios, la cual es: [[ get_approval() and time.strftime('%d-%m-%Y',time.strptime(get_approval().date_start,'%Y-%m-%d')) or '' ]]</para>
-          </td>
-          <td>
-            <para style="P2">[[ o.company_id.cif_file and setTag('para','image',{'width':'98.0','height':'161.0'}) ]] [[ o.company_id.cif_file ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="terp_default_9">
-        <font color="white"> </font>
-      </para>
-      <para style="P15">Vendedor: [[o.user_id.name]]</para>
-      <para style="terp_default_9">[[ format(o.comment or '') ]]</para>
-    </section>
-  </story>
-</document>
-

=== removed file 'l10n_mx_facturae_cbb/report/invoice_facturae_pdf.sxw'
Binary files l10n_mx_facturae_cbb/report/invoice_facturae_pdf.sxw	2013-01-22 19:02:40 +0000 and l10n_mx_facturae_cbb/report/invoice_facturae_pdf.sxw	1970-01-01 00:00:00 +0000 differ
=== modified file 'l10n_mx_facturae_pac_sf/__init__.py'
--- l10n_mx_facturae_pac_sf/__init__.py	2013-01-15 00:42:46 +0000
+++ l10n_mx_facturae_pac_sf/__init__.py	2013-12-04 21:35:17 +0000
@@ -25,7 +25,6 @@
 #
 ##############################################################################
 import invoice
-import report
 import wizard
 import params_pac
 import ir_sequence_approval

=== modified file 'l10n_mx_facturae_pac_sf/__openerp__.py'
--- l10n_mx_facturae_pac_sf/__openerp__.py	2013-09-10 22:43:39 +0000
+++ l10n_mx_facturae_pac_sf/__openerp__.py	2013-12-04 21:35:17 +0000
@@ -51,7 +51,6 @@
     ],
     "data" : [
         #"security/l10n_mx_facturae_pac_sf_security.xml",
-        "l10n_mx_facturae_pac_sf_report.xml",
         "wizard/wizard_cancel_invoice_pac_sf_view.xml",
         "wizard/wizard_export_invoice_pac_sf_view_v6.xml",
     ],

=== modified file 'l10n_mx_facturae_pac_sf/ir_attachment_facturae.py'
--- l10n_mx_facturae_pac_sf/ir_attachment_facturae.py	2013-09-06 00:03:45 +0000
+++ l10n_mx_facturae_pac_sf/ir_attachment_facturae.py	2013-12-04 21:35:17 +0000
@@ -268,6 +268,7 @@
                             'cfdi_xml': base64.decodestring(resultado[
                             'resultados']['cfdiTimbrado'] or ''),  # este se necesita en uno que no es base64
                             'cfdi_folio_fiscal': resultado['resultados']['uuid'] or '',
+                            'pac_id': pac_params.id,
                         }
                         msg += mensaje + "." + resultados_mensaje + \
                             " Folio Fiscal: " + folio_fiscal + "."

=== removed file 'l10n_mx_facturae_pac_sf/l10n_mx_facturae_pac_sf_report.xml'
--- l10n_mx_facturae_pac_sf/l10n_mx_facturae_pac_sf_report.xml	2013-09-03 01:21:44 +0000
+++ l10n_mx_facturae_pac_sf/l10n_mx_facturae_pac_sf_report.xml	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    
-        <report id="account_invoice_facturae_pac_sf_pdf"
-            name="account.invoice.facturae.pac.sf.pdf"
-            string="Factura Electronica PDF PAC SF"
-            model="account.invoice"
-            header="False"
-            rml="l10n_mx_facturae_pac_sf/report/invoice_facturae_pac_sf_pdf.rml"
-            attachment_use="1"
-            attachment="(object.state in ('open','paid')) and (object.cfdi_folio_fiscal) and (object.fname_invoice and (object.fname_invoice + ''))"
-            groups="l10n_mx_facturae_groups.group_l10n_mx_facturae_user"
-            menu="False"/>
-        
-    </data>
-</openerp>

=== removed directory 'l10n_mx_facturae_pac_sf/report'
=== removed file 'l10n_mx_facturae_pac_sf/report/__init__.py'
--- l10n_mx_facturae_pac_sf/report/__init__.py	2012-02-13 21:19:14 +0000
+++ l10n_mx_facturae_pac_sf/report/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-# -*- encoding: utf-8 -*-
-###########################################################################
-#    Module Writen to OpenERP, Open Source Management Solution
-#
-#    Copyright (c) 2011 Vauxoo - http://www.vauxoo.com
-#    All Rights Reserved.
-#    info Vauxoo ([e-mail])
-############################################################################
-#    Coded by: moylop260 ([e-mail])
-#    Financed by: http://www.sfsoluciones.com ([e-mail])
-############################################################################
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import invoice_facturae_pac_sf_pdf

=== removed file 'l10n_mx_facturae_pac_sf/report/invoice_facturae_pac_sf_pdf.py'
--- l10n_mx_facturae_pac_sf/report/invoice_facturae_pac_sf_pdf.py	2013-05-15 16:09:43 +0000
+++ l10n_mx_facturae_pac_sf/report/invoice_facturae_pac_sf_pdf.py	1970-01-01 00:00:00 +0000
@@ -1,287 +0,0 @@
-# -*- encoding: utf-8 -*-
-###########################################################################
-#    Module Writen to OpenERP, Open Source Management Solution
-#
-#    Copyright (c) 2011 Vauxoo - http://www.vauxoo.com
-#    All Rights Reserved.
-#    info Vauxoo ([e-mail])
-############################################################################
-#    Coded by: moylop260 ([e-mail])
-#    Financed by: http://www.sfsoluciones.com ([e-mail])
-############################################################################
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.report import report_sxw
-from openerp import pooler
-from openerp import tools
-# from amount_to_text_es import amount_to_text as amount_to_text_class
-
-# amount_to_text = amount_to_text_obj.amount_to_text
-# amount_to_text = amount_to_text_obj.amount_to_text_cheque
-
-# sql_delete_report = "DELETE FROM ir_act_report_xml WHERE report_name =
-# 'account.invoice.facturae.pdf'"--Si no toma la actualizacion del reporte
-# xml, borrarlo directamente desde la base de datos, con este script.
-
-
-class account_invoice_facturae_pac_sf_pdf(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
-        super(account_invoice_facturae_pac_sf_pdf, self).__init__(
-            cr, uid, name, context=context)
-        self.localcontext.update({
-            'set_global_data': self._set_global_data,
-            'facturae_data_dict': self._facturae_data_dict,
-            #'amount_to_text': self._get_amount_to_text,
-            'split_string': self._split_string,
-            'company_address': self._company_address,
-            'subcompany_address': self._subcompany_address,
-            'get_invoice_sequence': self._get_invoice_sequence,
-            'get_approval': self._get_approval,
-            'get_taxes': self._get_taxes,
-            'get_taxes_ret': self._get_taxes_ret,
-            'float': float,
-            'exists_key': self._exists_key,
-            'get_data_partner': self._get_data_partner,
-        })
-        self.taxes = []
-
-    def _exists_key(self, key):
-        return key in self.invoice._columns
-        """
-        try:
-            str= 'self.invoice.'+key
-            if eval(str):
-                return True
-        except:
-            return False
-        """
-
-    def _set_global_data(self, o):
-        try:
-            self.setLang(o.partner_id.lang)
-        except Exception, e:
-            print "exception: %s" % (e)
-            pass
-        try:
-            self._get_company_address(o.id)
-        except Exception, e:
-            print "exception: %s" % (e)
-            pass
-        try:
-            self._get_facturae_data_dict(o)
-        except Exception, e:
-            print "exception: %s" % (e)
-            pass
-        return ""
-
-    def _get_approval(self):
-        return self.approval
-
-    def _get_invoice_sequence(self):
-        return self.sequence
-
-    def _set_invoice_sequence_and_approval(self, invoice_id):
-        # TinyERP Compatibility
-        context = {}
-        pool = pooler.get_pool(self.cr.dbname)
-        invoice_obj = pool.get('account.invoice')
-        sequence_obj = pool.get('ir.sequence')
-        approval_obj = pool.get('ir.sequence.approval')
-        # invoice = invoice_obj.browse(self.cr, self.uid, invoice_id)
-        sequence_id = invoice_obj._get_invoice_sequence(
-            self.cr, self.uid, [invoice_id])[invoice_id]
-        sequence = sequence_obj.browse(self.cr, self.uid, [sequence_id])[0]
-        self.sequence = sequence
-
-        invoice = invoice_obj.browse(self.cr, self.uid, [invoice_id])[0]
-        context.update({'number_work': invoice.number})
-        approval_id = sequence_obj._get_current_approval(
-            self.cr, self.uid, [sequence_id], context=context)[sequence_id]
-        approval = approval_obj.browse(self.cr, self.uid, [approval_id])[0]
-        self.approval = approval
-        return sequence, approval
-
-    def _get_taxes(self):
-        return self.taxes
-
-    def _get_taxes_ret(self):
-        try:
-            return self.taxes_ret
-        except:
-            pass
-        return []
-
-    '''
-    def _set_taxes(self, invoice_id):
-        """
-        pool = pooler.get_pool(self.cr.dbname)
-        invoice_obj = pool.get('account.invoice')
-        invoice = invoice_obj.browse(self.cr, self.uid, [invoice_id])[0]
-        taxes = []
-        for line_tax_id in invoice.tax_line:
-            tax_name = line_tax_id.name.lower().replace('.','').replace(
-                '-','').replace(' ', '')
-            if tax_name in ['iva']:
-                tax_name = 'IVA'
-            elif 'isr' in tax_name:
-                tax_name = 'ISR'
-            elif 'ieps' in tax_name:
-                tax_name = 'IEPS'
-            tax_names.append( tax_name )
-            taxes.append({
-                'name': tax_name,
-                'rate': "%.2f"%( round( line_tax_id.amount/(
-                    invoice.amount_total-line_tax_id.amount)*100, 0) ),
-                'amount': "%.2f"%( line_tax_id.amount or 0.0),
-            })
-        """
-        self.taxes = self.invoice_data_dict['Comprobante']['Impuestos']['Traslados']
-        #self.taxes = taxes
-        return taxes
-    '''
-
-    def _split_string(self, string, length=75):
-        if string:
-            for i in range(0, len(string), length):
-                string = string[:i] + ' ' + string[i:]
-        return string
-    """
-    def _get_amount_to_text(self, amount, lang, currency=""):
-        if currency.upper() in ('MXP', 'MXN', 'PESOS', 'PESOS MEXICANOS'):
-            sufijo = 'M. N.'
-            currency = 'PESOS'
-        else:
-            sufijo = 'M. E.'
-        #return amount_to_text(amount, lang, currency)
-        amount_text = amount_to_text(amount, currency, sufijo)
-        amount_text = amount_text and amount_text.upper() or ''
-        return amount_text
-    """
-    def _get_company_address(self, invoice_id):
-        pool = pooler.get_pool(self.cr.dbname)
-        invoice_obj = pool.get('account.invoice')
-        partner_obj = pool.get('res.partner')
-        address_obj = pool.get('res.partner')
-        invoice = invoice_obj.browse(self.cr, self.uid, invoice_id)
-        partner_id = invoice.company_id.parent_id and invoice.company_id.\
-            parent_id.partner_id.id or invoice.company_id.partner_id.id
-        self.invoice = invoice
-        # print "partner_id",partner_id
-        # invoice = partner_obj.browse(cr, uid, invoice_id)
-        address_id = partner_obj.address_get(
-            self.cr, self.uid, [partner_id], ['invoice'])['invoice']
-        self.company_address_invoice = address_obj.browse(
-            self.cr, self.uid, partner_id)
-
-        subpartner_id = invoice.company_id.partner_id.id
-        if partner_id == subpartner_id:
-            self.subcompany_address_invoice = self.company_address_invoice
-        else:
-            subaddress_id = partner_obj.address_get(
-                self.cr, self.uid, [subpartner_id], ['invoice'])['invoice']
-            self.subcompany_address_invoice = address_obj.browse(
-                self.cr, self.uid, subaddress_id)
-        # print "self.company_address_invoice",self.company_address_invoice
-        # print "self.company_address_invoice[0]",self.company_address_invoice[0]
-        # self.company_address_invoice  = self.company_address_invoice and self.company_address_invoice[0] or False
-        # print "self.company_address_invoice",self.company_address_invoice
-        # return [self.company_address_invoice]
-        return ""
-
-    def _company_address(self):
-        # print "self.company_address_invoice",self.company_address_invoice
-        return self.company_address_invoice
-
-    def _subcompany_address(self):
-        return self.subcompany_address_invoice
-
-    def _facturae_data_dict(self):
-        # print "self.invoice_data_dict",self.invoice_data_dict
-        return self.invoice_data_dict
-
-    def _get_facturae_data_dict(self, invoice):
-        self._set_invoice_sequence_and_approval(invoice.id)
-        self.taxes = [
-            tax for tax in invoice.tax_line if tax.tax_percent >= 0.0]
-        self.taxes_ret = [
-            tax for tax in invoice.tax_line if tax.tax_percent < 0.0]
-        return ""
-    """
-    def _get_facturae_data_dict(self, invoice_id):
-        pool = pooler.get_pool(self.cr.dbname)
-        invoice_obj = pool.get('account.invoice')
-        invoice_tax = pool.get('account.invoice.tax')
-        self.invoice_data_dict = invoice_obj._get_facturae_invoice_xml_data(
-            self.cr, self.uid, [invoice_id], context={'type_data': 'dict'})
-        self._set_invoice_sequence_and_approval( invoice_id )
-        try:
-            self.taxes = [ traslado['Traslado'] for traslado in self.\
-                invoice_data_dict['Comprobante']['Impuestos']['Traslados'] if (
-                float( traslado['Traslado']['tasa'] ) >= 0.00 and traslado[
-                'Traslado']['impuesto']!='IEPS') or (traslado['Traslado'][
-                'impuesto']=='IEPS' and float(traslado['Traslado']['tasa']) > 0.01)]
-            #self.taxes.extend( self.taxes_ret )
-        except Exception, e:
-            print "exception: %s"%( e )
-            pass
-
-        self.taxes_ret = []
-        for retencion in self.invoice_data_dict['Comprobante']['Impuestos'].get(
-            'Retenciones', []):
-            amount_untaxed = float( self.invoice_data_dict['Comprobante']['subTotal'] )
-            tax_ret_amount = float( retencion['Retencion']['importe'] )
-            tasa = tax_ret_amount and amount_untaxed and tax_ret_amount * 100 \
-            / amount_untaxed or 0.0
-            retencion['Retencion'].update({'tasa':  tasa})
-            self.taxes_ret.append( retencion['Retencion'] )
-        return ""
-    """
-
-    def _get_data_partner(self, partner_id):
-        partner_obj = self.pool.get('res.partner')
-        res = {}
-        address_invoice_id = partner_obj.search(self.cr, self.uid, [(
-            'parent_id', '=', partner_id.id), ('type', '=', 'invoice')])
-        if address_invoice_id:
-            address_invoice = partner_obj.browse(
-                self.cr, self.uid, address_invoice_id[0])
-            if address_invoice:
-                res.update({
-                    'street': address_invoice.street or False,
-                    'street3': address_invoice.l10n_mx_street3 or False,
-                    'street4': address_invoice.l10n_mx_street4 or False,
-                    'street2': address_invoice.street2 or False,
-                    'city': address_invoice.city or False,
-                    'state': address_invoice.state_id and address_invoice.
-                    state_id.name or False,
-                    'city2': address_invoice.l10n_mx_city2 or False,
-                    'zip': address_invoice.zip or False,
-                    'vat': 'vat_split' in address_invoice._columns and
-                    address_invoice.vat_split or address_invoice.vat or False,
-                    'phone': address_invoice.phone or False,
-                    'fax': address_invoice.fax or False,
-                    'mobile': address_invoice.mobile or False,
-                })
-        return res
-report_sxw.report_sxw(
-    'report.account.invoice.facturae.pac.sf.pdf',
-    'account.invoice',
-    'addons/l10n_mx_facturae_pac_sf/report/invoice_facturae_pac_sf_pdf.rml',
-    header=False,
-    parser=account_invoice_facturae_pac_sf_pdf,
-)
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== removed file 'l10n_mx_facturae_pac_sf/report/invoice_facturae_pac_sf_pdf.rml'
--- l10n_mx_facturae_pac_sf/report/invoice_facturae_pac_sf_pdf.rml	2013-01-22 19:02:40 +0000
+++ l10n_mx_facturae_pac_sf/report/invoice_facturae_pac_sf_pdf.rml	1970-01-01 00:00:00 +0000
@@ -1,420 +0,0 @@
-<?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(612.0,792.0)" title="Test" author="Martin Simon" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="46.0" width="498" height="729"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tabla1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tabla2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#000080" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000080" start="1,0" stop="1,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tabla3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tabla4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tabla5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#000000" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,1" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#000000" start="3,1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tabla6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#000000" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tabla7">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" fontName="Helvetica" alignment="RIGHT"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="7.0" leading="9"/>
-    <paraStyle name="P7" fontName="Helvetica" fontSize="6.0" leading="8" alignment="CENTER"/>
-    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="6.0" leading="8" alignment="CENTER"/>
-    <paraStyle name="P9" fontName="Helvetica" textColor="#280099"/>
-    <paraStyle name="P10" fontName="Helvetica" alignment="RIGHT" textColor="#280099"/>
-    <paraStyle name="P11" fontName="Helvetica" textColor="#ff3333"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="12.0" leading="15" textColor="#800000"/>
-    <paraStyle name="P13" fontName="Helvetica" fontSize="2.0" leading="3" textColor="#800000"/>
-    <paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
-    <paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P22" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P23" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P24" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
-    <paraStyle name="P25" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="18.0" leading="22" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
-    <paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
-    <paraStyle name="P27" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
-    <paraStyle name="P28" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
-    <paraStyle name="P29" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P30" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P31" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
-    <paraStyle name="Table Contents" fontName="Helvetica"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="Quotations" rightIndent="28.0" leftIndent="28.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="14.0"/>
-    <images/>
-  </stylesheet>
-  <story>
-    <section>
-      <para style="P31">[[ repeatIn(objects,'o') ]] <font face="Helvetica" size="9.0">[[ set_global_data(o) ]]</font></para>
-      <para style="P25">[[ o.company_emitter_id.address_invoice_parent_company_id.name or '' ]]</para>
-      <blockTable colWidths="125.0,207.0,166.0" style="Tabla1">
-        <tr>
-          <td>
-            <para style="P30">[[ o.company_emitter_id.logo and setTag('para','image',{'width':'120.0','height':'80.0'}) ]] [[ o.company_emitter_id.logo ]]</para>
-          </td>
-          <td>
-            <para style="P27">
-              <font color="white"> </font>
-            </para>
-            <para style="P24">Calle: [[ o.company_emitter_id.address_invoice_parent_company_id.street or '' ]] Nro. Ext: [[ o.company_emitter_id.address_invoice_parent_company_id.street3 or '' ]] Int: [[ o.company_emitter_id.address_invoice_parent_company_id.street4 or '' ]]</para>
-            <para style="P27">
-              <font color="white"> </font>
-            </para>
-            <para style="P24">Colonia: [[ o.company_emitter_id.address_invoice_parent_company_id.street2 or '' ]]</para>
-            <para style="P27">
-              <font color="white"> </font>
-            </para>
-            <para style="P24">Ciudad: [[ o.company_emitter_id.address_invoice_parent_company_id.city or '' ]] Estado: [[ o.company_emitter_id.address_invoice_parent_company_id.state_id and o.company_emitter_id.address_invoice_parent_company_id.state_id.name or '' ]] </para>
-            <para style="P28">
-              <font color="white"> </font>
-            </para>
-            <para style="P24">Localidad: [[ o.company_emitter_id.address_invoice_parent_company_id.city2 or '' ]]</para>
-            <para style="P27">
-              <font color="white"> </font>
-            </para>
-            <para style="P24">CP: [[ o.company_emitter_id.address_invoice_parent_company_id.zip or '' ]]</para>
-            <para style="P27">
-              <font color="white"> </font>
-            </para>
-            <para style="P24">RFC: [[ o.company_emitter_id.partner_id._columns.has_key('vat_split') and o.company_emitter_id.partner_id.vat_split or o.company_emitter_id.partner_id.vat ]]</para>
-            <para style="P27">
-              <font color="white"> </font>
-            </para>
-            <para style="P26">Teléfono(s): </para>
-            <para style="P26">[[ o.company_emitter_id.address_invoice_parent_company_id.phone or removeParentNode('para') ]]</para>
-            <para style="P26">[[ o.company_emitter_id.address_invoice_parent_company_id.fax or removeParentNode('para') ]]</para>
-            <para style="P26">[[ o.company_emitter_id.address_invoice_parent_company_id.mobile or removeParentNode('para') ]]</para>
-          </td>
-          <td>
-            <para style="P11">
-              <font face="Helvetica" size="18.0">Folio: [[ ( o.type in ['out_invoice', 'out_refund'] ) and ( o.state in ['open', 'paid', 'cancel'] ) and o.number or 'SIN FOLIO O ESTATUS NO VALIDO' ]]</font>
-            </para>
-            <para style="P13">
-              <font color="white"> </font>
-            </para>
-            <para style="P12">[[ o.state == 'cancel' and 'FACTURA CANCELADA' ]]</para>
-            <para style="P13">
-              <font color="white"> </font>
-            </para>
-            <para style="Table Contents">[[ o. address_issued_id and o.address_issued_id.city or '' ]], [[ o.address_issued_id.state_id and o.address_issued_id.state_id.name or '' ]] a</para>
-            <para style="Table Contents">[[ o.date_invoice_tz or '' ]]</para>
-            <para style="Table Contents">Serie: [[ get_approval() and get_approval().serie or '' ]]</para>
-            <para style="Table Contents">Aprobación: [[ get_approval() and get_approval().approval_number or '' ]]</para>
-            <para style="Table Contents">Año Aprobación:[[ get_approval() and get_approval().approval_year or '' ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <blockTable colWidths="249.0,249.0" style="Tabla2">
-        <tr>
-          <td>
-            <para style="P9">Receptor</para>
-            <para style="Table Contents"><font face="Helvetica">Nombre: </font>[[ o.partner_id.name ]]</para>
-            <para style="terp_default_8"><font face="Helvetica">Dirección:</font> [[ get_data_partner(o.partner_id)['street'] ]] No. Ext: [[ get_data_partner(o.partner_id)['street3'] ]] Int: [[ get_data_partner(o.partner_id)['street4'] ]]</para>
-            <para style="terp_default_8"><font face="Helvetica">Colonia:</font> [[ get_data_partner(o.partner_id)['street2'] ]]</para>
-            <para style="terp_default_8"><font face="Helvetica">Ciudad:</font> [[ get_data_partner(o.partner_id)['city'] ]] <font face="Helvetica">Estado: </font>[[ get_data_partner(o.partner_id)['state'] ]]</para>
-            <para style="terp_default_8"><font face="Helvetica">Localidad: </font>[[ get_data_partner(o.partner_id)['city2'] ]]</para>
-            <para style="terp_default_8"><font face="Helvetica">C.P.:</font> [[ get_data_partner(o.partner_id)['zip'] ]]] </para>
-            <para style="terp_default_8"><font face="Helvetica">R. F. C. :</font> [[ get_data_partner(o.partner_id)['vat'] ]]</para>
-            <para style="P29">Teléfono(s): </para>
-            <para style="P23">[[ get_data_partner(o.partner_id)['phone'] or removeParentNode('para')]]</para>
-            <para style="P23">[[ get_data_partner(o.partner_id)['fax'] or removeParentNode('para')]]</para>
-            <para style="P23">[[ get_data_partner(o.partner_id)['mobile'] or removeParentNode('para')]]</para>
-          </td>
-          <td>
-            <para style="Table Contents">Condición de pago: [[ format(o.payment_term and (o.payment_term.note or o.payment_term.name) or removeParentNode('para') ) ]]</para>
-            <para style="P3">Origen: [[ o.origin or removeParentNode('para') ]]</para>
-            <para style="P3">Expedido en:</para>
-            <para style="P3">[[ o. address_issued_id and o.address_issued_id.name or '' ]]</para>
-            <para style="P3">Calle: [[ o. address_issued_id and o.address_issued_id.street or '' ]] Nro. Ext: [[ o. address_issued_id and o.address_issued_id.street3 or '' ]] Int: [[ o. address_issued_id and o.address_issued_id.street4 or '' ]]</para>
-            <para style="P3">Colonia: [[ o. address_issued_id and o.address_issued_id.street2 or '' ]]</para>
-            <para style="P3">Ciudad: [[ o. address_issued_id and o.address_issued_id.city or '' ]]</para>
-            <para style="P3">Localidad: [[ o. address_issued_id and o.address_issued_id.city2 or '' ]]</para>
-            <para style="P3">Estado: [[ o. address_issued_id and o.address_issued_id.state_id and o.address_issued_id.state_id.name or '' ]]</para>
-            <para style="P3">CP: [[ o. address_issued_id and o.address_issued_id.zip or '' ]] </para>
-          </td>
-        </tr>
-      </blockTable>
-      <blockTable colWidths="50.0,39.0,168.0,53.0,57.0,49.0,89.0" style="Tabla3">
-        <tr>
-          <td>
-            <para style="P9">Cantidad</para>
-          </td>
-          <td>
-            <para style="P9">Unidad</para>
-          </td>
-          <td>
-            <para style="P9">Descripción</para>
-          </td>
-          <td>
-            <para style="P9">Clave</para>
-          </td>
-          <td>
-            <para style="P10">P.Unitario</para>
-          </td>
-          <td>
-            <para style="P10">Dto %</para>
-          </td>
-          <td>
-            <para style="P10">Importe</para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="Table Contents"><font face="Helvetica" size="8.0">[[ repeatIn(o.invoice_line,'l') ]] </font>[[ formatLang(l.quantity) ]]</para>
-          </td>
-          <td>
-            <para style="Table Contents">[[ (l.uos_id and l.uos_id.name) or '' ]]</para>
-          </td>
-          <td>
-            <para style="Table Contents">[[ l.name ]]</para>
-            <para style="P6">Notas: [[l.note or removeParentNode('para')]]</para>
-          </td>
-          <td>
-            <para style="Table Contents">[[ l.product_id and l.product_id.default_code ]]</para>
-          </td>
-          <td>
-            <para style="P1">[[ formatLang(l.price_unit) ]]</para>
-          </td>
-          <td>
-            <para style="P1">[[ formatLang(l.discount)]]%</para>
-          </td>
-          <td>
-            <para style="P1">[[ exists_key('global_discount_percent') and (formatLang(l.quantity * l.price_unit, digits=get_digits(dp='Account'))) or formatLang(l.price_subtotal) ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <blockTable colWidths="414.0,91.0" style="Tabla4">
-        <tr>
-          <td>
-            <para style="P10">Suma $</para>
-          </td>
-          <td>
-            <para style="P1">[[formatLang( ( exists_key('global_discount_percent') and o.global_discount_amount or 0.0 ) + (o.amount_untaxed or 0.0), digits=get_digits(dp='Account') )]]</para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="P10">Descuento: [[ exists_key('global_discount_percent') and o.global_discount_percent or removeParentNode('tr')]] %</para>
-          </td>
-          <td>
-            <para style="P1">[[o.global_discount_amount and formatLang( o.global_discount_amount) or '']]</para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="P10">Sub Total $</para>
-          </td>
-          <td>
-            <para style="P1">[[ formatLang(o.amount_untaxed) ]]</para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="P10">
-              <font face="Helvetica" size="6.0">[[ repeatIn( get_taxes(), 'tax' ) ]]</font>
-              <font face="Helvetica">[[ tax['name2'] ]] ([[ round( float( tax['tax_percent'] ) ) or '0.0' ]]%) $</font>
-            </para>
-          </td>
-          <td>
-            <para style="P1">[[ formatLang( float( tax['amount'] ) ) ]]</para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="P10">
-              <font face="Helvetica" size="6.0">[[ repeatIn( get_taxes_ret(), 'tax_ret' ) ]]</font>
-              <font face="Helvetica">[[ tax_ret['name2'] ]] Ret ([[ round( float( tax_ret['tax_percent'] ),2 )*-1 ]]%) $</font>
-            </para>
-          </td>
-          <td>
-            <para style="P1">[[ formatLang( float( tax_ret['amount'] )*-1 ) ]]</para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="P10">Total $</para>
-          </td>
-          <td>
-            <para style="P1">[[ formatLang(o.amount_total) ]]</para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="P17">IMPORTE CON LETRA:</para>
-            <para style="P15">[[ o.amount_to_text ]]</para>
-          </td>
-          <td>
-            <para style="P1">
-              <font color="white"> </font>
-            </para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="P14">PAGO EN UNA SOLA EXHIBICIÓN</para>
-      <para style="P14">
-        <font color="white"> </font>
-      </para>
-      <para style="P14">“Este documento es una representacion impresa de un CFDI” </para>
-      <para style="P14">CFDI, Comprobante Fiscal Digital por Internet</para>
-      <para style="terp_default_9">
-        <font color="white"> </font>
-      </para>
-      <blockTable colWidths="133.0,94.0,102.0,170.0" style="Tabla5">
-        <tr>
-          <td>
-            <para style="P14">Certificado del emisor</para>
-          </td>
-          <td>
-            <para style="P18">Certificado del SAT</para>
-          </td>
-          <td>
-            <para style="P18">Fecha de Timbrado</para>
-          </td>
-          <td>
-            <para style="P18">Folio Fiscal</para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="P19">[[ o.no_certificado or '' ]]</para>
-          </td>
-          <td>
-            <para style="P19">[[ o.cfdi_no_certificado or '' ]]</para>
-          </td>
-          <td>
-            <para style="P19">[[ o.cfdi_fecha_timbrado or '' ]]</para>
-          </td>
-          <td>
-            <para style="P19">[[ o.cfdi_folio_fiscal or '' ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <blockTable colWidths="159.0,170.0,170.0" style="Tabla6">
-        <tr>
-          <td>
-            <para style="P8">Régimen Fiscal:</para>
-            <para style="P7">[[o.company_emitter_id.partner_id.regimen_fiscal_id and o.company_emitter_id.partner_id.regimen_fiscal_id.name or 'No identificado']]</para>
-          </td>
-          <td>
-            <para style="P8">Método de Pago:</para>
-            <para style="P7">[[o.pay_method_id.name or 'No identificado']]</para>
-          </td>
-          <td>
-            <para style="P8">Últimos 4 dígitos de la cuenta bancaria:</para>
-            <para style="P7">[[o.acc_payment.last_acc_number or 'No identificado']]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="P21">
-        <font color="white"> </font>
-      </para>
-      <blockTable colWidths="100.0,282.0,117.0" style="Tabla7">
-        <tr>
-          <td>
-            <para style="P2">[[ o.company_emitter_id.cif_file and setTag('para','image',{'width':'98.0','height':'161.0'}) ]] [[ o.company_emitter_id.cif_file ]]</para>
-          </td>
-          <td>
-            <para style="P14">Sello Digital Emisor:</para>
-            <para style="P16">[[ split_string( o.sello or '') ]]</para>
-            <para style="P16">
-              <font color="white"> </font>
-            </para>
-            <para style="P14">Sello Digital SAT:</para>
-            <para style="P16">[[ split_string( o.cfdi_sello or '') ]]</para>
-            <para style="P16">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="P4">[[ o.cfdi_cbb and setTag('para','image',{'width':'6cm','height':'6cm'}) ]] [[ o.cfdi_cbb ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="P14">Cadena Original del complemento de certificación digital del SAT:</para>
-      <para style="P20">[[ split_string( o.cfdi_cadena_original or '' ) ]]</para>
-      <para style="P5">
-        <font color="white"> </font>
-      </para>
-      <para style="P5">Vendedor: [[o.user_id.name]]</para>
-      <para style="P22">[[ (o.comment and format(o.comment )) or removeParentNode('para') ]]</para>
-    </section>
-  </story>
-</document>
-

=== removed file 'l10n_mx_facturae_pac_sf/report/invoice_facturae_pac_sf_pdf.sxw'
Binary files l10n_mx_facturae_pac_sf/report/invoice_facturae_pac_sf_pdf.sxw	2013-01-21 22:24:22 +0000 and l10n_mx_facturae_pac_sf/report/invoice_facturae_pac_sf_pdf.sxw	1970-01-01 00:00:00 +0000 differ
=== modified file 'l10n_mx_facturae_report/report/invoice_facturae_html.mako'
--- l10n_mx_facturae_report/report/invoice_facturae_html.mako	2013-09-19 00:05:33 +0000
+++ l10n_mx_facturae_report/report/invoice_facturae_html.mako	2013-12-04 21:35:17 +0000
@@ -164,10 +164,10 @@
                         ${o.address_issued_id.country_id and o.address_issued_id.country_id.name or ''|entity}
                     %endif
                     <br/>${_("a")} ${o.date_invoice_tz or ''|entity}
-                    %if o.invoice_sequence_id.approval_id.type != 'cbb':
-                        ${_("Serie:")} ${get_approval() and get_approval().serie or _("Sin serie")|entity}
-                        <br/>${_("Aprobaci&oacute;n:")} ${get_approval() and get_approval().approval_number or _("Sin aprobaci&oacute;n")|entity}
-                        <br/>${_("A&ntilde;o Aprobaci&oacute;n:")} ${get_approval() and get_approval().approval_year or _("No v&aacute;lido")|entity}
+                    %if o.invoice_sequence_id.approval_id and o.invoice_sequence_id.approval_id.type != 'cbb':
+                        ${_("Serie:")} ${o.invoice_sequence_id.approval_id.serie or _("Sin serie")|entity}
+                        <br/>${_("Aprobaci&oacute;n:")} ${o.invoice_sequence_id.approval_id.approval_number or _("Sin aprobaci&oacute;n")|entity}
+                        <br/>${_("A&ntilde;o Aprobaci&oacute;n:")} ${o.invoice_sequence_id.approval_id.approval_year or _("No v&aacute;lido")|entity}
                     %endif
                 </td>
             </tr>
@@ -315,35 +315,32 @@
             </table>
         %endif
         <!--code for cbb-->
-        %if o.invoice_sequence_id.approval_id.type == 'cbb':
-            %if get_approval():
-                <%cbb_approval_row = get_approval()%>
-                <table class="basic_table" style="page-break-inside:avoid; border:1.5px solid grey;">
-                    <tr>
-                        <td width="20%" valign="top">
-                            %if ( o.type  in ['out_invoice', 'out_refund'] ) and ( o.state in ['open', 'paid', 'cancel'] ):
-                                ${helper.embed_image('jpeg',str(o.invoice_sequence_id.approval_id.cbb_image),180, 180)}
-                            %else:
-                                <p> ${_('SIN FOLIO O ESTATUS NO VALIDO')}
-                            %endif
-                        </td>
-                        <td valign="top" class="tax_td" style="padding-top:3px;">
-                            %if ( o.type  in ['out_invoice', 'out_refund'] ) and ( o.state in ['open', 'paid', 'cancel'] ):
-                                Número de aprobación SICOFI: ${o.invoice_sequence_id.approval_id.approval_number or '' |entity}<br/>
-                            %else:
-                                <p> ${_('SIN FOLIO O ESTATUS NO VALIDO')}</br>
-                            %endif
-                            La reproducción apócrifa de este comprobante constituye un delito en los términos de las disposiciones fiscales.<br/>
-                            Este comprobante tendrá una vigencia de dos años contados a partir de la fecha aprobación de la asignación de folios, la cual es: ${o.invoice_sequence_id.approval_id.date_start or '' |entity}
-                        </td>
-                        <td width="15%" valign="top">
-                            ${helper.embed_image('jpeg',str(o.company_emitter_id.cif_file),140, 220)}
-                        </td>
-                    </tr>
-                </table>
-            %else:
-                <p> ${_('La aprobaci&oacute;n CBB no pudo ser obtenida, por favor contacte a su administrador')}
-            %endif
+        %if o.invoice_sequence_id.approval_id and o.invoice_sequence_id.approval_id.type == 'cbb':
+            <table class="basic_table" style="page-break-inside:avoid; border:1.5px solid grey;">
+                <tr>
+                    <td width="20%" valign="top">
+                        %if ( o.type  in ['out_invoice', 'out_refund'] ) and ( o.state in ['open', 'paid', 'cancel'] ):
+                            ${helper.embed_image('jpeg',str(o.invoice_sequence_id.approval_id.cbb_image),180, 180)}
+                        %else:
+                            <p> ${_('SIN FOLIO O ESTATUS NO VALIDO')}
+                        %endif
+                    </td>
+                    <td valign="top" class="tax_td" style="padding-top:3px;">
+                        %if ( o.type  in ['out_invoice', 'out_refund'] ) and ( o.state in ['open', 'paid', 'cancel'] ):
+                            Número de aprobación SICOFI: ${o.invoice_sequence_id.approval_id.approval_number or '' |entity}<br/>
+                        %else:
+                            <p> ${_('SIN FOLIO O ESTATUS NO VALIDO')}</br>
+                        %endif
+                        La reproducción apócrifa de este comprobante constituye un delito en los términos de las disposiciones fiscales.<br/>
+                        Este comprobante tendrá una vigencia de dos años contados a partir de la fecha aprobación de la asignación de folios, la cual es: ${o.invoice_sequence_id.approval_id.date_start or '' |entity}
+                    </td>
+                    <td width="15%" valign="top">
+                        ${helper.embed_image('jpeg',str(o.company_emitter_id.cif_file),140, 220)}
+                    </td>
+                </tr>
+            </table>
+        %else:
+            <p> ${_('La aprobaci&oacute;n CBB no pudo ser obtenida, por favor contacte a su administrador')}
         %endif
         <!--code for cfd22-->
         %if o.invoice_sequence_id.approval_id.type == 'cfd22':
@@ -369,7 +366,6 @@
         %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)%>
                     <tr>
                         %if o.company_emitter_id.cif_file:
                         <td align="left">
@@ -393,7 +389,7 @@
                             <b>${_('Cadena original:')} </b><br/>
                             ${split_string(o.cfdi_cadena_original) or ''|entity}</br>
                             <b>${_('Enlace al certificado: ')}</b></br>
-                            ${data_certificate['certificate_link'] or ''|entity}</p>
+                            ${o.pac_id and o.pac_id.certificate_link or ''|entity}</p>
                         </td>
                         %if o.cfdi_cbb:
                         <td align="right">

=== modified file 'l10n_mx_facturae_report/report/invoice_facturae_html.py'
--- l10n_mx_facturae_report/report/invoice_facturae_html.py	2013-09-17 20:18:49 +0000
+++ l10n_mx_facturae_report/report/invoice_facturae_html.py	2013-12-04 21:35:17 +0000
@@ -46,8 +46,6 @@
             'split_string': self._split_string,
             'company_address': self._company_address,
             'subcompany_address': self._subcompany_address,
-            'get_invoice_sequence': self._get_invoice_sequence,
-            'get_approval': self._get_approval,
             'get_taxes': self._get_taxes,
             'get_taxes_ret': self._get_taxes_ret,
             'float': float,
@@ -55,7 +53,6 @@
             'get_data_partner': self._get_data_partner,
             'get_sum_total': self._get_sum_total,
             'has_disc': self._has_disc,
-            'get_data_certificate': self._get_data_certificate,
             'get_text_promissory' : self._get_text_promissory,
         })
         self.taxes = []
@@ -84,35 +81,8 @@
         except Exception, e:
             print "exception: %s" % (e)
             pass
-        try:
-            self._get_data_certificate(o.id)
-        except Exception, e:
-            print "exception: %s" % (e)
-            pass
         return ""
 
-    def _get_approval(self):
-        return self.approval
-
-    def _get_invoice_sequence(self):
-        return self.sequence
-
-    def _set_invoice_sequence_and_approval(self, invoice_id):
-        context = {}
-        pool = pooler.get_pool(self.cr.dbname)
-        invoice_obj = pool.get('account.invoice')
-        sequence_obj = pool.get('ir.sequence')
-        invoice = invoice_obj.browse(self.cr, self.uid, [
-                                     invoice_id], context=context)[0]
-        context.update({'number_work': invoice.number})
-        sequence = invoice.invoice_sequence_id or False
-        sequence_id = sequence and sequence.id or False
-        self.sequence = sequence
-        approval = sequence and sequence.approval_id or False
-        approval_id = approval and approval.id or False
-        self.approval = approval
-        return sequence, approval
-
     def _get_taxes(self):
         return self.taxes
 
@@ -163,7 +133,6 @@
         return self.invoice_data_dict
 
     def _get_facturae_data_dict(self, invoice):
-        self._set_invoice_sequence_and_approval(invoice.id)
         self.taxes = [
             tax for tax in invoice.tax_line if tax.tax_percent >= 0.0]
         self.taxes_ret = [
@@ -221,24 +190,6 @@
                 break
         return discount
 
-    def _get_data_certificate(self, invoice_id):
-        pool = pooler.get_pool(self.cr.dbname)
-        invoice_obj = pool.get('account.invoice')
-        pac_params_obj = self.pool.get('params.pac')
-        res={}
-        invoice = invoice_obj.browse(self.cr, self.uid, invoice_id)
-        pac_params_ids = pac_params_obj.search(self.cr, self.uid, [
-            ('method_type', '=', 'pac_sf_firmar'),
-            ('company_id', '=', invoice.company_id.id), 
-            ('active', '=', True)], limit=1, context={})
-        pac_params_id = pac_params_ids and pac_params_ids[0] or False
-        if pac_params_id:
-            data_pac = pac_params_obj.browse(self.cr, self.uid, pac_params_id)
-            res.update({
-                'certificate_link' : data_pac.certificate_link or False,
-            })
-        return res
-        
     def _get_text_promissory(self, company, partner, address_emitter, invoice):
         text = ''
         context = {}