Merge lp:~vauxoo/openerp-mexico-localization/l10n_mx_company_multi_address_dev_luis into lp:openerp-mexico-localization/6.1

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

Se agrego el modulo l10n_mx_company_multi_address y se adaptaron los mudulos de facturae para que funcionen con este

Unmerged revisions

229. By Luis Torres - http://www.vauxoo.com on 2013-01-16

[IMP][l10n_mx_facturae_cer]Validate that certificate is from company_emitter

228. By Luis Torres - http://www.vauxoo.com on 2013-01-16

[IMP][l10n_mx_facturae_pac_sf]Add in search from pacs validations for that the pacs belog that company to invoice and is active

227. By Luis Torres - http://www.vauxoo.com on 2013-01-16

[FIX][l10n_mx_facturae_22]Change reference where take datasfor xml, in LugarExpedicion

226. By Luis Torres - http://www.vauxoo.com on 2013-01-16

[IMP][l10n_mx_company_multi_address]Commented function
[IMP][l10n_mx_facturae_22]Add dependens and change reference where take data company
[IMP][l10n_mx_facturae]Add validation that have address for invoice

225. By Luis Torres - http://www.vauxoo.com on 2013-01-15

[IMP][l10n_mx_facturae]Change reference where take data for xml

224. By Luis Torres - http://www.vauxoo.com on 2013-01-15

[FIX][l10n_mx_facturae]Change reference where take datas for xml

223. By Luis Torres - http://www.vauxoo.com on 2013-01-14

[FIX][l10n_mx_facturae_pac_sf]Delete line that not is used

222. By Luis Torres - http://www.vauxoo.com on 2013-01-14

[IMP]Change dependens in modules

221. By Luis Torres - http://www.vauxoo.com on 2013-01-12

[IMP][l10n_mx_facturae]Change reference to company_id by company_emitted_id for xml by facturae

220. By Luis Torres - http://www.vauxoo.com on 2013-01-12

[IMP][l10n_mx_facturae_cbb]Change reference in function, field company_id by company_emitted_id

=== added directory 'l10n_mx_company_multi_address'
=== added file 'l10n_mx_company_multi_address/__init__.py'
--- l10n_mx_company_multi_address/__init__.py	1970-01-01 00:00:00 +0000
+++ l10n_mx_company_multi_address/__init__.py	2013-01-16 20:14:21 +0000
@@ -0,0 +1,31 @@
+
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2012 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 res_company
+import invoice
+import account_journal

=== added file 'l10n_mx_company_multi_address/__openerp__.py'
--- l10n_mx_company_multi_address/__openerp__.py	1970-01-01 00:00:00 +0000
+++ l10n_mx_company_multi_address/__openerp__.py	2013-01-16 20:14:21 +0000
@@ -0,0 +1,54 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2012 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/>.
+#
+##############################################################################
+
+{
+    "name" : "Multiaddress para una misma compañia",
+    "version" : "1.0",
+    "author" : "Vauxoo",
+    "category" : "Localization/Mexico",
+    "description" : """This module allows the management of multiaddress for "factura electronica" whitout multicompany scheme
+    """,
+    "website" : "http://www.vauxoo.com/",
+    "license" : "AGPL-3",
+    "depends" : ["account",#"l10n_mx_facturae_22",
+        ],
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : [
+        #'security/ir.model.access.csv',
+        "invoice_view_address.xml",
+        
+        #"ir_sequence_view.xml",
+        #"res_company_view6.xml",
+        #"invoice_view.xml",
+        "res_company_view.xml",
+        "account_journal_view.xml",
+        #"partner_address_view.xml",
+    ],
+    "installable" : True,
+    "active" : False,
+}

=== added file 'l10n_mx_company_multi_address/account_journal.py'
--- l10n_mx_company_multi_address/account_journal.py	1970-01-01 00:00:00 +0000
+++ l10n_mx_company_multi_address/account_journal.py	2013-01-16 20:14:21 +0000
@@ -0,0 +1,80 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+############################################################################
+#    Coded by: Isaac Lopez ([e-mail])
+#              Moises Lopez ([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 osv import fields
+from osv import osv
+
+class account_journal(osv.osv):
+    _inherit='account.journal'
+    
+    _columns = {
+        'address_invoice_company_id': fields.many2one('res.partner.address', 'Invoice Company Address', domain="[('type', '=', 'invoice')]"),
+        'company2_id': fields.many2one("res.company", 'Company Emitter', help="Si este campo es llenado, en la factura electonica se tomaran los datos de esta compañia."),
+    }
+account_journal()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

=== added file 'l10n_mx_company_multi_address/account_journal_view.xml'
--- l10n_mx_company_multi_address/account_journal_view.xml	1970-01-01 00:00:00 +0000
+++ l10n_mx_company_multi_address/account_journal_view.xml	2013-01-16 20:14:21 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        
+        <record model="ir.ui.view" id="view_account_journal_view_form_inh_multisuc">
+            <field name="name">view.account.journal.view.form.inh.multisuc</field>
+            <field name="model">account.journal</field>
+            <field name="inherit_id" ref="account.view_account_journal_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="group_invoice_lines" position="after">
+                    <field name="address_invoice_company_id"/>
+                </field>
+                <xpath expr="/form/notebook/page[@string='General Information']/group/field[@name='company_id']" position="after">
+                    <field name="company2_id"/>
+                </xpath>  
+            </field>
+        </record>
+        
+    </data>
+</openerp>

=== added file 'l10n_mx_company_multi_address/invoice.py'
--- l10n_mx_company_multi_address/invoice.py	1970-01-01 00:00:00 +0000
+++ l10n_mx_company_multi_address/invoice.py	2013-01-16 20:14:21 +0000
@@ -0,0 +1,154 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+############################################################################
+#    Coded by: Fernando Irene Garcia ([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 osv import fields
+from osv import osv
+
+class account_invoice(osv.osv):
+    _inherit='account.invoice'
+    
+    def _get_address_issued_invoice(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        journal_obj = self.pool.get('account.journal')
+        for id_ in ids:
+            data = self.browse(cr, uid, id_, context=context)
+            journal_id = data.journal_id.id
+            data_journal = journal_obj.browse(cr, uid, journal_id, context=context)
+            a = data_journal.address_invoice_company_id and data_journal.address_invoice_company_id.id or False
+            b = data_journal.company2_id and data_journal.company2_id.address_invoice_parent_company_id and data_journal.company2_id.address_invoice_parent_company_id.id or False
+            c = data.company_id and data.company_id.address_invoice_parent_company_id and data.company_id.address_invoice_parent_company_id.id or False
+            address_invoice = a or b or c or False
+            res[data.id] = address_invoice
+        return res
+
+    def _get_company_emitter_invoice(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        journal_obj = self.pool.get('account.journal')
+        for id_ in ids:
+            data = self.browse(cr, uid, id_, context=context)
+            journal_id = data.journal_id.id
+            data_journal = journal_obj.browse(cr, uid, journal_id, context=context)
+            company_invoice = data_journal.company2_id and data_journal.company2_id.id or data.company_id and data.company_id.id or False
+            res[data.id] = company_invoice
+        return res
+            
+    _columns = {
+        #~ 'company2_id': fields.many2one("res.company", 'Company Emitter', readonly=True, states={'draft':[('readonly',False)]}, help="Si este campo es llenado, en la factura electonica se tomaran los datos de esta compañia."),
+        #~ 'address_invoice_company_id': fields.many2one('res.partner.address', 'Invoice Company Address', readonly=True, states={'draft':[('readonly',False)]}, domain="[('type', '=', 'invoice'), ('company_id', '=', company_id)]"),
+        'address_issued_id' : fields.function(_get_address_issued_invoice, type="many2one", relation='res.partner.address', string='Address Issued Invoice'),
+        'company_emitter_id' : fields.function(_get_company_emitter_invoice, type="many2one", relation='res.company', string='Company Emitter Invoice')
+    }
+    
+    def ____________________________get_facturae_invoice_dict_data(self, cr, uid, ids, context={}):
+        invoice_data_parents = super(account_invoice,self)._get_facturae_invoice_dict_data(cr,uid,ids,context)
+        invoice = self.browse(cr, uid, ids)[0]
+        invoice_data_parents[0]['Comprobante']['Emisor'] = {'rfc': (invoice.company_id.partner_id._columns.has_key('vat_split') and invoice.company_id.partner_id.vat_split or invoice.company_id.partner_id.vat or '').replace('-', ' ').replace(' ',''),'nombre': invoice.company_id.address_invoice_parent_company_id.name or '' }
+        invoice_data_parents[0]['Comprobante']['Emisor']['DomicilioFiscal'] = {'calle': invoice.company_id.address_invoice_parent_company_id.street and invoice.company_id.address_invoice_parent_company_id.street.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or '',
+                                                                                'noExterior': invoice.company_id.address_invoice_parent_company_id.street3 and invoice.company_id.address_invoice_parent_company_id.street3.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or 'N/A',
+                                                                                'noInterior': invoice.company_id.address_invoice_parent_company_id.street4 and invoice.company_id.address_invoice_parent_company_id.street4.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or 'N/A',
+                                                                                'colonia': invoice.company_id.address_invoice_parent_company_id.street2 and invoice.company_id.address_invoice_parent_company_id.street2.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or 'N/A',
+                                                                                'localidad': invoice.company_id.address_invoice_parent_company_id.city2 and invoice.company_id.address_invoice_parent_company_id.city2.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or 'N/A',
+                                                                                'municipio': invoice.company_id.address_invoice_parent_company_id.city and invoice.company_id.address_invoice_parent_company_id.city.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or '',
+                                                                                'estado': invoice.company_id.address_invoice_parent_company_id.state_id and invoice.company_id.address_invoice_parent_company_id.state_id.name and invoice.company_id.address_invoice_parent_company_id.state_id.name.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or '',
+                                                                                'pais': invoice.company_id.address_invoice_parent_company_id.country_id and invoice.company_id.address_invoice_parent_company_id.country_id.name and invoice.company_id.address_invoice_parent_company_id.country_id.name.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ')or '',
+                                                                                'codigoPostal': invoice.company_id.address_invoice_parent_company_id.zip and invoice.company_id.address_invoice_parent_company_id.zip.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or '',
+        }
+        
+        invoice_data_parents[0]['Comprobante']['Emisor']['ExpedidoEn'] = {'calle': invoice.address_invoice_company_id.street and invoice.address_invoice_company_id.street.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or '',
+                                                                            'noExterior': invoice.address_invoice_company_id.street3 and invoice.address_invoice_company_id.street3.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or 'N/A',
+                                                                            'noInterior': invoice.address_invoice_company_id.street4 and invoice.address_invoice_company_id.street4.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or 'N/A',
+                                                                            'colonia': invoice.address_invoice_company_id.street2 and invoice.address_invoice_company_id.street2.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or 'N/A',
+                                                                            'localidad': invoice.address_invoice_company_id.city2 and invoice.address_invoice_company_id.city2.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or 'N/A',
+                                                                            'municipio': invoice.address_invoice_company_id.city and invoice.address_invoice_company_id.city.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or '',
+                                                                            'estado': invoice.address_invoice_company_id.state_id and invoice.address_invoice_company_id.state_id.name and invoice.address_invoice_company_id.state_id.name.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or '',
+                                                                            'pais': invoice.address_invoice_company_id.country_id and invoice.address_invoice_company_id.country_id.name and invoice.address_invoice_company_id.country_id.name.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ')or '',
+                                                                            'codigoPostal': invoice.address_invoice_company_id.zip and invoice.address_invoice_company_id.zip.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or '',
+                                                                        }
+        invoice_data_parents[0]['Comprobante']['Emisor']['RegimenFiscal'] = {'Regimen':invoice.company_id.partner_id.regimen_fiscal_id.name or ''}
+        
+        city = invoice.address_invoice_company_id.city and invoice.address_invoice_company_id.city.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or False
+        state = invoice.address_invoice_company_id.state_id and invoice.address_invoice_company_id.state_id.name and invoice.address_invoice_company_id.state_id.name.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or False
+        country = invoice.address_invoice_company_id.country_id and invoice.address_invoice_company_id.country_id.name and invoice.address_invoice_company_id.country_id.name.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or False
+        if city and state and country:
+            address = city +', '+ state +', '+ country
+        else:
+            raise osv.except_osv(('Domicilio Incompleto!'),('Verifique que el domicilio de la compañia emisora del comprobante fiscal este completo (Ciudad - Estado - Pais)'))
+        
+        invoice_data_parents[0]['Comprobante']['LugarExpedicion'] = address
+        return invoice_data_parents
+
+    def onchange_journal_id(self, cr, uid, ids, journal_id=False):
+        result = super(account_invoice,self).onchange_journal_id(cr,uid,ids,journal_id)
+        address_id = self.pool.get('account.journal').browse(cr, uid, journal_id) or False
+        if address_id and address_id.address_invoice_company_id:
+            result['value'].update({'address_invoice_company_id': address_id.address_invoice_company_id.id})
+        if address_id and address_id.company2_id:
+            result['value'].update({'company2_id': address_id.company2_id.id})
+        return result
+        
+account_invoice()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

=== added file 'l10n_mx_company_multi_address/invoice_view_address.xml'
--- l10n_mx_company_multi_address/invoice_view_address.xml	1970-01-01 00:00:00 +0000
+++ l10n_mx_company_multi_address/invoice_view_address.xml	2013-01-16 20:14:21 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        
+        <record model="ir.ui.view" id="account_invoice_form_inh_l10n_mx_facturae_multisuc">
+            <field name="name">account.invoice.form.inh_l10n_mx_facturae_multisuc</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page[@string='Other Info']/field[@name='company_id']" position="after">
+<!--
+                    <field name="company2_id"/>
+                    <field name="address_invoice_company_id"/>
+-->
+                    <field name="address_issued_id"/>
+                    <field name="company_emitter_id"/>
+                 </xpath>
+                 
+                <field name="journal_id" position="replace">
+                    <field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id)" widget="selection"/>
+                </field>
+            </field>
+        </record>
+        
+    </data>
+</openerp>

=== added file 'l10n_mx_company_multi_address/res_company.py'
--- l10n_mx_company_multi_address/res_company.py	1970-01-01 00:00:00 +0000
+++ l10n_mx_company_multi_address/res_company.py	2013-01-16 20:14:21 +0000
@@ -0,0 +1,60 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+############################################################################
+#    Coded by: moylop260 ([e-mail])
+#    Coded by: isaac ([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 osv import osv
+from osv import fields
+from tools.translate import _
+import os
+import time
+
+class res_company(osv.osv):
+    _inherit = 'res.company'
+    
+    def get_address_invoice_parent_company_id(self, cr, uid, ids, field, arg, context=None):
+        if context is None:
+            context = {}
+        res = {}
+        partner_obj = self.pool.get('res.partner')
+        companies = self.browse(cr, uid, ids, context=context)
+        for company_id in companies:
+            partner_parent = company_id and company_id.parent_id and company_id.parent_id.partner_id or False
+            if partner_parent:
+                address_id = partner_obj.address_get(cr, uid, [partner_parent.id], ['invoice'])['invoice']
+            #Validar, si tiene hijos utilizar no utilizar la main, mejor utilizar la normal company_id.partner_id.id
+            elif company_id.company_address_main_id:
+                address_id = company_id.company_address_main_id.id
+            else:
+                address_id = partner_obj.address_get(cr, uid, [company_id.partner_id.id], ['invoice'])['invoice']
+            res[company_id.id] = address_id
+        return res
+    
+    _columns = {
+        'address_invoice_parent_company_id': fields.many2one("res.partner.address", 'Invoice Company Address Parent', help="En este campo se debe colocar la dirección de la compañia matriz, independientemente si se maneja un esquema Multi-company o Multi-Address.", domain="[('type', '=', 'invoice')]"),
+    }
+res_company()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'l10n_mx_company_multi_address/res_company_view.xml'
--- l10n_mx_company_multi_address/res_company_view.xml	1970-01-01 00:00:00 +0000
+++ l10n_mx_company_multi_address/res_company_view.xml	2013-01-16 20:14:21 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <record model="ir.ui.view" id="view_res_company_form_inh_facturae_form1">
+            <field name="name">view.res.company.form.inh.facturae_form1</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="parent_id" position="after">
+                    <field name="address_invoice_parent_company_id"/>
+                </field>
+            </field>
+        </record>
+        
+    </data>
+</openerp>

=== modified file 'l10n_mx_facturae/__openerp__.py'
--- l10n_mx_facturae/__openerp__.py	2012-08-27 23:55:07 +0000
+++ l10n_mx_facturae/__openerp__.py	2013-01-16 20:14:21 +0000
@@ -43,7 +43,7 @@
     "website" : "http://www.vauxoo.com/",
     "license" : "AGPL-3",
     "depends" : ["account", "base_vat", "document",
-            "l10n_mx_facturae_lib", "l10n_mx_partner_address",
+            "l10n_mx_facturae_lib", #"l10n_mx_partner_address",
             "l10n_mx_facturae_cer",
             "l10n_mx_invoice_datetime",
             "l10n_mx_invoice_tax_ref",

=== modified file 'l10n_mx_facturae/invoice.py'
--- l10n_mx_facturae/invoice.py	2013-01-04 22:49:04 +0000
+++ l10n_mx_facturae/invoice.py	2013-01-16 20:14:21 +0000
@@ -218,7 +218,7 @@
             if sequence_id:
                 sequence = sequence_obj.browse(cr, uid, [sequence_id], context)[0]
             fname = ""
-            fname += (invoice.company_id.partner_id and (invoice.company_id.partner_id._columns.has_key('vat_split') and invoice.company_id.partner_id.vat_split or invoice.company_id.partner_id.vat) or '')
+            fname += (invoice.company_emitter_id.partner_id and (invoice.company_emitter_id.partner_id._columns.has_key('vat_split') and invoice.company_emitter_id.partner_id.vat_split or invoice.company_emitter_id.partner_id.vat) or '')
             fname += '_'
             number_work = invoice.number or invoice.internal_number
             try:
@@ -343,7 +343,7 @@
             invoice = self.browse(cr, uid, id, context=context)
             #certificate_id = invoice.company_id.certificate_id
             context.update( {'date_work': invoice.date_invoice_tz} )
-            certificate_id = self.pool.get('res.company')._get_current_certificate(cr, uid, [invoice.company_id.id], context=context)[invoice.company_id.id]
+            certificate_id = self.pool.get('res.company')._get_current_certificate(cr, uid, [invoice.company_emitter_id.id], context=context)[invoice.company_emitter_id.id]
             certificate_id = certificate_id and self.pool.get('res.company.facturae.certificate').browse(cr, uid, [certificate_id], context=context)[0] or False
             
             if certificate_id:
@@ -799,27 +799,34 @@
             #Termina seccion: Comprobante
             #Inicia seccion: Emisor
             partner_obj = self.pool.get('res.partner')
-            partner = invoice.company_id and invoice.company_id.partner_id and invoice.company_id.partner_id or False
-            partner_parent = (invoice.company_id and invoice.company_id.parent_id and invoice.company_id.parent_id.partner_id) or (invoice.company_id.partner_id and invoice.company_id.partner_id) or False
-            
-            address_invoice_id = partner_obj.address_get(cr, uid, [partner.id], ['invoice'])['invoice']
-            address_invoice_parent_id = partner_obj.address_get(cr, uid, [partner_parent.id], ['invoice'])['invoice']
-            
-            if not address_invoice_id:
-                raise osv.except_osv('Warning !', 'No se tiene definido los datos de facturacion del partner [%s].\n%s !'%(partner.name, msg2))
-            
-            address_invoice = self.pool.get('res.partner.address').browse(cr, uid, address_invoice_id, context)
-            address_invoice_parent = self.pool.get('res.partner.address').browse(cr, uid, address_invoice_parent_id, context)
-            
-            if not partner.vat:
-                raise osv.except_osv('Warning !', 'No se tiene definido el RFC del partner [%s].\n%s !'%(partner.name, msg2))
+            #~ partner = invoice.address_issued_id and invoice.address_issued_id.partner_id or False
+            address_invoice = invoice.address_issued_id or False
+            address_invoice_parent = invoice.company_emitter_id and invoice.company_emitter_id.address_invoice_parent_company_id or False
+            
+            if not address_invoice:
+                raise osv.except_osv('Warning !', 'No se tiene definida la direccion emisora !')
+                
+            if not address_invoice_parent:
+                raise osv.except_osv('Warning !', 'No se ha definido una compañia  !')
+            
+            #~ address_invoice_id = partner_obj.address_get(cr, uid, [partner.id], ['invoice'])['invoice']
+            #~ address_invoice_parent_id = partner_obj.address_get(cr, uid, [partner_parent.id], ['invoice'])['invoice']
+            
+            #~ if not address_invoice_id:
+                #~ raise osv.except_osv('Warning !', 'No se tiene definido los datos de facturacion del partner [%s].\n%s !'%(partner.name, msg2))
+            
+            #~ address_invoice = self.pool.get('res.partner.address').browse(cr, uid, address_invoice_id, context)
+            #~ address_invoice_parent = self.pool.get('res.partner.address').browse(cr, uid, address_invoice_parent_id, context)
+            
+            #~ if not partner.vat:
+                #~ raise osv.except_osv('Warning !', 'No se tiene definido el RFC del partner [%s].\n%s !'%(partner.name, msg2))
             
             invoice_data = invoice_data_parent['Comprobante']
             invoice_data['Emisor'] = {}
             invoice_data['Emisor'].update({
                 
-                'rfc': ((partner_parent._columns.has_key('vat_split') and partner_parent.vat_split or partner_parent.vat) or '').replace('-', ' ').replace(' ',''),
-                'nombre': address_invoice_parent.name or partner_parent.name or '',
+                'rfc': ((address_invoice_parent.partner_id._columns.has_key('vat_split') and address_invoice_parent.partner_id.vat_split or address_invoice_parent.partner_id.vat) or '').replace('-', ' ').replace(' ',''),
+                'nombre': address_invoice_parent.name or address_invoice_parent.partner_id.name or '',
                 #Obtener domicilio dinamicamente
                 #virtual_invoice.append( (invoice.company_id and invoice.company_id.partner_id and invoice.company_id.partner_id.vat or '').replac
                 

=== modified file 'l10n_mx_facturae/report/invoice_facturae_pdf.py'
--- l10n_mx_facturae/report/invoice_facturae_pdf.py	2012-08-28 23:32:57 +0000
+++ l10n_mx_facturae/report/invoice_facturae_pdf.py	2013-01-16 20:14:21 +0000
@@ -172,14 +172,14 @@
         partner_obj = pool.get('res.partner')
         address_obj = pool.get('res.partner.address')
         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
+        partner_id = invoice.company_emitted_id.parent_id and invoice.company_emitted_id.parent_id.partner_id.id or invoice.company_emitted_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, address_id)
         
-        subpartner_id = invoice.company_id.partner_id.id
+        subpartner_id = invoice.company_emitted_id.partner_id.id
         if partner_id == subpartner_id:
             self.subcompany_address_invoice = self.company_address_invoice
         else:

=== modified file 'l10n_mx_facturae/report/invoice_facturae_pdf.rml'
--- l10n_mx_facturae/report/invoice_facturae_pdf.rml	2012-09-08 04:35:43 +0000
+++ l10n_mx_facturae/report/invoice_facturae_pdf.rml	2013-01-16 20:14:21 +0000
@@ -28,16 +28,6 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </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="LINEAFTER" 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"/>
-    </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -52,6 +42,16 @@
       <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="LINEAFTER" 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"/>
+    </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
@@ -59,31 +59,29 @@
     <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" textColor="#280099"/>
-    <paraStyle name="P6" fontName="Helvetica" alignment="RIGHT" textColor="#280099"/>
-    <paraStyle name="P7" fontName="Helvetica" textColor="#ff3333"/>
-    <paraStyle name="P8" fontName="Helvetica" fontSize="12.0" leading="15" textColor="#800000"/>
-    <paraStyle name="P9" fontName="Helvetica" fontSize="2.0" leading="3" textColor="#800000"/>
-    <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10_enc" fontName="Helvetica-Bold" fontSize="6.0" leading="8" alignment="CENTER"/>
-    <paraStyle name="P11_txt" fontName="Helvetica" fontSize="6.0" leading="8" alignment="CENTER"/>
-    <paraStyle name="P13" 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="P14" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" 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="18.0" leading="22" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
-    <paraStyle name="P19" 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="P20" 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="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="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P23" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P24" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P25" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P27" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="6.0" leading="8" alignment="CENTER"/>
+    <paraStyle name="P6" fontName="Helvetica-Bold" 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="6.0" leading="8" 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" textColor="#280099"/>
+    <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <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="8.0" leading="10" 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="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
+    <paraStyle name="P24" 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="P25" 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="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P27" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" 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"/>
@@ -100,60 +98,59 @@
   </stylesheet>
   <story>
     <section>
-      <para style="P15">[[ repeatIn(objects,'o') ]] <font face="Helvetica" size="9.0">[[ set_global_data(o) ]]</font></para>
-      <para style="P18">[[ o.company_id.parent_id and o.company_id.parent_id.partner_id.name or o.company_id.partner_id.name ]]</para>
+      <para style="P18">[[ repeatIn(objects,'o') ]] <font face="Helvetica" size="9.0">[[ set_global_data(o) ]]</font></para>
+      <para style="P24">[[ 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="P23">[[ o.company_id.logo and setTag('para','image',{'width':'120.0','height':'80.0'}) ]] [[ o.company_id.logo ]]</para>
-          </td>
-          <td>
-            <para style="P17">[[ company_address()['name'] or o.company_id.partner_id.name ]]</para>
-            <para style="P20">
-              <font color="white"> </font>
-            </para>
-            <para style="P17">Calle: [[ company_address()['street'] or '' ]] Nro. Ext: [[ company_address()['street3'] or '' ]] Int: [[ company_address()['street4'] or '' ]]</para>
-            <para style="P20">
-              <font color="white"> </font>
-            </para>
-            <para style="P17">Colonia: [[ company_address()['street2'] or '' ]]</para>
-            <para style="P20">
-              <font color="white"> </font>
-            </para>
-            <para style="P17">Ciudad: [[ company_address()['city'] or '' ]] Estado: [[ company_address()['state_id'] and company_address()['state_id']['name'] or '' ]]</para>
-            <para style="P21">
-              <font color="white"> </font>
-            </para>
-            <para style="P17">Localidad: [[ company_address()['city2'] or '' ]]</para>
-            <para style="P20">
-              <font color="white"> </font>
-            </para>
-            <para style="P17">CP: [[ company_address()['zip'] or '' ]]</para>
-            <para style="P20">
-              <font color="white"> </font>
-            </para>
-            <para style="P17">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="P20">
-              <font color="white"> </font>
-            </para>
-            <para style="P19">Teléfono(s): </para>
-            <para style="P19">[[ company_address()['phone'] or removeParentNode('para') ]]</para>
-            <para style="P19">[[ company_address()['fax'] or removeParentNode('para') ]]</para>
-            <para style="P19">[[ company_address()['mobile'] or removeParentNode('para') ]]</para>
-          </td>
-          <td>
-            <para style="P7">
+            <para style="P26">[[ 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="P22">
+              <font color="white"> </font>
+            </para>
+            <para style="P20">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="P22">
+              <font color="white"> </font>
+            </para>
+            <para style="P20">Colonia: [[ o.company_emitter_id.address_invoice_parent_company_id.street2 or '' ]]</para>
+            <para style="P22">
+              <font color="white"> </font>
+            </para>
+            <para style="P20">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="P23">
+              <font color="white"> </font>
+            </para>
+            <para style="P20">Localidad: [[ o.company_emitter_id.address_invoice_parent_company_id.city2 or '' ]]</para>
+            <para style="P22">
+              <font color="white"> </font>
+            </para>
+            <para style="P20">CP: [[ o.company_emitter_id.address_invoice_parent_company_id.zip or '' ]]</para>
+            <para style="P22">
+              <font color="white"> </font>
+            </para>
+            <para style="P20">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="P22">
+              <font color="white"> </font>
+            </para>
+            <para style="P21">Teléfono(s): </para>
+            <para style="P21">[[ o.company_emitter_id.address_invoice_parent_company_id.phone or removeParentNode('para') ]]</para>
+            <para style="P21">[[ o.company_emitter_id.address_invoice_parent_company_id.fax or removeParentNode('para') ]]</para>
+            <para style="P21">[[ o.company_emitter_id.address_invoice_parent_company_id.mobile or removeParentNode('para') ]]</para>
+          </td>
+          <td>
+            <para style="P9">
               <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="P9">
-              <font color="white"> </font>
-            </para>
-            <para style="P8">[[ o.state == 'cancel' and 'FACTURA CANCELADA' ]]</para>
-            <para style="P9">
-              <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="P24">[[ o.date_invoice_tz or '' ]]</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">[[ 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="P27">[[ 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>
@@ -163,7 +160,7 @@
       <blockTable colWidths="249.0,258.0" style="Tabla2">
         <tr>
           <td>
-            <para style="P5">Receptor</para>
+            <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>
@@ -171,47 +168,47 @@
             <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="P22">Teléfono(s): </para>
-            <para style="P16">[[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
-            <para style="P16">[[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
-            <para style="P16">[[ o.address_invoice_id.mobile or removeParentNode('para') ]]</para>
+            <para style="P25">Teléfono(s): </para>
+            <para style="P19">[[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
+            <para style="P19">[[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
+            <para style="P19">[[ 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>
+            <para style="P3">[[ o.address_issued_id and o.address_issued_id.name or '' ]]</para>
+            <para style="P3">Calle: [[ o.address_issued_id.street or '' ]] Nro. Ext: [[ o.address_issued_id.street3 or '' ]] Int: [[ o.address_issued_id.street4 or '' ]]</para>
+            <para style="P3">Colonia: [[ o.address_issued_id.street2 or '' ]]</para>
+            <para style="P3">Ciudad: [[ o.address_issued_id.city or '' ]] </para>
+            <para style="P3">Estado: [[ o.address_issued_id.state_id and o.address_issued_id.state_id.name or '' ]]</para>
+            <para style="P3">Localidad: [[ o.address_issued_id.city2 or '' ]]</para>
+            <para style="P3">CP: [[ o.address_issued_id.zip or '' ]]</para>
           </td>
         </tr>
       </blockTable>
       <blockTable colWidths="55.0,43.0,158.0,55.0,63.0,54.0,81.0" style="Tabla3">
         <tr>
           <td>
-            <para style="P5">Cant.</para>
-          </td>
-          <td>
-            <para style="P5">Unidad</para>
-          </td>
-          <td>
-            <para style="P5">Descripción</para>
-          </td>
-          <td>
-            <para style="P5">Clave</para>
-          </td>
-          <td>
-            <para style="P6">P.Unitario</para>
-          </td>
-          <td>
-            <para style="P6">Dto. %</para>
-          </td>
-          <td>
-            <para style="P6">Importe</para>
+            <para style="P7">Cant.</para>
+          </td>
+          <td>
+            <para style="P7">Unidad</para>
+          </td>
+          <td>
+            <para style="P7">Descripción</para>
+          </td>
+          <td>
+            <para style="P7">Clave</para>
+          </td>
+          <td>
+            <para style="P8">P.Unitario</para>
+          </td>
+          <td>
+            <para style="P8">Dto. %</para>
+          </td>
+          <td>
+            <para style="P8">Importe</para>
           </td>
         </tr>
         <tr>
@@ -245,7 +242,7 @@
       <blockTable colWidths="414.0,93.0" style="Tabla7">
         <tr>
           <td>
-            <para style="P6">Suma $</para>
+            <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), digits=get_digits(dp='Account') )]]</para>
@@ -253,7 +250,7 @@
         </tr>
         <tr>
           <td>
-            <para style="P6">Descuento: [[ exists_key('global_discount_percent') and o.global_discount_percent or removeParentNode('tr')]] %</para>
+            <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>
@@ -261,7 +258,7 @@
         </tr>
         <tr>
           <td>
-            <para style="P6">Sub Total $</para>
+            <para style="P8">Sub Total $</para>
           </td>
           <td>
             <para style="P1">[[ formatLang(o.amount_untaxed) ]]</para>
@@ -269,9 +266,9 @@
         </tr>
         <tr>
           <td>
-            <para style="P6">
+            <para style="P8">
               <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>
+              <font face="Helvetica">[[ tax['name2'] ]] ([[ round( float( tax['tax_percent'] ) ) ]]%) $</font>
             </para>
           </td>
           <td>
@@ -280,7 +277,7 @@
         </tr>
         <tr>
           <td>
-            <para style="P6">
+            <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>
@@ -291,7 +288,7 @@
         </tr>
         <tr>
           <td>
-            <para style="P6">Total $</para>
+            <para style="P8">Total $</para>
           </td>
           <td>
             <para style="P1">[[ formatLang(o.amount_total) ]]</para>
@@ -299,8 +296,8 @@
         </tr>
         <tr>
           <td>
-            <para style="P13">IMPORTE CON LETRA:</para>
-            <para style="P11">[[ o.amount_to_text ]]</para>
+            <para style="P15">IMPORTE CON LETRA:</para>
+            <para style="P13">[[ o.amount_to_text ]]</para>
           </td>
           <td>
             <para style="P1">
@@ -309,53 +306,56 @@
           </td>
         </tr>
       </blockTable>
-      <para style="P10">PAGO EN UNA SOLA EXHIBICIÓN</para>
-      <para style="P10">
-        <font color="white"> </font>
-      </para>
-      <para style="P10">“Este documento es una representacion impresa de un CFD” </para>
-      <para style="P10">CFD, Comprobante Fiscal Digital</para>
-      <para style="P10">
-        <font color="white"> </font>
-      </para>
-      <blockTable colWidths="157.0,175.0,166.0" style="Table1">
+      <para style="P12">PAGO EN UNA SOLA EXHIBICIÓN</para>
+      <para style="P12">
+        <font color="white"> </font>
+      </para>
+      <para style="P12">“Este documento es una representacion impresa de un CFD” </para>
+      <para style="P12">CFD, Comprobante Fiscal Digital</para>
+      <para style="P12">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="166.0,166.0,166.0" style="Table1">
         <tr>
           <td>
-            <para style="P10_enc">Régimen Fiscal </para>
-            <para style="P11_txt">[[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="P10_enc">Método de Pago: </para>
-            <para style="P11_txt">[[o.pay_method_id.name or 'No identificado']]</para>
-          </td>
-          <td>
-            <para style="P10_enc">Últimos 4 dígitos de la cuenta bancaria:</para>
-            <para style="P11_txt">[[o.acc_payment.last_acc_number or 'No identificado']]</para>
+            <para style="P6">Régimen Fiscal:</para>
+            <para style="P5">[[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="P6">Método de Pago:</para>
+            <para style="P5">[[o.pay_method_id.name or 'No identificado']]</para>
+          </td>
+          <td>
+            <para style="P6">Últimos 4 dígitos de la cuenta bancaria:</para>
+            <para style="P5">[[o.acc_payment.last_acc_number or 'No identificado']]</para>
           </td>
         </tr>
       </blockTable>
+      <para style="P17">
+        <font color="white"> </font>
+      </para>
       <blockTable colWidths="101.0,397.0" style="Tabla4">
         <tr>
           <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>
+            <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="P10">Serie del Certificado :</para>
-            <para style="P10">[[ o.no_certificado or '' ]]</para>
-            <para style="P10">
+            <para style="P12">Serie del Certificado :</para>
+            <para style="P12">[[ o.no_certificado or '' ]]</para>
+            <para style="P12">
               <font color="white"> </font>
             </para>
-            <para style="P10">Sello digital :</para>
-            <para style="P12">[[ split_string( o.sello ) ]]</para>
+            <para style="P12">Sello digital :</para>
+            <para style="P14">[[ split_string( o.sello ) ]]</para>
           </td>
         </tr>
       </blockTable>
-      <para style="P10">Cadena original :</para>
-      <para style="P11">[[ split_string( o.cadena_original ) ]]</para>
-      <para style="P14">
+      <para style="P12">Cadena original :</para>
+      <para style="P13">[[ split_string( o.cadena_original ) ]]</para>
+      <para style="P16">
         <font color="white"> </font>
       </para>
-      <para style="P14">Vendedor: [[o.user_id.name]]</para>
+      <para style="P16">Vendedor: [[o.user_id.name]]</para>
       <para style="terp_default_9">[[ format(o.comment or '') ]]</para>
     </section>
     <para style="Standard">

=== modified file 'l10n_mx_facturae/report/invoice_facturae_pdf.sxw'
Binary files l10n_mx_facturae/report/invoice_facturae_pdf.sxw	2012-09-08 04:35:43 +0000 and l10n_mx_facturae/report/invoice_facturae_pdf.sxw	2013-01-16 20:14:21 +0000 differ
=== modified file 'l10n_mx_facturae_22/invoice.py'
--- l10n_mx_facturae_22/invoice.py	2012-09-11 19:12:04 +0000
+++ l10n_mx_facturae_22/invoice.py	2013-01-16 20:14:21 +0000
@@ -54,15 +54,15 @@
             return invoice_data_parents
         else:
             invoice = self.browse(cr, uid, ids, context={'date':date_invoice})[0]
-            city = invoice_data_parents and invoice_data_parents[0].get('Comprobante',{}).get('Emisor', {}).get('DomicilioFiscal',{}).get('municipio', {}) or False
-            state = invoice_data_parents and invoice_data_parents[0].get('Comprobante',{}).get('Emisor', {}).get('DomicilioFiscal',{}).get('estado', {}) or False
-            country = invoice_data_parents and invoice_data_parents[0].get('Comprobante',{}).get('Emisor', {}).get('DomicilioFiscal',{}).get('pais', {}) or False
+            city = invoice_data_parents and invoice_data_parents[0].get('Comprobante',{}).get('Emisor', {}).get('ExpedidoEn',{}).get('municipio', {}) or False
+            state = invoice_data_parents and invoice_data_parents[0].get('Comprobante',{}).get('Emisor', {}).get('ExpedidoEn',{}).get('estado', {}) or False
+            country = invoice_data_parents and invoice_data_parents[0].get('Comprobante',{}).get('Emisor', {}).get('ExpedidoEn',{}).get('pais', {}) or False
             if city and state and country:
                 address = city +' '+ state +', '+ country
             else:
                 raise osv.except_osv(('Domicilio Incompleto!'),('Verifique que el domicilio de la compañia emisora del comprobante fiscal este completo (Ciudad - Estado - Pais)'))
             
-            if not invoice.company_id.partner_id.regimen_fiscal_id.name:
+            if not invoice.company_emitter_id.partner_id.regimen_fiscal_id.name:
                 raise osv.except_osv(('Regimen Fiscal Faltante!'),('El Regimen Fiscal de la compañia emisora del comprobante fiscal es un dato requerido'))
                 
             invoice_data_parents[0]['Comprobante']['xsi:schemaLocation'] = 'http://www.sat.gob.mx/cfd/2 http://www.sat.gob.mx/sitio_internet/cfd/2/cfdv22.xsd'
@@ -71,7 +71,7 @@
             invoice_data_parents[0]['Comprobante']['Moneda'] = invoice.currency_id.name or ''
             invoice_data_parents[0]['Comprobante']['NumCtaPago'] = invoice.acc_payment.last_acc_number or 'No identificado'
             invoice_data_parents[0]['Comprobante']['metodoDePago'] = invoice.pay_method_id.name or 'No identificado'
-            invoice_data_parents[0]['Comprobante']['Emisor']['RegimenFiscal'] = {'Regimen':invoice.company_id.partner_id.regimen_fiscal_id.name or ''}
+            invoice_data_parents[0]['Comprobante']['Emisor']['RegimenFiscal'] = {'Regimen':invoice.company_emitter_id.partner_id.regimen_fiscal_id.name or ''}
             invoice_data_parents[0]['Comprobante']['LugarExpedicion'] = address
         
         return invoice_data_parents

=== modified file 'l10n_mx_facturae_cbb/report/invoice_facturae_pdf.py'
--- l10n_mx_facturae_cbb/report/invoice_facturae_pdf.py	2012-11-16 22:07:35 +0000
+++ l10n_mx_facturae_cbb/report/invoice_facturae_pdf.py	2013-01-16 20:14:21 +0000
@@ -178,14 +178,14 @@
         partner_obj = pool.get('res.partner')
         address_obj = pool.get('res.partner.address')
         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
+        partner_id = invoice.company_emitted_id.parent_id and invoice.company_emitted_id.parent_id.partner_id.id or invoice.company_emitted_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, address_id)
         
-        subpartner_id = invoice.company_id.partner_id.id
+        subpartner_id = invoice.company_emitted_id.partner_id.id
         if partner_id == subpartner_id:
             self.subcompany_address_invoice = self.company_address_invoice
         else:

=== modified file 'l10n_mx_facturae_cbb/report/invoice_facturae_pdf.rml'
--- l10n_mx_facturae_cbb/report/invoice_facturae_pdf.rml	2012-11-16 23:59:38 +0000
+++ l10n_mx_facturae_cbb/report/invoice_facturae_pdf.rml	2013-01-16 20:14:21 +0000
@@ -60,6 +60,7 @@
     <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"/>
+<<<<<<< TREE
     <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"/>
@@ -74,7 +75,24 @@
     <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="P4" fontName="Helvetica" fontSize="10.0" leading="13"/>
+    <paraStyle name="P5" fontName="Helvetica" textColor="#280099"/>
+    <paraStyle name="P6" fontName="Helvetica" alignment="RIGHT" textColor="#280099"/>
+    <paraStyle name="P7" fontName="Helvetica" textColor="#ff3333"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="12.0" leading="15" textColor="#800000"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="2.0" leading="3" textColor="#800000"/>
+    <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" 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="P13" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8" 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="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
+    <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="18.0" leading="22" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
+>>>>>>> MERGE-SOURCE
     <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"/>
+<<<<<<< TREE
     <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"/>
@@ -85,6 +103,12 @@
     <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="P19" 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="P20" 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="P21" 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="P22" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+>>>>>>> MERGE-SOURCE
     <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"/>
@@ -101,11 +125,17 @@
   </stylesheet>
   <story>
     <section>
+<<<<<<< TREE
       <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>
+=======
+      <para style="P14">[[ repeatIn(objects,'o') ]] <font face="Helvetica" size="9.0">[[ set_global_data(o) ]]</font></para>
+      <para style="P17">[[ o.company_emitter_id.address_invoice_parent_company_id.name or '' ]]</para>
+>>>>>>> MERGE-SOURCE
       <blockTable colWidths="125.0,207.0,166.0" style="Tabla1">
         <tr>
           <td>
+<<<<<<< TREE
             <para style="P24">[[ o.company_id.logo and setTag('para','image',{'width':'120.0','height':'80.0'}) ]] [[ o.company_id.logo ]]</para>
           </td>
           <td>
@@ -144,8 +174,48 @@
           </td>
           <td>
             <para style="P9">
+=======
+            <para style="P22">[[ 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="P19">
+              <font color="white"> </font>
+            </para>
+            <para style="P16">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="P19">
+              <font color="white"> </font>
+            </para>
+            <para style="P16">Colonia: [[ o.company_emitter_id.address_invoice_parent_company_id.street2 or '' ]]</para>
+            <para style="P19">
+              <font color="white"> </font>
+            </para>
+            <para style="P16">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="P20">
+              <font color="white"> </font>
+            </para>
+            <para style="P16">Localidad: [[ o.company_emitter_id.address_invoice_parent_company_id.city2 or '' ]]</para>
+            <para style="P19">
+              <font color="white"> </font>
+            </para>
+            <para style="P16">CP: [[ o.company_emitter_id.address_invoice_parent_company_id.zip or '' ]]</para>
+            <para style="P19">
+              <font color="white"> </font>
+            </para>
+            <para style="P16">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="P19">
+              <font color="white"> </font>
+            </para>
+            <para style="P18">Teléfono(s): </para>
+            <para style="P18">[[ o.company_emitter_id.address_invoice_parent_company_id.phone or removeParentNode('para') ]]</para>
+            <para style="P18">[[ o.company_emitter_id.address_invoice_parent_company_id.fax or removeParentNode('para') ]]</para>
+            <para style="P18">[[ o.company_emitter_id.address_invoice_parent_company_id.mobile or removeParentNode('para') ]]</para>
+          </td>
+          <td>
+            <para style="P7">
+>>>>>>> MERGE-SOURCE
               <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>
+<<<<<<< TREE
             <para style="P11">
               <font color="white"> </font>
             </para>
@@ -154,6 +224,16 @@
               <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="P9">
+              <font color="white"> </font>
+            </para>
+            <para style="P8">[[ o.state == 'cancel' and 'FACTURA CANCELADA' ]]</para>
+            <para style="P9">
+              <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>
+>>>>>>> MERGE-SOURCE
             <para style="Table Contents">[[ o.date_invoice_tz or '' ]]</para>
           </td>
         </tr>
@@ -161,7 +241,11 @@
       <blockTable colWidths="249.0,249.0" style="Tabla2">
         <tr>
           <td>
+<<<<<<< TREE
             <para style="P7">Receptor</para>
+=======
+            <para style="P5">Receptor</para>
+>>>>>>> MERGE-SOURCE
             <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>
@@ -169,28 +253,36 @@
             <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>
+<<<<<<< TREE
             <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>
+=======
+            <para style="P21">Teléfono(s): </para>
+            <para style="P15">[[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
+            <para style="P15">[[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
+            <para style="P15">[[ o.address_invoice_id.mobile or removeParentNode('para') ]]</para>
+>>>>>>> MERGE-SOURCE
           </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>
+            <para style="P3">[[ o.address_issued_id and o.address_issued_id.name or '' ]]</para>
+            <para style="P3">Calle: [[ o.address_issued_id.street or '' ]] Nro. Ext: [[ o.address_issued_id.street3 or '' ]] Int: [[ o.address_issued_id.street4 or '' ]]</para>
+            <para style="P3">Colonia: [[ o.address_issued_id.street2 or '' ]]</para>
+            <para style="P3">Ciudad: [[ o.address_issued_id.city or '' ]] </para>
+            <para style="P3">Localidad: [[ o.address_issued_id.city2 or '' ]]</para>
+            <para style="P3">Estado: [[ o.address_issued_id.state_id and o.address_issued_id.state_id.name or '' ]]</para>
+            <para style="P3">CP: [[ o.address_issued_id.zip or '' ]] </para>
           </td>
         </tr>
       </blockTable>
       <blockTable colWidths="47.0,88.0,160.0,54.0,65.0,85.0" style="Tabla3">
         <tr>
           <td>
+<<<<<<< TREE
             <para style="P25">Cantidad</para>
           </td>
           <td>
@@ -207,10 +299,29 @@
           </td>
           <td>
             <para style="P26">Importe</para>
+=======
+            <para style="P5">Cantidad</para>
+          </td>
+          <td>
+            <para style="P5">Unidad</para>
+          </td>
+          <td>
+            <para style="P5">Descripción</para>
+          </td>
+          <td>
+            <para style="P5">Clave</para>
+          </td>
+          <td>
+            <para style="P6">P.Unitario</para>
+          </td>
+          <td>
+            <para style="P6">Importe</para>
+>>>>>>> MERGE-SOURCE
           </td>
         </tr>
         <tr>
           <td>
+<<<<<<< TREE
             <para style="Table Contents">
               <font face="Helvetica" size="8.0">[[ repeatIn(o.invoice_line,'l') ]] [[ formatLang(l.quantity) ]]</font>
             </para>
@@ -221,11 +332,22 @@
           <td>
             <para style="P2">[[ l.name ]]</para>
             <para style="P4">
+=======
+            <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="P4">
+>>>>>>> MERGE-SOURCE
               <font face="Helvetica" size="7.0">Notas:</font>
               <font face="Helvetica" size="7.0">[[l.note or removeParentNode('para')]]</font>
             </para>
           </td>
           <td>
+<<<<<<< TREE
             <para style="P2">[[ l.product_id and l.product_id.default_code ]]</para>
           </td>
           <td>
@@ -233,13 +355,26 @@
           </td>
           <td>
             <para style="P28">[[ exists_key('global_discount_percent') and (formatLang(l.quantity * l.price_unit)) or formatLang(l.price_subtotal) ]]</para>
+=======
+            <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">[[ exists_key('global_discount_percent') and (formatLang(l.quantity * l.price_unit)) or formatLang(l.price_subtotal) ]]</para>
+>>>>>>> MERGE-SOURCE
           </td>
         </tr>
       </blockTable>
       <blockTable colWidths="427.0,71.0" style="Tabla7">
         <tr>
           <td>
+<<<<<<< TREE
             <para style="P8">Suma $</para>
+=======
+            <para style="P6">Suma $</para>
+>>>>>>> MERGE-SOURCE
           </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>
@@ -247,7 +382,11 @@
         </tr>
         <tr>
           <td>
+<<<<<<< TREE
             <para style="P8">Descuento: [[ exists_key('global_discount_percent') and o.global_discount_percent or removeParentNode('tr')]] %</para>
+=======
+            <para style="P6">Descuento: [[ exists_key('global_discount_percent') and o.global_discount_percent or removeParentNode('tr')]] %</para>
+>>>>>>> MERGE-SOURCE
           </td>
           <td>
             <para style="P1">[[o.global_discount_amount and formatLang( o.global_discount_amount) or '']]</para>
@@ -255,7 +394,11 @@
         </tr>
         <tr>
           <td>
+<<<<<<< TREE
             <para style="P8">Sub Total $</para>
+=======
+            <para style="P6">Sub Total $</para>
+>>>>>>> MERGE-SOURCE
           </td>
           <td>
             <para style="P1">[[ formatLang(o.amount_untaxed) ]]</para>
@@ -263,7 +406,11 @@
         </tr>
         <tr>
           <td>
+<<<<<<< TREE
             <para style="P8">
+=======
+            <para style="P6">
+>>>>>>> MERGE-SOURCE
               <font face="Helvetica" size="6.0">[[ repeatIn( get_taxes(), 'tax' ) ]]</font>
               <font face="Helvetica">[[ tax['name2'] ]] ([[ round( float( tax['tax_percent'] ) ) ]]%) $</font>
             </para>
@@ -274,7 +421,11 @@
         </tr>
         <tr>
           <td>
+<<<<<<< TREE
             <para style="P8">
+=======
+            <para style="P6">
+>>>>>>> MERGE-SOURCE
               <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>
@@ -285,7 +436,11 @@
         </tr>
         <tr>
           <td>
+<<<<<<< TREE
             <para style="P8">Total $</para>
+=======
+            <para style="P6">Total $</para>
+>>>>>>> MERGE-SOURCE
           </td>
           <td>
             <para style="P1">[[ formatLang(o.amount_total) ]]</para>
@@ -293,8 +448,13 @@
         </tr>
         <tr>
           <td>
+<<<<<<< TREE
             <para style="P14">IMPORTE CON LETRA:</para>
             <para style="P13">[[ o.amount_to_text ]]</para>
+=======
+            <para style="P12">IMPORTE CON LETRA:</para>
+            <para style="P11">[[ o.amount_to_text ]]</para>
+>>>>>>> MERGE-SOURCE
           </td>
           <td>
             <para style="P1">
@@ -303,6 +463,7 @@
           </td>
         </tr>
       </blockTable>
+<<<<<<< TREE
       <para style="P12">
         <font color="white"> </font>
       </para>
@@ -326,6 +487,12 @@
         </tr>
       </blockTable>
       <para style="P12">
+=======
+      <para style="P10">
+        <font color="white"> </font>
+      </para>
+      <para style="P10">
+>>>>>>> MERGE-SOURCE
         <font color="white"> </font>
       </para>
       <blockTable colWidths="106.0,257.0,135.0" style="Tabla4">
@@ -353,14 +520,19 @@
             <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>
+            <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>
         </tr>
       </blockTable>
+<<<<<<< TREE
       <para style="terp_default_9">
         <font color="white"> </font>
       </para>
       <para style="P15">Vendedor: [[o.user_id.name]]</para>
+=======
+      <para style="terp_default_9"/>
+      <para style="P13">Vendedor: [[o.user_id.name]]</para>
+>>>>>>> MERGE-SOURCE
       <para style="terp_default_9">[[ format(o.comment or '') ]]</para>
     </section>
   </story>

=== renamed file 'l10n_mx_facturae_cbb/report/invoice_facturae_pdf.sxw' => 'l10n_mx_facturae_cbb/report/invoice_facturae_pdf.sxw.OTHER'
Binary files l10n_mx_facturae_cbb/report/invoice_facturae_pdf.sxw	2012-11-16 23:59:38 +0000 and l10n_mx_facturae_cbb/report/invoice_facturae_pdf.sxw.OTHER	2013-01-16 20:14:21 +0000 differ
=== modified file 'l10n_mx_facturae_cer/invoice.py'
--- l10n_mx_facturae_cer/invoice.py	2012-02-24 00:42:55 +0000
+++ l10n_mx_facturae_cer/invoice.py	2013-01-16 20:14:21 +0000
@@ -41,7 +41,7 @@
         for invoice in self.browse(cr, uid, ids, context=context):
             context.update( {'date_work': invoice.date_invoice} )
             certificate_id = False
-            certificate_id = company_obj._get_current_certificate(cr, uid, [invoice.company_id.id], context=context)[invoice.company_id.id]
+            certificate_id = company_obj._get_current_certificate(cr, uid, [invoice.company_emitter_id.id], context=context)[invoice.company_emitter_id.id]
             certificate_id = certificate_id and certificate_obj.browse(cr, uid, [certificate_id], context=context)[0] or False
             res[invoice.id] = certificate_id and certificate_id.id or False
         return res

=== modified file 'l10n_mx_facturae_cer/res_company.py'
--- l10n_mx_facturae_cer/res_company.py	2013-01-10 18:50:19 +0000
+++ l10n_mx_facturae_cer/res_company.py	2013-01-16 20:14:21 +0000
@@ -221,17 +221,13 @@
                 return res
         for company in self.browse(cr, uid, ids, context=context):
             current_company = company
-            while True:
-                certificate_ids = certificate_obj.search(cr, uid, [
-                        ('company_id', '=', company.id),
-                        ('date_start', '<=', date),
-                        ('date_end', '>=', date),
-                        ('active', '=', True),
-                    ], limit=1)
-                certificate_id = certificate_ids and certificate_ids[0] or False
-                company = company.parent_id
-                if certificate_id or not company:
-                    break
+            certificate_ids = certificate_obj.search(cr, uid, [
+                    ('company_id', '=', company.id),
+                    ('date_start', '<=', date),
+                    ('date_end', '>=', date),
+                    ('active', '=', True),
+                ], limit=1)
+            certificate_id = certificate_ids and certificate_ids[0] or False
             res[current_company.id] = certificate_id
         return res
     

=== modified file 'l10n_mx_facturae_pac_sf/invoice.py'
--- l10n_mx_facturae_pac_sf/invoice.py	2012-11-28 23:32:38 +0000
+++ l10n_mx_facturae_pac_sf/invoice.py	2013-01-16 20:14:21 +0000
@@ -163,7 +163,7 @@
         msg = ''
 
         cfd_data_adenda = cfd_data.replace('</Comprobante>', moneda)
-        pac_params_ids = pac_params_obj.search(cr,uid,[('method_type','=','pac_sf_firmar')], limit=1, context=context)
+        pac_params_ids = pac_params_obj.search(cr,uid,[('method_type','=','pac_sf_firmar'), ('company_id', '=', invoice.company_emitter_id.id), ('active', '=', True)], limit=1, context=context)
 
         if pac_params_ids:
             pac_params = pac_params_obj.browse(cr, uid, pac_params_ids, context)[0]
@@ -196,7 +196,7 @@
                     wsdl_client.soapproxy.config.dumpSOAPIn = 0
                     wsdl_client.soapproxy.config.debug = 0
                     wsdl_client.soapproxy.config.dict_encoding='UTF-8'
-                    resultado = wsdl_client.timbrar(*params)               
+                    resultado = wsdl_client.timbrar(*params)        
                     msg += resultado['resultados'] and resultado['resultados']['mensaje'] or ''
                     status = resultado['resultados'] and resultado['resultados']['status'] or ''
                     if status == '200' or status == '307':
@@ -251,7 +251,7 @@
 
         invoice_brw = self.browse(cr, uid, context_id, context)
         company_brw = company_obj.browse(cr, uid, [invoice_brw.company_id.id], context)[0]
-        pac_params_srch = pac_params_obj.search(cr,uid,[('method_type','=','pac_sf_cancelar')],context=context)
+        pac_params_srch = pac_params_obj.search(cr,uid,[('method_type','=','pac_sf_cancelar'), ('company_id', '=', invoice_brw.company_emitter_id.id), ('active', '=', True)], context=context)
 
         if pac_params_srch:
             pac_params_brw = pac_params_obj.browse(cr, uid, pac_params_srch, context)[0]

=== modified 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	2012-09-08 03:46:54 +0000
+++ l10n_mx_facturae_pac_sf/report/invoice_facturae_pac_sf_pdf.py	2013-01-16 20:14:21 +0000
@@ -169,14 +169,14 @@
         partner_obj = pool.get('res.partner')
         address_obj = pool.get('res.partner.address')
         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
+        partner_id = invoice.company_emitted_id.parent_id and invoice.company_emitted_id.parent_id.partner_id.id or invoice.company_emitted_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, address_id)
         
-        subpartner_id = invoice.company_id.partner_id.id
+        subpartner_id = invoice.company_emitted_id.partner_id.id
         if partner_id == subpartner_id:
             self.subcompany_address_invoice = self.company_address_invoice
         else:

=== modified 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	2012-09-08 04:35:43 +0000
+++ l10n_mx_facturae_pac_sf/report/invoice_facturae_pac_sf_pdf.rml	2013-01-16 20:14:21 +0000
@@ -24,20 +24,6 @@
       <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="Tabla7">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -68,6 +54,20 @@
       <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="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"/>
@@ -81,32 +81,30 @@
     <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" 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="P10_enc" fontName="Helvetica-Bold" fontSize="6.0" leading="8" alignment="CENTER"/>
-    <paraStyle name="P11_txt" fontName="Helvetica" fontSize="6.0" leading="8" alignment="CENTER"/>
-    <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="6.0" leading="8" 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" textColor="#280099"/>
-    <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <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="18.0" leading="22" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
-    <paraStyle name="P22" 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="P23" 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="P24" 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="P25" 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="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P27" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
-    <paraStyle name="P28" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P29" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P30" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <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" fontSize="6.0" leading="8" 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="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
+    <paraStyle name="P26" 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="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="18.0" leading="22" alignment="CENTER" 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="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"/>
@@ -123,59 +121,58 @@
   </stylesheet>
   <story>
     <section>
-      <para style="P18">[[ repeatIn(objects,'o') ]] <font face="Helvetica" size="9.0">[[ set_global_data(o) ]]</font></para>
-      <para style="P21">[[ o.company_id.parent_id and o.company_id.parent_id.partner_id.name or o.company_id.partner_id.name ]]</para>
+      <para style="P22">[[ repeatIn(objects,'o') ]] <font face="Helvetica" size="9.0">[[ set_global_data(o) ]]</font></para>
+      <para style="P28">[[ 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="P26">[[ o.company_id.logo and setTag('para','image',{'width':'120.0','height':'80.0'}) ]] [[ o.company_id.logo ]]</para>
-          </td>
-          <td>
-            <para style="P20">[[ company_address()['name'] or o.company_id.partner_id.name ]]</para>
-            <para style="P23">
-              <font color="white"> </font>
-            </para>
-            <para style="P20">Calle: [[ company_address()['street'] or '' ]] Nro. Ext: [[ company_address()['street3'] or '' ]] Int: [[ company_address()['street4'] or '' ]]</para>
-            <para style="P23">
-              <font color="white"> </font>
-            </para>
-            <para style="P20">Colonia: [[ company_address()['street2'] or '' ]]</para>
-            <para style="P23">
-              <font color="white"> </font>
-            </para>
-            <para style="P20">Ciudad: [[ company_address()['city'] or '' ]], Estado: [[ company_address()['state_id'] and company_address()['state_id']['name'] or '' ]] </para>
-            <para style="P24">
-              <font color="white"> </font>
-            </para>
-            <para style="P20">Localidad: [[ company_address()['city2'] or '' ]]</para>
-            <para style="P23">
-              <font color="white"> </font>
-            </para>
-            <para style="P20">CP: [[ company_address()['zip'] or '' ]]</para>
-            <para style="P23">
-              <font color="white"> </font>
-            </para>
-            <para style="P20">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="P23">
-              <font color="white"> </font>
-            </para>
-            <para style="P22">Teléfono(s): </para>
-            <para style="P22">[[ company_address()['phone'] or removeParentNode('para') ]]</para>
-            <para style="P22">[[ company_address()['fax'] or removeParentNode('para') ]]</para>
-            <para style="P22">[[ company_address()['mobile'] or removeParentNode('para') ]]</para>
-          </td>
-          <td>
-            <para style="P9">
+            <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="P26">
+              <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="P26">
+              <font color="white"> </font>
+            </para>
+            <para style="P24">Colonia: [[ o.company_emitter_id.address_invoice_parent_company_id.street2 or '' ]]</para>
+            <para style="P26">
+              <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="P27">
+              <font color="white"> </font>
+            </para>
+            <para style="P24">Localidad: [[ o.company_emitter_id.address_invoice_parent_company_id.city2 or '' ]]</para>
+            <para style="P26">
+              <font color="white"> </font>
+            </para>
+            <para style="P24">CP: [[ o.company_emitter_id.address_invoice_parent_company_id.zip or '' ]]</para>
+            <para style="P26">
+              <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="P26">
+              <font color="white"> </font>
+            </para>
+            <para style="P25">Teléfono(s): </para>
+            <para style="P25">[[ o.company_emitter_id.address_invoice_parent_company_id.phone or removeParentNode('para') ]]</para>
+            <para style="P25">[[ o.company_emitter_id.address_invoice_parent_company_id.fax or removeParentNode('para') ]]</para>
+            <para style="P25">[[ 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="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="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>
@@ -186,7 +183,7 @@
       <blockTable colWidths="249.0,249.0" style="Tabla2">
         <tr>
           <td>
-            <para style="P7">Receptor</para>
+            <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> [[ o.address_invoice_id.street ]] Nro. 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>
@@ -194,47 +191,47 @@
             <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="P25">Teléfono(s): </para>
-            <para style="P19">[[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
-            <para style="P19">[[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
-            <para style="P19">[[ o.address_invoice_id.mobile or removeParentNode('para') ]]</para>
+            <para style="P29">Teléfono(s): </para>
+            <para style="P23">[[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
+            <para style="P23">[[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
+            <para style="P23">[[ 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">Localidad: [[ subcompany_address()['city2'] or '' ]]</para>
-            <para style="P3">Estado: [[ subcompany_address()['state_id'] and subcompany_address()['state_id']['name'] or '' ]]</para>
-            <para style="P3">CP: [[ subcompany_address()['zip'] or '' ]] </para>
+            <para style="P3">[[ o. address_issued_id and o.address_issued_id.name or '' ]]</para>
+            <para style="P3">Calle: [[ o.address_issued_id.street or '' ]] Nro. Ext: [[ o.address_issued_id.street3 or '' ]] Int: [[ o.address_issued_id.street4 or '' ]]</para>
+            <para style="P3">Colonia: [[ o.address_issued_id.street2 or '' ]]</para>
+            <para style="P3">Ciudad: [[ o.address_issued_id.city or '' ]]</para>
+            <para style="P3">Localidad: [[ o.address_issued_id.city2 or '' ]]</para>
+            <para style="P3">Estado: [[ o.address_issued_id.state_id and o.address_issued_id.state_id.name or '' ]]</para>
+            <para style="P3">CP: [[ 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="P7">Cantidad</para>
-          </td>
-          <td>
-            <para style="P7">Unidad</para>
-          </td>
-          <td>
-            <para style="P7">Descripción</para>
-          </td>
-          <td>
-            <para style="P7">Clave</para>
-          </td>
-          <td>
-            <para style="P8">P.Unitario</para>
-          </td>
-          <td>
-            <para style="P8">Dto %</para>
-          </td>
-          <td>
-            <para style="P8">Importe</para>
+            <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>
@@ -265,7 +262,7 @@
       <blockTable colWidths="414.0,91.0" style="Tabla7">
         <tr>
           <td>
-            <para style="P8">Suma $</para>
+            <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>
@@ -273,7 +270,7 @@
         </tr>
         <tr>
           <td>
-            <para style="P8">Descuento: [[ exists_key('global_discount_percent') and o.global_discount_percent or removeParentNode('tr')]] %</para>
+            <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>
@@ -281,7 +278,7 @@
         </tr>
         <tr>
           <td>
-            <para style="P8">Sub Total $</para>
+            <para style="P10">Sub Total $</para>
           </td>
           <td>
             <para style="P1">[[ formatLang(o.amount_untaxed) ]]</para>
@@ -289,7 +286,7 @@
         </tr>
         <tr>
           <td>
-            <para style="P8">
+            <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>
@@ -300,7 +297,7 @@
         </tr>
         <tr>
           <td>
-            <para style="P8">
+            <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>
@@ -311,7 +308,7 @@
         </tr>
         <tr>
           <td>
-            <para style="P8">Total $</para>
+            <para style="P10">Total $</para>
           </td>
           <td>
             <para style="P1">[[ formatLang(o.amount_total) ]]</para>
@@ -319,8 +316,8 @@
         </tr>
         <tr>
           <td>
-            <para style="P15">IMPORTE CON LETRA:</para>
-            <para style="P13">[[ o.amount_to_text ]]</para>
+            <para style="P17">IMPORTE CON LETRA:</para>
+            <para style="P15">[[ o.amount_to_text ]]</para>
           </td>
           <td>
             <para style="P1">
@@ -329,75 +326,78 @@
           </td>
         </tr>
       </blockTable>
-      <para style="P12">PAGO EN UNA SOLA EXHIBICIÓN</para>
-      <para style="P12">
+      <para style="P14">PAGO EN UNA SOLA EXHIBICIÓN</para>
+      <para style="P14">
         <font color="white"> </font>
       </para>
-      <para style="P12">“Este documento es una representacion impresa de un CFDI” </para>
-      <para style="P12">CFDI, Comprobante Fiscal Digital por Internet</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="P12">Certificado del emisor</para>
-          </td>
-          <td>
-            <para style="P16">Certificado del SAT</para>
-          </td>
-          <td>
-            <para style="P16">Fecha de Timbrado</para>
-          </td>
-          <td>
-            <para style="P16">Folio Fiscal</para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="P17">[[ o.no_certificado or '' ]]</para>
-          </td>
-          <td>
-            <para style="P17">[[ o.cfdi_no_certificado or '' ]]</para>
-          </td>
-          <td>
-            <para style="P17">[[ o.cfdi_fecha_timbrado or '' ]]</para>
-          </td>
-          <td>
-            <para style="P17">[[ o.cfdi_folio_fiscal or '' ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <blockTable colWidths="155.0,174.0,170.0" style="Table1">
-        <tr>
-          <td>
-            <para style="P10_enc">Régimen Fiscal:</para>
-            <para style="P11_txt">[[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="P10_enc">Método de Pago: </para>
-            <para style="P11_txt">[[o.pay_method_id.name or 'No identificado']]</para>
-          </td>
-          <td>
-            <para style="P10_enc">Últimos 4 dígitos de la cuenta bancaria:</para>
-            <para style="P11_txt">[[o.acc_payment.last_acc_number or 'No identificado']]</para>
-          </td>
-        </tr>
-      </blockTable>
+            <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="Table1">
+        <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="Tabla4">
         <tr>
           <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>
+            <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="P12">Sello Digital Emisor:</para>
-            <para style="P14">[[ split_string( o.sello or '') ]]</para>
-            <para style="P14">
+            <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="P12">Sello Digital SAT:</para>
-            <para style="P14">[[ split_string( o.cfdi_sello or '') ]]</para>
-            <para style="P14">
+            <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>
@@ -406,8 +406,8 @@
           </td>
         </tr>
       </blockTable>
-      <para style="P12">Cadena Original del complemento de certificación digital del SAT:</para>
-      <para style="P29">[[ split_string( o.cfdi_cadena_original or '' ) ]]</para>
+      <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>

=== modified 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	2012-09-08 04:35:43 +0000 and l10n_mx_facturae_pac_sf/report/invoice_facturae_pac_sf_pdf.sxw	2013-01-16 20:14:21 +0000 differ
=== modified file 'l10n_mx_facturae_seq/__openerp__.py'
--- l10n_mx_facturae_seq/__openerp__.py	2012-08-30 21:55:10 +0000
+++ l10n_mx_facturae_seq/__openerp__.py	2013-01-16 20:14:21 +0000
@@ -36,6 +36,7 @@
     "license" : "AGPL-3",
     "depends" : [
         "account",
+        "l10n_mx_company_multi_address",
     ],
     "init_xml" : [],
     "demo_xml" : [],

=== modified file 'l10n_mx_facturae_seq/invoice.py'
--- l10n_mx_facturae_seq/invoice.py	2012-02-24 00:42:55 +0000
+++ l10n_mx_facturae_seq/invoice.py	2013-01-16 20:14:21 +0000
@@ -39,7 +39,7 @@
         res = {}
         for invoice in self.browse(cr, uid, ids):
             sequence_id = False
-            company = invoice.company_id
+            company = invoice.company_emitter_id
             while True:
                 if invoice.type == 'out_invoice':
                     if company._columns.has_key('invoice_out_sequence_id'):