Merge lp:~vauxoo/openerp-mexico-localization/addons-mx-trunk-facturae-multisuc-dev-yzk into lp:openerp-mexico-localization

[Isaac López Zúñiga]

[lp:~vauxoo/openerp-mexico-localization/addons-mx-trunk-facturae-multisuc-dev-yzk]

176. By Isaac López Zúñiga on 2012-07-27

[IMP][l10n_mx_company_multi_address] ADD inherit to _get_facturae_invoice_dict_data function

177. By Isaac López Zúñiga on 2012-07-27

[ADD][l10n_mx_company_multi_address] Add address_invoice_company_id to journal

178. By Isaac López Zúñiga on 2012-07-28

[IMP][l10n_mx_company_multi_address] Se quita el onchange de company

179. By Isaac López Zúñiga on 2012-07-28

[IMP][l10n_mx_company_multi_address] Se agrega el regimen fiscal al xml

180. By Isaac López Zúñiga on 2012-07-30

[REF][l10n_mx_company_multi_address]Cambio a fin de linea LF

181. By Isaac López Zúñiga on 2012-07-30

[IMP][l10n_mx_company_multi_address] Lugar de expedicion correspondiente a la sucursal

182. By Isaac López Zúñiga on 2012-07-30

[REF]l10n_mx_company_multi_address] Add , after to city

183. By Isaac López Zúñiga on 2012-07-30

[IMP][l10n_mx_company_multi_address] address_invoice_company_id cambiado a readonly

184. By Isaac López Zúñiga on 2012-07-30

[FIX][l10n_mx_company_multi_address] Readonly removido

185. By Isaac López Zúñiga on 2012-11-12

[REF][l10n_mx_company_multi_address] renombra la vista a invoice_view_address.xml

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

Conflicto en los textos, migrar a nueva versión

review: Disapprove

Unmerged revisions

185. By Isaac López Zúñiga on 2012-11-12

[REF][l10n_mx_company_multi_address] renombra la vista a invoice_view_address.xml

184. By Isaac López Zúñiga on 2012-07-30

[FIX][l10n_mx_company_multi_address] Readonly removido

183. By Isaac López Zúñiga on 2012-07-30

[IMP][l10n_mx_company_multi_address] address_invoice_company_id cambiado a readonly

182. By Isaac López Zúñiga on 2012-07-30

[REF]l10n_mx_company_multi_address] Add , after to city

181. By Isaac López Zúñiga on 2012-07-30

[IMP][l10n_mx_company_multi_address] Lugar de expedicion correspondiente a la sucursal

180. By Isaac López Zúñiga on 2012-07-30

[REF][l10n_mx_company_multi_address]Cambio a fin de linea LF

179. By Isaac López Zúñiga on 2012-07-28

[IMP][l10n_mx_company_multi_address] Se agrega el regimen fiscal al xml

178. By Isaac López Zúñiga on 2012-07-28

[IMP][l10n_mx_company_multi_address] Se quita el onchange de company

177. By Isaac López Zúñiga on 2012-07-27

[ADD][l10n_mx_company_multi_address] Add address_invoice_company_id to journal

176. By Isaac López Zúñiga on 2012-07-27

[IMP][l10n_mx_company_multi_address] ADD inherit to _get_facturae_invoice_dict_data function

=== 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	2012-11-12 20:01:19 +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	2012-11-12 20:01:19 +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" : ["base", "account","l10n_mx_facturae_22",
+        ],
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : [
+        #'security/ir.model.access.csv',
+        "invoice_view.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	2012-11-12 20:01:19 +0000
@@ -0,0 +1,79 @@
+# -*- 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')]"),
+    }
+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	2012-11-12 20:01:19 +0000
@@ -0,0 +1,18 @@
+<?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>
+            </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	2012-11-12 20:01:19 +0000
@@ -0,0 +1,123 @@
+# -*- 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'
+    
+    _columns = {
+        '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)]"),
+    }
+    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})
+        return result
+        
+account_invoice()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

=== renamed file 'l10n_mx_facturae/invoice_view.xml' => 'l10n_mx_company_multi_address/invoice_view_address.xml'
--- l10n_mx_facturae/invoice_view.xml	2012-05-27 23:16:24 +0000
+++ l10n_mx_company_multi_address/invoice_view_address.xml	2012-11-12 20:01:19 +0000
@@ -1,16 +1,37 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+<<<<<<< TREE
         
         <record model="ir.ui.view" id="account_invoice_form_inh_l10n_mx_facturae_rate">
             <field name="name">account.invoice.form.inh.l10n.mx.facturae.rate</field>
+=======
+        
+        <record model="ir.ui.view" id="account_invoice_form_inh_l10n_mx_facturae_01">
+            <field name="name">account.invoice.form.inh_l10n_mx_facturae_01</field>
+>>>>>>> MERGE-SOURCE
             <field name="model">account.invoice</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
+<<<<<<< TREE
                 <field name="payment_term" position="after">
                     <field name="rate"/>
                 </field>
+=======
+                <xpath expr="/form/notebook/page[@string='Other Info']/field[@name='company_id']" position="after">
+                    <field name="address_invoice_company_id"/>
+                 </xpath>
+                 
+<!--
+                <xpath expr="/form/notebook/page[@string='Other Info']/field[@name='company_id']" position="replace">
+                    <field name="company_id" on_change="onchange_company_address(company_id, journal_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>
+>>>>>>> MERGE-SOURCE
             </field>
         </record>
         

=== 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	2012-11-12 20:01:19 +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	2012-11-12 20:01:19 +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/__init__.py'
--- l10n_mx_facturae/__init__.py	2012-02-24 00:42:55 +0000
+++ l10n_mx_facturae/__init__.py	2012-11-12 20:01:19 +0000
@@ -28,6 +28,7 @@
 import invoice
 import wizard
 import report
+#import res_company
 #import ir_sequence
 #import res_company
 #import partner_address

=== modified file 'l10n_mx_facturae/__openerp__.py'
--- l10n_mx_facturae/__openerp__.py	2012-08-27 23:55:07 +0000
+++ l10n_mx_facturae/__openerp__.py	2012-11-12 20:01:19 +0000
@@ -51,6 +51,7 @@
             "l10n_mx_company_cif",
             "l10n_mx_partner_address",
             "l10n_mx_invoice_amount_to_text",
+            "l10n_mx_company_multi_address",
             "sale",#no depende de "sale" directamente, pero marca error en algunas versiones
         ],
     "init_xml" : [],
@@ -64,7 +65,8 @@
         "wizard/installer_view.xml",
         #"ir_sequence_view.xml",
         #"res_company_view6.xml",
-        "invoice_view.xml",
+        #"invoice_view.xml",
+        #"res_company_view.xml",
         #"partner_address_view.xml",
     ],
     "installable" : True,

=== modified file 'l10n_mx_facturae/__terp__.py'
--- l10n_mx_facturae/__terp__.py	2012-03-17 01:09:58 +0000
+++ l10n_mx_facturae/__terp__.py	2012-11-12 20:01:19 +0000
@@ -50,6 +50,7 @@
             "l10n_mx_facturae_seq",
             "l10n_mx_company_cif",
             "l10n_mx_partner_address",
+            "l10n_mx_company_multi_address",
             "sale",#no depende de "sale" directamente, pero marca error en algunas versiones
         ],
     "init_xml" : [],
@@ -61,7 +62,8 @@
         "l10n_mx_facturae_wizard.xml",
         #"ir_sequence_view.xml",
         #"res_company_view.xml",
-        "invoice_view.xml",
+        #"invoice_view.xml",
+        #"res_company_view.xml",
         #"partner_address_view.xml",
     ],
     "installable" : True,

=== modified file 'l10n_mx_facturae/invoice.py'
--- l10n_mx_facturae/invoice.py	2012-08-01 18:55:55 +0000
+++ l10n_mx_facturae/invoice.py	2012-11-12 20:01:19 +0000
@@ -824,26 +824,26 @@
                 #virtual_invoice.append( (invoice.company_id and invoice.company_id.partner_id and invoice.company_id.partner_id.vat or '').replac
                 
                 'DomicilioFiscal': {
-                    'calle': address_invoice_parent.street and address_invoice_parent.street.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or '',
-                    'noExterior': address_invoice_parent.street3 and address_invoice_parent.street3.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or 'N/A', #"Numero Exterior"
-                    'noInterior': address_invoice_parent.street4 and address_invoice_parent.street4.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or 'N/A', #"Numero Interior"
-                    'colonia':  address_invoice_parent.street2 and address_invoice_parent.street2.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or 'N/A' ,
-                    'localidad': address_invoice_parent.city2 and address_invoice_parent.city2.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or 'N/A',
-                    'municipio': address_invoice_parent.city and address_invoice_parent.city.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or '',
-                    'estado': address_invoice_parent.state_id and address_invoice_parent.state_id.name and address_invoice_parent.state_id.name.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or '' ,
-                    'pais': address_invoice_parent.country_id and address_invoice_parent.country_id.name and address_invoice_parent.country_id.name.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ')or '',
-                    'codigoPostal': address_invoice_parent.zip and address_invoice_parent.zip.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or '',
+                    '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', #"Numero Exterior"
+                    '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', #"Numero Interior"
+                    '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 '',
                 },
                 'ExpedidoEn': {
-                    'calle': address_invoice.street and address_invoice.street.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or '',
-                    'noExterior': address_invoice.street3 and address_invoice.street3.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or 'N/A', #"Numero Exterior"
-                    'noInterior': address_invoice.street4 and address_invoice.street4.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or 'N/A', #"Numero Interior"
-                    'colonia':  address_invoice.street2 and address_invoice.street2.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or 'N/A' ,
-                    'localidad': address_invoice.city2 and address_invoice.city2.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or 'N/A',
-                    'municipio': address_invoice.city and address_invoice.city.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or '',
-                    'estado': address_invoice.state_id and address_invoice.state_id.name and address_invoice.state_id.name.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or '' ,
-                    'pais': address_invoice.country_id and address_invoice.country_id.name and address_invoice.country_id.name.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ')or '',
-                    'codigoPostal': address_invoice.zip and address_invoice.zip.replace('\n\r', ' ').replace('\r\n', ' ').replace('\n', ' ').replace('\r', ' ') or '',
+                    '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', #"Numero Exterior"
+                    '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', #"Numero Interior"
+                    '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 '',
                 },
             })
             #Termina seccion: Emisor

=== modified file 'l10n_mx_facturae/l10n_mx_facturae_report.xml'
--- l10n_mx_facturae/l10n_mx_facturae_report.xml	2012-03-12 02:56:38 +0000
+++ l10n_mx_facturae/l10n_mx_facturae_report.xml	2012-11-12 20:01:19 +0000
@@ -13,5 +13,6 @@
             groups="l10n_mx_facturae.group_facturae_mx_cfd_user"
         />
         
+        
     </data>
 </openerp>

=== 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	2012-11-12 20:01:19 +0000
@@ -44,8 +44,8 @@
             'facturae_data_dict': self._facturae_data_dict,
             #'amount_to_text': self._get_amount_to_text,
             'split_string': self._split_string,
-            'company_address': self._company_address,
-            'subcompany_address': self._subcompany_address,
+            #~ 'company_address': self._company_address,
+            #~ 'subcompany_address': self._subcompany_address,
             'get_invoice_sequence': self._get_invoice_sequence,
             'get_approval': self._get_approval,
             'get_taxes': self._get_taxes,
@@ -192,12 +192,12 @@
         #return [self.company_address_invoice]
         return ""
     
-    def _company_address(self):
-        #print "self.company_address_invoice",self.company_address_invoice
-        return self.company_address_invoice
+    #~ def _company_address(self):
+        #~ #print "self.company_address_invoice",self.company_address_invoice
+        #~ return self.company_address_invoice
     
-    def _subcompany_address(self):
-        return self.subcompany_address_invoice
+    #~ def _subcompany_address(self):
+        #~ return self.subcompany_address_invoice
     
     def _facturae_data_dict(self):
         #print "self.invoice_data_dict",self.invoice_data_dict

=== 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	2012-11-12 20:01:19 +0000
@@ -108,27 +108,26 @@
             <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="P20">
+              <font color="white"> </font>
+            </para>
+            <para style="P17">Calle: [[ o.company_id.address_invoice_parent_company_id.street or '' ]] Nro. Ext: [[ o.company_id.address_invoice_parent_company_id.street3 or '' ]] Int: [[ o.company_id.address_invoice_parent_company_id.street4 or '' ]]</para>
+            <para style="P20">
+              <font color="white"> </font>
+            </para>
+            <para style="P17">Colonia: [[ o.company_id.address_invoice_parent_company_id.street2 or '' ]]</para>
+            <para style="P20">
+              <font color="white"> </font>
+            </para>
+            <para style="P17">Ciudad: [[ o.company_id.address_invoice_parent_company_id.city or '' ]] Estado: [[ o.company_id.address_invoice_parent_company_id.state_id and o.company_id.address_invoice_parent_company_id.state_id.name or '' ]]</para>
             <para style="P21">
               <font color="white"> </font>
             </para>
-            <para style="P17">Localidad: [[ company_address()['city2'] or '' ]]</para>
+            <para style="P17">Localidad: [[ o.company_id.address_invoice_parent_company_id.city2 or '' ]]</para>
             <para style="P20">
               <font color="white"> </font>
             </para>
-            <para style="P17">CP: [[ company_address()['zip'] or '' ]]</para>
+            <para style="P17">CP: [[ o.company_id.address_invoice_parent_company_id.zip or '' ]]</para>
             <para style="P20">
               <font color="white"> </font>
             </para>
@@ -137,9 +136,9 @@
               <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>
+            <para style="P19">[[ o.company_id.address_invoice_parent_company_id.phone or removeParentNode('para') ]]</para>
+            <para style="P19">[[ o.company_id.address_invoice_parent_company_id.fax or removeParentNode('para') ]]</para>
+            <para style="P19">[[ o.company_id.address_invoice_parent_company_id.mobile or removeParentNode('para') ]]</para>
           </td>
           <td>
             <para style="P7">
@@ -152,7 +151,7 @@
             <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="Table Contents">[[ o.company_id.address_invoice_parent_company_id.city or '' ]], [[ o.company_id.address_invoice_parent_company_id.state_id and o.company_id.address_invoice_parent_company_id.state_id.name or '' ]] a</para>
             <para style="P24">[[ 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>
@@ -180,13 +179,13 @@
             <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_invoice_company_id and o.address_invoice_company_id.name and o.address_invoice_company_id.name or '') or (o.company_id.partner_id.name and o.company_id.partner_id.name or '') ]]</para>
+            <para style="P3">Calle: [[ o.address_invoice_company_id.street or '' ]] Nro. Ext: [[ o.address_invoice_company_id.street3 or '' ]] Int: [[ o.address_invoice_company_id.street4 or '' ]]</para>
+            <para style="P3">Colonia: [[ o.address_invoice_company_id.street2 or '' ]]</para>
+            <para style="P3">Ciudad: [[ o.address_invoice_company_id.city or '' ]] </para>
+            <para style="P3">Estado: [[ o.address_invoice_company_id.state_id and o.address_invoice_company_id.state_id.name or '' ]]</para>
+            <para style="P3">Localidad: [[ o.address_invoice_company_id.city2 or '' ]]</para>
+            <para style="P3">CP: [[ o.address_invoice_company_id.zip or '' ]] </para>
           </td>
         </tr>
       </blockTable>

=== renamed file 'l10n_mx_facturae/report/invoice_facturae_pdf.sxw' => 'l10n_mx_facturae/report/invoice_facturae_pdf.sxw.OTHER'
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.OTHER	2012-11-12 20:01:19 +0000 differ
=== modified file 'l10n_mx_facturae_cbb/report/invoice_facturae_pdf.py'
--- l10n_mx_facturae_cbb/report/invoice_facturae_pdf.py	2012-04-06 23:21:07 +0000
+++ l10n_mx_facturae_cbb/report/invoice_facturae_pdf.py	2012-11-12 20:01:19 +0000
@@ -44,8 +44,8 @@
             'facturae_data_dict': self._facturae_data_dict,
             #'amount_to_text': self._get_amount_to_text,
             'split_string': self._split_string,
-            'company_address': self._company_address,
-            'subcompany_address': self._subcompany_address,
+            #~ 'company_address': self._company_address,
+            #~ 'subcompany_address': self._subcompany_address,
             'get_invoice_sequence': self._get_invoice_sequence,
             'get_approval': self._get_approval,
             'get_taxes': self._get_taxes,
@@ -192,12 +192,12 @@
         #return [self.company_address_invoice]
         return ""
     
-    def _company_address(self):
-        #print "self.company_address_invoice",self.company_address_invoice
-        return self.company_address_invoice
+    #~ def _company_address(self):
+        #~ #print "self.company_address_invoice",self.company_address_invoice
+        #~ return self.company_address_invoice
     
-    def _subcompany_address(self):
-        return self.subcompany_address_invoice
+    #~ def _subcompany_address(self):
+        #~ return self.subcompany_address_invoice
     
     def _facturae_data_dict(self):
         #print "self.invoice_data_dict",self.invoice_data_dict

=== modified file 'l10n_mx_facturae_cbb/report/invoice_facturae_pdf.rml'
--- l10n_mx_facturae_cbb/report/invoice_facturae_pdf.rml	2012-04-06 23:21:07 +0000
+++ l10n_mx_facturae_cbb/report/invoice_facturae_pdf.rml	2012-11-12 20:01:19 +0000
@@ -46,35 +46,33 @@
     <paraStyle name="P1" fontName="Helvetica" alignment="RIGHT"/>
     <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10"/>
     <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10"/>
-    <paraStyle name="P4" fontName="Helvetica" textColor="#280099"/>
-    <paraStyle name="P5" fontName="Helvetica" alignment="RIGHT" textColor="#280099"/>
-    <paraStyle name="P6" fontName="Helvetica" textColor="#ff3333"/>
-    <paraStyle name="P7" fontName="Helvetica" fontSize="12.0" leading="15" textColor="#800000"/>
-    <paraStyle name="P8" fontName="Helvetica" fontSize="2.0" leading="3" textColor="#800000"/>
-    <paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8" 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="18.0" leading="22" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
-    <paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
-    <paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" 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" textColor="#000000"/>
-    <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <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"/>
     <paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
-    <paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
+    <paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="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="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"/>
-    <paraStyle name="P23" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P24" fontName="Helvetica" textColor="#280099"/>
-    <paraStyle name="P25" fontName="Helvetica" alignment="RIGHT" textColor="#280099"/>
-    <paraStyle name="P26" fontName="Helvetica" fontSize="8.0" leading="10"/>
-    <paraStyle name="P27" fontName="Helvetica" fontSize="10.0" leading="13"/>
-    <paraStyle name="P28" fontName="Helvetica" alignment="RIGHT"/>
-    <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="#280099"/>
-    <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="P31" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P32" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <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"/>
+    <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="#000000"/>
+    <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="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
+    <paraStyle name="P27" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
+    <paraStyle name="P28" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
+    <paraStyle name="P29" fontName="Helvetica" fontSize="8.0" leading="10"/>
+    <paraStyle name="P30" fontName="Helvetica" textColor="#280099"/>
     <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"/>
@@ -91,59 +89,58 @@
   </stylesheet>
   <story>
     <section>
-      <para style="P10">[[ repeatIn(objects,'o') ]] <font face="Helvetica" size="9.0">[[ set_global_data(o) ]]</font></para>
-      <para style="P13">[[ 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_id.parent_id and o.company_id.parent_id.partner_id.name or o.company_id.partner_id.name ]]</para>
       <blockTable colWidths="125.0,207.0,166.0" style="Tabla1">
         <tr>
           <td>
-            <para style="P17">[[ o.company_id.logo and setTag('para','image',{'width':'120.0','height':'80.0'}) ]] [[ o.company_id.logo ]]</para>
-          </td>
-          <td>
-            <para style="P12">[[ company_address()['name'] or o.company_id.partner_id.name ]]</para>
-            <para style="P15">
-              <font color="white"> </font>
-            </para>
-            <para style="P12">Calle: [[ company_address()['street'] or '' ]] Nro. Ext: [[ company_address()['street3'] or '' ]] Int: [[ company_address()['street4'] or '' ]]</para>
-            <para style="P15">
-              <font color="white"> </font>
-            </para>
-            <para style="P12">Colonia: [[ company_address()['street2'] or '' ]]</para>
-            <para style="P15">
-              <font color="white"> </font>
-            </para>
-            <para style="P12">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="P12">Localidad: [[ company_address()['city2'] or '' ]]</para>
-            <para style="P15">
-              <font color="white"> </font>
-            </para>
-            <para style="P12">CP: [[ company_address()['zip'] or '' ]]</para>
-            <para style="P15">
-              <font color="white"> </font>
-            </para>
-            <para style="P12">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="P15">
-              <font color="white"> </font>
-            </para>
-            <para style="P14">Teléfono(s): </para>
-            <para style="P14">[[ company_address()['phone'] or removeParentNode('para') ]]</para>
-            <para style="P14">[[ company_address()['fax'] or removeParentNode('para') ]]</para>
-            <para style="P14">[[ company_address()['mobile'] or removeParentNode('para') ]]</para>
-          </td>
-          <td>
-            <para style="P6">
+            <para style="P22">[[ o.company_id.logo and setTag('para','image',{'width':'120.0','height':'80.0'}) ]] [[ o.company_id.logo ]]</para>
+          </td>
+          <td>
+            <para style="P19">
+              <font color="white"> </font>
+            </para>
+            <para style="P16">Calle: [[ o.company_id.address_invoice_parent_company_id.street or '' ]] Nro. Ext: [[ o.company_id.address_invoice_parent_company_id.street3 or '' ]] Int: [[ o.company_id.address_invoice_parent_company_id.street4 or '' ]]</para>
+            <para style="P19">
+              <font color="white"> </font>
+            </para>
+            <para style="P16">Colonia: [[ o.company_id.address_invoice_parent_company_id.street2 or '' ]]</para>
+            <para style="P19">
+              <font color="white"> </font>
+            </para>
+            <para style="P16">Ciudad: [[ o.company_id.address_invoice_parent_company_id.city or '' ]] Estado: [[ o.company_id.address_invoice_parent_company_id.state_id and o.company_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_id.address_invoice_parent_company_id.city2 or '' ]]</para>
+            <para style="P19">
+              <font color="white"> </font>
+            </para>
+            <para style="P16">CP: [[ o.company_id.address_invoice_parent_company_id.zip or '' ]]</para>
+            <para style="P19">
+              <font color="white"> </font>
+            </para>
+            <para style="P16">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="P19">
+              <font color="white"> </font>
+            </para>
+            <para style="P18">Teléfono(s): </para>
+            <para style="P18">[[ o.company_id.address_invoice_parent_company_id.phone or removeParentNode('para') ]]</para>
+            <para style="P18">[[ o.company_id.address_invoice_parent_company_id.fax or removeParentNode('para') ]]</para>
+            <para style="P18">[[ o.company_id.address_invoice_parent_company_id.mobile or removeParentNode('para') ]]</para>
+          </td>
+          <td>
+            <para style="P7">
               <font face="Helvetica" size="18.0">Folio: [[ get_approval() and get_approval().serie or '' ]] [[ ( o.type in ['out_invoice', 'out_refund'] ) and ( o.state in ['open', 'paid', 'cancel'] ) and o.number or 'SIN FOLIO O ESTATUS NO VALIDO' ]]</font>
             </para>
-            <para style="P8">
-              <font color="white"> </font>
-            </para>
-            <para style="P7">[[ o.state == 'cancel' and 'FACTURA CANCELADA' ]]</para>
-            <para style="P8">
-              <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.company_id.address_invoice_parent_company_id.city or '' ]], [[ o.company_id.address_invoice_parent_company_id.state_id and o.company_id.address_invoice_parent_company_id.state_id.name or '' ]] a</para>
             <para style="Table Contents">[[ o.date_invoice_tz or '' ]]</para>
           </td>
         </tr>
@@ -151,7 +148,7 @@
       <blockTable colWidths="249.0,249.0" style="Tabla2">
         <tr>
           <td>
-            <para style="P4">Receptor</para>
+            <para style="P5">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>
@@ -159,44 +156,44 @@
             <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="P16">Teléfono(s): </para>
-            <para style="P11">[[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
-            <para style="P11">[[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
-            <para style="P11">[[ 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>
           </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_invoice_company_id and o.address_invoice_company_id.name and o.address_invoice_company_id.name or '') or (o.company_id.partner_id.name and o.company_id.partner_id.name or '') ]]</para>
+            <para style="P3">Calle: [[ o.address_invoice_company_id.street or '' ]] Nro. Ext: [[ o.address_invoice_company_id.street3 or '' ]] Int: [[ o.address_invoice_company_id.street4 or '' ]]</para>
+            <para style="P3">Colonia: [[ o.address_invoice_company_id.street2 or '' ]]</para>
+            <para style="P3">Ciudad: [[ o.address_invoice_company_id.city or '' ]] </para>
+            <para style="P3">Estado: [[ o.address_invoice_company_id.state_id and o.address_invoice_company_id.state_id.name or '' ]]</para>
+            <para style="P3">Localidad: [[ o.address_invoice_company_id.city2 or '' ]]</para>
+            <para style="P3">CP: [[ o.address_invoice_company_id.zip or '' ]] </para>
           </td>
         </tr>
       </blockTable>
       <blockTable colWidths="47.0,38.0,174.0,89.0,67.0,85.0" style="Tabla3">
         <tr>
           <td>
-            <para style="P4">Cantidad</para>
-          </td>
-          <td>
-            <para style="P4">Unidad</para>
-          </td>
-          <td>
-            <para style="P4">Descripción</para>
-          </td>
-          <td>
-            <para style="P4">Clave</para>
-          </td>
-          <td>
-            <para style="P5">P.Unitario</para>
-          </td>
-          <td>
-            <para style="P5">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>
           </td>
         </tr>
         <tr>
@@ -208,7 +205,7 @@
           </td>
           <td>
             <para style="Table Contents">[[ l.name ]]</para>
-            <para style="P27">
+            <para style="P4">
               <font face="Helvetica" size="7.0">Notas:</font>
               <font face="Helvetica" size="7.0">[[l.note or removeParentNode('para')]]</font>
             </para>
@@ -220,22 +217,22 @@
             <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, digits=get_digits(dp='Account'))) or formatLang(l.price_subtotal) ]]</para>
+            <para style="P1">[[ exists_key('global_discount_percent') and (formatLang(l.quantity * l.price_unit)) or formatLang(l.price_subtotal) ]]</para>
           </td>
         </tr>
       </blockTable>
       <blockTable colWidths="427.0,71.0" style="Tabla7">
         <tr>
           <td>
-            <para style="P5">Suma $</para>
+            <para style="P6">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>
+            <para style="P1">[[formatLang( ( exists_key('global_discount_percent') and o.global_discount_amount or 0.0 ) + (o.amount_untaxed or 0.0) )]]</para>
           </td>
         </tr>
         <tr>
           <td>
-            <para style="P5">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>
           </td>
           <td>
             <para style="P1">[[o.global_discount_amount and formatLang( o.global_discount_amount) or '']]</para>
@@ -243,7 +240,7 @@
         </tr>
         <tr>
           <td>
-            <para style="P5">Sub Total $</para>
+            <para style="P6">Sub Total $</para>
           </td>
           <td>
             <para style="P1">[[ formatLang(o.amount_untaxed) ]]</para>
@@ -251,7 +248,7 @@
         </tr>
         <tr>
           <td>
-            <para style="P5">
+            <para style="P6">
               <font face="Helvetica" size="6.0">[[ repeatIn( get_taxes(), 'tax' ) ]]</font>
               <font face="Helvetica">[[ tax['name2'] ]] ([[ round( float( tax['tax_percent'] ) ) ]]%) $</font>
             </para>
@@ -262,7 +259,7 @@
         </tr>
         <tr>
           <td>
-            <para style="P5">
+            <para style="P6">
               <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>
@@ -273,7 +270,7 @@
         </tr>
         <tr>
           <td>
-            <para style="P5">Total $</para>
+            <para style="P6">Total $</para>
           </td>
           <td>
             <para style="P1">[[ formatLang(o.amount_total) ]]</para>
@@ -281,8 +278,8 @@
         </tr>
         <tr>
           <td>
-            <para style="P29">IMPORTE CON LETRA:</para>
-            <para style="P31">[[ o.amount_to_text ]]</para>
+            <para style="P12">IMPORTE CON LETRA:</para>
+            <para style="P11">[[ o.amount_to_text ]]</para>
           </td>
           <td>
             <para style="P1">
@@ -291,8 +288,10 @@
           </td>
         </tr>
       </blockTable>
-      <para style="P9"/>
-      <para style="P9">
+      <para style="P10">
+        <font color="white"> </font>
+      </para>
+      <para style="P10">
         <font color="white"> </font>
       </para>
       <blockTable colWidths="106.0,257.0,135.0" style="Tabla4">
@@ -324,10 +323,8 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_9">
-        <font color="white"> </font>
-      </para>
-      <para style="P32">Vendedor: [[o.user_id.name]]</para>
+      <para style="terp_default_9"/>
+      <para style="P13">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_cbb/report/invoice_facturae_pdf.sxw'
Binary files l10n_mx_facturae_cbb/report/invoice_facturae_pdf.sxw	2012-04-06 23:21:07 +0000 and l10n_mx_facturae_cbb/report/invoice_facturae_pdf.sxw	2012-11-12 20:01:19 +0000 differ
=== 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	2012-11-12 20:01:19 +0000
@@ -44,8 +44,8 @@
             'facturae_data_dict': self._facturae_data_dict,
             #'amount_to_text': self._get_amount_to_text,
             'split_string': self._split_string,
-            'company_address': self._company_address,
-            'subcompany_address': self._subcompany_address,
+            #~ 'company_address': self._company_address,
+            #~ 'subcompany_address': self._subcompany_address,
             'get_invoice_sequence': self._get_invoice_sequence,
             'get_approval': self._get_approval,
             'get_taxes': self._get_taxes,
@@ -189,12 +189,12 @@
         #return [self.company_address_invoice]
         return ""
     
-    def _company_address(self):
-        #print "self.company_address_invoice",self.company_address_invoice
-        return self.company_address_invoice
-    
-    def _subcompany_address(self):
-        return self.subcompany_address_invoice
+    #~ def _company_address(self):
+        #~ #print "self.company_address_invoice",self.company_address_invoice
+        #~ return self.company_address_invoice
+    #~ 
+    #~ def _subcompany_address(self):
+        #~ return self.subcompany_address_invoice
     
     def _facturae_data_dict(self):
         #print "self.invoice_data_dict",self.invoice_data_dict

=== 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	2012-11-12 20:01:19 +0000
@@ -98,6 +98,7 @@
     <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"/>
+<<<<<<< TREE
     <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"/>
@@ -107,6 +108,11 @@
     <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="P22" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
+    <paraStyle name="P23" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P24" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+>>>>>>> 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"/>
@@ -128,41 +134,40 @@
       <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>
+            <para style="P24">[[ o.company_id.logo and setTag('para','image',{'width':'120.0','height':'80.0'}) ]] [[ o.company_id.logo ]]</para>
           </td>
           <td>
-            <para style="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">
+            <para style="P22">
+              <font color="white"> </font>
+            </para>
+            <para style="P20">Calle: [[ o.company_id.address_invoice_parent_company_id.street or '' ]] Nro. Ext: [[ o.company_id.address_invoice_parent_company_id.street3 or '' ]] Int: [[ o.company_id.address_invoice_parent_company_id.street4 or '' ]]</para>
+            <para style="P22">
+              <font color="white"> </font>
+            </para>
+            <para style="P20">Colonia: [[ o.company_id.address_invoice_parent_company_id.street2 or '' ]]</para>
+            <para style="P22">
+              <font color="white"> </font>
+            </para>
+            <para style="P20">Ciudad: [[ o.company_id.address_invoice_parent_company_id.city or '' ]] Estado: [[ o.company_id.address_invoice_parent_company_id.state_id and o.company_id.address_invoice_parent_company_id.state_id.name or '' ]]</para>
+            <para style="P22">
+              <font color="white"> </font>
+            </para>
+            <para style="P20">Localidad: [[ o.company_id.address_invoice_parent_company_id.city2 or '' ]]</para>
+            <para style="P22">
+              <font color="white"> </font>
+            </para>
+            <para style="P20">CP: [[ o.company_id.address_invoice_parent_company_id.zip or '' ]]</para>
+            <para style="P22">
               <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">
+            <para style="P22">
               <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>
+            <para style="P20">Teléfono(s): </para>
+            <para style="P20">[[ o.company_id.address_invoice_parent_company_id.phone or removeParentNode('para') ]]</para>
+            <para style="P20">[[ o.company_id.address_invoice_parent_company_id.fax or removeParentNode('para') ]]</para>
+            <para style="P20">[[ o.company_id.address_invoice_parent_company_id.mobile or removeParentNode('para') ]]</para>
           </td>
           <td>
             <para style="P9">
@@ -175,7 +180,7 @@
             <para style="P11">
               <font color="white"> </font>
             </para>
-            <para style="Table Contents">[[ company_address()['city'] or '' ]], [[ company_address()['state_id'] and company_address()['state_id']['name'] or '' ]] a</para>
+            <para style="Table Contents">[[ o.company_id.address_invoice_parent_company_id.city or '' ]], [[ o.company_id.address_invoice_parent_company_id.state_id and o.company_id.address_invoice_parent_company_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>
@@ -194,7 +199,7 @@
             <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="P23">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>
@@ -203,13 +208,13 @@
             <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_invoice_company_id and o.address_invoice_company_id.name and o.address_invoice_company_id.name or '') or (o.company_id.partner_id.name and o.company_id.partner_id.name or '') ]]</para>
+            <para style="P3">Calle: [[ o.address_invoice_company_id.street or '' ]] Nro. Ext: [[ o.address_invoice_company_id.street3 or '' ]] Int: [[ o.address_invoice_company_id.street4 or '' ]]</para>
+            <para style="P3">Colonia: [[ o.address_invoice_company_id.street2 or '' ]]</para>
+            <para style="P3">Ciudad: [[ o.address_invoice_company_id.city or '' ]] </para>
+            <para style="P3">Estado: [[ o.address_invoice_company_id.state_id and o.address_invoice_company_id.state_id.name or '' ]]</para>
+            <para style="P3">Localidad: [[ o.address_invoice_company_id.city2 or '' ]]</para>
+            <para style="P3">CP: [[ o.address_invoice_company_id.zip or '' ]] </para>
           </td>
         </tr>
       </blockTable>

=== renamed file 'l10n_mx_facturae_pac_sf/report/invoice_facturae_pac_sf_pdf.sxw' => 'l10n_mx_facturae_pac_sf/report/invoice_facturae_pac_sf_pdf.sxw.OTHER'
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.OTHER	2012-11-12 20:01:19 +0000 differ