Cambios en los campos de address_issued_id y company_emitter_id

Se elimino el campo company_emitter_id pues se considera que no se utiliza en gran parte
Se puso el campo de address_issued_id para que fuera modificable y el valor por default sea la compañia del usuario
como se eliminó el campo de company emitter se tuvieron que modificar los archivos donde se encontraba el campo

Conflicts:
	l10n_mx_facturae/invoice.py
	l10n_mx_facturae_pac_facturalo/report/account_print_invoice.mako

l10n_mx_company_multi_address/invoice.py

@@ -23,73 +23,26 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp.osv import fields, osv
-from openerp.tools.translate import _
-from openerp import pooler, tools
+from openerp.osv import fields, orm
 
 
-class account_invoice(osv.Model):
+class account_invoice(orm.Model):
     _inherit = 'account.invoice'
 
-    def _get_address_issued_invoice(self, cr, uid, ids, name, args, context=None):
-        if context is None:
-            context = {}
-        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
+    _columns = {
+        'address_issued_id': fields.many2one(
+            'res.partner', 'Address Issued Invoice',
+            help='This address will be used as address that issued '
+            'for electronic invoice'
+        ),
+    }
 
-    def _get_company_emitter_invoice(self, cr, uid, ids, name, args, context=None):
-        if context is None:
-            context = {}
-        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
+    def _get_address_issued_invoice(self, cr, uid, context=None):
+        res = self.pool.get('res.company')._company_default_get(
+            cr, uid, 'account.invoice', context=context
+        )
         return res
 
-    _columns = {
-        'address_issued_id': fields.function(_get_address_issued_invoice,
-            type="many2one", relation='res.partner', string='Address Issued \
-            Invoice', help='This address will be used as address that issued \
-            for electronic invoice'),
-        'company_emitter_id': fields.function(_get_company_emitter_invoice,
-            type="many2one", relation='res.company', string='Company Emitter \
-            Invoice', help='This company will be used as emitter company in \
-            the electronic invoice')
+    _defaults = {
+        'address_issued_id': _get_address_issued_invoice
     }
-
-    def onchange_journal_id(self, cr, uid, ids, journal_id=False, context=None):
-        if context is None:
-            context = {}
-        result = super(account_invoice, self).onchange_journal_id(
-            cr, uid, ids, journal_id, context=context)
-        address_id = journal_id and self.pool.get('account.journal').browse(
-            cr, uid, journal_id, context=context) 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

l10n_mx_company_multi_address/invoice_view_address.xml

@@ -9,7 +9,6 @@
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='origin']" position="before">
                     <field name="address_issued_id"/>
-                    <field name="company_emitter_id"/>
                 </xpath>
                 <xpath expr="//field[@name='journal_id']" position="replace">
                     <field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id, context)" widget="selection"/>

l10n_mx_facturae/invoice.py

@@ -189,10 +189,10 @@ class account_invoice(osv.Model):
                 sequence = sequence_obj.browse(
                     cr, uid, [sequence_id], context)[0]
             fname = ""
-            fname += (invoice.company_emitter_id.partner_id and (
-                'vat_split' in invoice.company_emitter_id.partner_id._columns \
-                and invoice.company_emitter_id.partner_id.vat_split or \
-                invoice.company_emitter_id.partner_id.vat) or '')
+            fname += (invoice.company_id.partner_id and (
+                'vat_split' in invoice.company_id.partner_id._columns \
+                and invoice.company_id.partner_id.vat_split or \
+                invoice.company_id.partner_id.vat) or '')
             fname += '_'
             number_work = invoice.number or invoice.internal_number
             try:
@@ -466,8 +466,8 @@ class account_invoice(osv.Model):
             # 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_emitter_id.id],
-                context=context)[invoice.company_emitter_id.id]
+                cr, uid, [invoice.company_id.id],
+                context=context)[invoice.company_id.id]
             certificate_id = certificate_id and self.pool.get(
                 'res.company.facturae.certificate').browse(
                 cr, uid, [certificate_id], context=context)[0] or False
@@ -987,8 +987,8 @@ class account_invoice(osv.Model):
             # Inicia seccion: Emisor
             partner_obj = self.pool.get('res.partner')
             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
+            address_invoice_parent = invoice.company_id and \
+            invoice.company_id.address_invoice_parent_company_id or False
 
             if not address_invoice:
                 raise osv.except_osv(_('Warning !'), _(
@@ -1287,12 +1287,12 @@ class account_invoice(osv.Model):
                   'voucher is complete (City - State - Country)')
             )
 
-        if not invoice.company_emitter_id.partner_id.regimen_fiscal_id.name:
-            raise osv.except_osv(
-                _('Missing Fiscal Regime!'),
-                _('The Fiscal Regime of the company issuing of fiscal '
-                  'voucher is a data required')
-            )
+            if not invoice.company_id.partner_id.regimen_fiscal_id.name:
+                raise osv.except_osv(
+                    _('Missing Fiscal Regime!'),
+                    _('The Fiscal Regime of the company issuing of fiscal '
+                      'voucher is a data required')
+                )
 
         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'
@@ -1310,7 +1310,7 @@ class account_invoice(osv.Model):
             p_type = 'No identificado'
         invoice_data_parents[0]['Comprobante']['metodoDePago'] = p_type
         invoice_data_parents[0]['Comprobante']['Emisor']['RegimenFiscal'] = {
-            'Regimen': invoice.company_emitter_id.partner_id.\
+            'Regimen': invoice.company_id.partner_id.\
                 regimen_fiscal_id.name or ''}
         invoice_data_parents[0]['Comprobante']['LugarExpedicion'] = address
         return invoice_data_parents

l10n_mx_facturae/report/account_print_invoice.mako

@@ -14,7 +14,7 @@
                             <div class="act_as_cell" style="width:20%;">
                                 <div style="position: relative;">
                                     <div style="position: absolute; top: 10px; bottom: 0px;">
-                                        ${helper.embed_image('jpeg',str(o.company_emitter_id.logo),130)}                         
+                                        ${helper.embed_image('jpeg',str(o.company_id.logo),130)}                         
                                     </div>                               
                                 </div>
                             </div>
@@ -22,12 +22,12 @@
                                 <div class="act_as_table">
                                     <div class="act_as_row" style="text-align:left; font-weight:bold;">
                                         <div class="act_as_cell" style="padding-top:0px; font-size:15px;">
-                                            ${get_emitter_data(o.company_emitter_id.address_invoice_parent_company_id, 'name')}
+                                            ${get_emitter_data(o.company_id.address_invoice_parent_company_id, 'name')}
                                         </div>
                                     </div>
                                     <div class="act_as_row" style="text-align:left;">
                                         <div class="act_as_cell" style="padding-top:0px; padding-bottom:8px;">
-                                            ${get_emitter_data(o.company_emitter_id.address_invoice_parent_company_id, 'vat')}
+                                            ${get_emitter_data(o.company_id.address_invoice_parent_company_id, 'vat')}
                                         </div>
                                     </div>
                                     <div class="act_as_row" style="text-align:left;">
@@ -37,32 +37,32 @@
                                     </div>
                                     <div class="act_as_row" style="text-align:left;">
                                         <div class="act_as_cell" style="padding:0px;">
-                                            ${get_emitter_data(o.company_emitter_id.address_invoice_parent_company_id, 'street')} Nro. Ext: ${get_emitter_data(o.company_emitter_id.partner_id, 'no_ext')} Int: ${get_emitter_data(o.company_emitter_id.address_invoice_parent_company_id, 'no_int')} 
+                                            ${get_emitter_data(o.company_id.address_invoice_parent_company_id, 'street')} Nro. Ext: ${get_emitter_data(o.company_id.partner_id, 'no_ext')} Int: ${get_emitter_data(o.company_id.address_invoice_parent_company_id, 'no_int')} 
                                         </div>
                                     </div>
                                     <div class="act_as_row" style="text-align:left;">
                                         <div class="act_as_cell" style="padding:0px;">
                                             ${_("City")}: 
-                                            ${get_emitter_data(o.company_emitter_id.address_invoice_parent_company_id, 'city')} 
-                                            ${_("State")}: ${get_emitter_data(o.company_emitter_id.partner_id, 'state')}
+                                            ${get_emitter_data(o.company_id.address_invoice_parent_company_id, 'city')} 
+                                            ${_("State")}: ${get_emitter_data(o.company_id.partner_id, 'state')}
                                        </div>
                                     </div>
                                     <div class="act_as_row" style="text-align:left;">
                                         <div class="act_as_cell" style="padding:0px;">
                                             ${_("Location")}: 
-                                            ${get_emitter_data(o.company_emitter_id.address_invoice_parent_company_id, 'county') or 'N/A'}
+                                            ${get_emitter_data(o.company_id.address_invoice_parent_company_id, 'county') or 'N/A'}
                                        </div>
                                     </div>
                                     <div class="act_as_row" style="text-align:left;">
                                         <div class="act_as_cell" style="padding:0px;">
                                             ${_("ZIP")}: 
-                                            ${get_emitter_data(o.company_emitter_id.address_invoice_parent_company_id, 'zip')}
+                                            ${get_emitter_data(o.company_id.address_invoice_parent_company_id, 'zip')}
                                        </div>
                                     </div>                    
                                     <div class="act_as_row" style="text-align:left;">
                                         <div class="act_as_cell" style="padding:0px;">
                                             ${_("PHONE")}(s): 
-                                            ${o.company_emitter_id.address_invoice_parent_company_id.phone or 'N/A'}  
+                                            ${o.company_id.address_invoice_parent_company_id.phone or 'N/A'}  
                                        </div>
                                     </div>
                                 </div>
@@ -194,7 +194,7 @@
                                                 <b> ${_("Taxation")}:  </b>
                                             </div>
                                             <div class="act_as_cell">
-                                                ${o.company_emitter_id.partner_id.regimen_fiscal_id and o.company_emitter_id.partner_id.regimen_fiscal_id.name or 'No identificado'}
+                                                ${o.company_id.partner_id.regimen_fiscal_id and o.company_id.partner_id.regimen_fiscal_id.name or 'No identificado'}
                                             </div>
                                         </div>
                                         <div class="act_as_row">

l10n_mx_facturae_cer/invoice.py

@@ -42,9 +42,9 @@ class account_invoice(osv.Model):
         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_emitter_id.id], context=context)[
-                invoice.company_emitter_id.id]
+            certificate_id = company_obj._get_current_certificate(
+                cr, uid, [invoice.company_id.id], context=context
+                )[invoice.company_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

l10n_mx_facturae_pac_facturalo/ir_attachment_facturae.py

@@ -87,7 +87,7 @@ class ir_attachment_facturae_mx(osv.Model):
             pac_ids = pac_params_obj.search(
                 cr, uid,
                 [('method_type', '=', 'pac_facturalo_firmar'),
-                 ('company_id', '=', invoice.company_emitter_id.id),
+                 ('company_id', '=', invoice.company_id.id),
                  ('active', '=', True)
                  ],
                 limit=1, context=context
@@ -220,7 +220,7 @@ class ir_attachment_facturae_mx(osv.Model):
             pac_ids = pac_params_obj.search(
                 cr, uid,
                 [('method_type', '=', 'pac_facturalo_cancelar'),
-                 ('company_id', '=', invoice.company_emitter_id.id),
+                 ('company_id', '=', invoice.company_id.id),
                  ('active', '=', True)
                  ], limit=1, context=context
             )