Merge lp:~lambdasoftware/openerp-spain/6.1 into lp:~openerp-spain-team/openerp-spain/6.1

[lambdasoftware]

Se han añadido los tipos de facturas intracomunitarios e inversión de sujeto pasivo.
Se modifica la funcionalidad del botón recalcular para que haga el recalculo solo sobre las facturas de las pestañas "Facturas emitidas" y "Facturas recibidas" pudiendolas añadir o eliminar manualmente.

¡¡¡revisadlo!!! Nuestro cliente aun no lo ha hecho y se ha hecho el mp por no duplicar trabajo con algún miembro de la comunidad

[Pedro Manuel Baeza (pedro.baeza)]

El proyecto está hospedado ahora en https://github.com/OCA/l10n-spain.

Mueve por favor tu propuesta allí. Esta guía puede ayudarte: https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

Un saludo.

review: Needs Resubmitting

Unmerged revisions

398. By LambdaSoftware Development Team <email address hidden> on 2014-06-30

[ADD] Facturas intracomunitarias e inversion de sujeto pasivo

=== modified file 'l10n_es_aeat_mod340/__openerp__.py' (properties changed: -x to +x)
--- l10n_es_aeat_mod340/__openerp__.py	2014-02-13 11:45:56 +0000
+++ l10n_es_aeat_mod340/__openerp__.py	2014-06-30 10:24:12 +0000
@@ -41,11 +41,11 @@
 Facturas rectificativas.
 Facturas resumen de tiques.
 Permite imprimir el libro de IVA, basado en la misma legislación.
+Facturas intracomunitarias. Operaciones a las que hace referencia el artículo 66 del RIVA.
 
 --- COSAS PENDIENTES (TODO LIST) ----------------------------------------------
 
 Facturas bienes de inversión
-Facturas intracomunitarias. Operaciones a las que hace referencia el artículo 66 del RIVA.
 Asientos contables de resumen de tiques
 Exportación de asientos resumen de facturas
 ''',

=== modified file 'l10n_es_aeat_mod340/mod340.py' (properties changed: -x to +x)
--- l10n_es_aeat_mod340/mod340.py	2014-02-09 16:45:39 +0000
+++ l10n_es_aeat_mod340/mod340.py	2014-06-30 10:24:12 +0000
@@ -45,18 +45,21 @@
         calculate_obj._wkf_calculate_records(cr, uid, ids, context)   
         
         return True
-    
+
+
+    #LBD: FUNCION RECALCULAR TENIENDO EN CUENTA LAS FACTURAS INSERTADAS Y/O ELIMINADAS MANUALMENTE
     def button_recalculate(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
 
-        calculate_obj = self. pool.get('l10n.es.aeat.mod340.calculate_records')
-        calculate_obj._calculate_records(cr, uid, ids, context)
+        calculate_obj = self.pool.get('l10n.es.aeat.mod340.calculate_records')
+        calculate_obj._wkf_recalculate_records(cr, uid, ids, context)
 
         return True
 
+
     def button_export(self, cr, uid, ids, context=None):
-        
+
         if context is None:
             context = {}
 
@@ -65,7 +68,7 @@
         export_obj._export_boe_file(cr, uid, ids, report)
 
         return True
-        
+
     def _name_get(self, cr, uid, ids, field_name, arg, context={}):
         """
         Returns the report name
@@ -74,28 +77,28 @@
         for report in self.browse(cr, uid, ids, context):
             result[report.id] = report.number
         return result
-    
-    def _get_number_records( self, cr, uid,ids, field_name, args,context ):
-        
-        result = {} 
+
+    def _get_number_records(self, cr, uid, ids, field_name, args, context):
+
+        result = {}
         for id in ids:
             result[id] = {}.fromkeys(
-               ['number_records','total_taxable','total_sharetax','total'],
-               0.0)
-    
-        for model in self.browse(cr, uid, ids,context):
+                ['number_records', 'total_taxable', 'total_sharetax', 'total'],
+                0.0)
+
+        for model in self.browse(cr, uid, ids, context):
 
             for issue in model.issued:
-                result[model.id]['number_records'] += len( issue.tax_line_ids )
-                result[model.id]['total_taxable'] +=issue.base_tax
-                result[model.id]['total_sharetax'] +=issue.amount_tax
-                result[model.id]['total'] +=issue.base_tax + issue.amount_tax
+                result[model.id]['number_records'] += len(issue.tax_line_ids)
+                result[model.id]['total_taxable'] += issue.base_tax
+                result[model.id]['total_sharetax'] += issue.amount_tax
+                result[model.id]['total'] += issue.base_tax + issue.amount_tax
 
             for issue in model.received:
-                result[model.id]['number_records'] += len( issue.tax_line_ids )
-                result[model.id]['total_taxable'] +=issue.base_tax
-                result[model.id]['total_sharetax'] +=issue.amount_tax
-                result[model.id]['total'] +=issue.base_tax + issue.amount_tax
+                result[model.id]['number_records'] += len(issue.tax_line_ids)
+                result[model.id]['total_taxable'] += issue.base_tax
+                result[model.id]['total_sharetax'] += issue.amount_tax
+                result[model.id]['total'] += issue.base_tax + issue.amount_tax
 
         return result
 
@@ -103,54 +106,54 @@
     _name = 'l10n.es.aeat.mod340'
     _description = 'Model 340'
     _columns = {
-        'name': fields.function(_name_get, method=True, type="char", 
+        'name': fields.function(_name_get, method=True, type="char",
                                 size="64", string="Name"),
         'contact_phone': fields.char("Phone", size=9),
-        'phone_contact' : fields.char('Phone Contact',size=9),
-        'name_contact' : fields.char('Name And Surname Contact',size=40),
+        'phone_contact': fields.char('Phone Contact', size=9),
+        'name_contact': fields.char('Name And Surname Contact', size=40),
         'period_from': fields.many2one('account.period', 'Start period',
                                        states={'done': [('readonly', True)]}),
         'period_to': fields.many2one('account.period', 'End period',
                                      states={'done': [('readonly', True)]}),
-        'issued': fields.one2many('l10n.es.aeat.mod340.issued','mod340_id',
+        'issued': fields.one2many('l10n.es.aeat.mod340.issued', 'mod340_id',
                                   'Invoices Issued',
                                   states={'done': [('readonly', True)]}),
         'received': fields.one2many('l10n.es.aeat.mod340.received',
-                                    'mod340_id','Invoices Received',
+                                    'mod340_id', 'Invoices Received',
                                     states={'done': [('readonly', True)]}),
         'investment': fields.one2many('l10n.es.aeat.mod340.investment',
-                                      'mod340_id','Property Investment'),
+                                      'mod340_id', 'Property Investment'),
         'intracomunitarias': fields.one2many(
-                             'l10n.es.aeat.mod340.intracomunitarias',
-                             'mod340_id','Operations Intracomunitarias'),
-        
+            'l10n.es.aeat.mod340.intracomunitarias',
+            'mod340_id', 'Operations Intracomunitarias'),
+
         'ean13': fields.char('Electronic Code VAT reverse charge', size=16),
 
-        'total_taxable':  fields.function(_get_number_records, method=True,
-            type='float', string='Total Taxable', multi='recalc',
-            help="""The declaration will include partners with the total 
+        'total_taxable': fields.function(_get_number_records, method=True,
+                                         type='float', string='Total Taxable', multi='recalc',
+                                         help="""The declaration will include partners with the total
                 of operations over this limit"""),
         'total_sharetax': fields.function(_get_number_records, method=True,
-            type='float', string='Total Share Tax', multi='recalc',
-            help="""The declaration will include partners with the total 
+                                          type='float', string='Total Share Tax', multi='recalc',
+                                          help="""The declaration will include partners with the total
                 of operations over this limit"""),
         'number_records': fields.function(_get_number_records, method=True,
-            type='integer', string='Records', multi='recalc',
-            help="""The declaration will include partners with the total 
+                                          type='integer', string='Records', multi='recalc',
+                                          help="""The declaration will include partners with the total
                 of operations over this limit"""),
         'total': fields.function(_get_number_records, method=True,
-            type='float', string="Total", multi='recalc',
-            help="""The declaration will include partners with the total 
+                                 type='float', string="Total", multi='recalc',
+                                 help="""The declaration will include partners with the total
                 of operations over this limit"""),
         'calculation_date': fields.date('Calculation date', readonly=True),
     }
     _defaults = {
-        'number' : lambda *a: '340',
-               }
+        'number': lambda *a: '340',
+    }
 
     def set_done(self, cr, uid, id, *args):
-        self.write(cr,uid,id,{'calculation_date': time.strftime('%Y-%m-%d'),
-                              'state': 'done',})
+        self.write(cr, uid, id, {'calculation_date': time.strftime('%Y-%m-%d'),
+                                 'state': 'done', })
         wf_service = netsvc.LocalService("workflow")
         wf_service.trg_validate(uid, 'l10n.es.aeat.mod340', id, 'done', cr)
         return True
@@ -177,75 +180,94 @@
         self.write(cr, uid, ids, {'state': 'canceled'})
 
         return True
-    
+
+
 l10n_es_aeat_mod340()
 
+
 class l10n_es_aeat_mod340_issued(osv.osv):
     _name = 'l10n.es.aeat.mod340.issued'
     _description = 'Invoices invoice'
-    _columns = {                        
-        'mod340_id': fields.many2one('l10n.es.aeat.mod340','Model 340',
-                                     ondelete="cascade"),
-        'partner_id':fields.many2one('res.partner','Partner',
-                                     ondelete="cascade"),
-        'partner_vat':fields.char('Company CIF/NIF',size=12),
+    _columns = {
+        'mod340_id': fields.many2one('l10n.es.aeat.mod340', 'Model 340',
+                                     ondelete="cascade"),
+        'partner_id': fields.many2one('res.partner', 'Partner',
+                                      ondelete="cascade"),
+        'partner_vat': fields.char('Company CIF/NIF', size=12),
         'representative_vat': fields.char('L.R. VAT number', size=9,
-                                      help="Legal Representative VAT number"),
+                                          help="Legal Representative VAT number"),
         'partner_country_code': fields.char('Country Code', size=2),
-        'invoice_id':fields.many2one('account.invoice','Invoice',
-                                     ondelete="cascade"),
-        'base_tax':fields.float('Base tax bill',digits=(13,2)),
-        'amount_tax':fields.float('Total tax',digits=(13,2)),
-        'total':fields.float('Total',digits=(13,2)),
+        'invoice_id': fields.many2one('account.invoice', 'Invoice',
+                                      ondelete="cascade"),
+        'base_tax': fields.float('Base tax bill', digits=(13, 2)),
+        'amount_tax': fields.float('Total tax', digits=(13, 2)),
+        'total': fields.float('Total', digits=(13, 2)),
         'tax_line_ids': fields.one2many('l10n.es.aeat.mod340.tax_line_issued',
                                         'invoice_record_id', 'Tax lines'),
         'date_invoice': fields.date('Date Invoice', readonly=True),
     }
-    
+
     _order = 'date_invoice asc, invoice_id asc'
+
+
 l10n_es_aeat_mod340_issued()
 
+
 class l10n_es_aeat_mod340_received(osv.osv):
     _name = 'l10n.es.aeat.mod340.received'
     _description = 'Invoices Received'
     _inherit = 'l10n.es.aeat.mod340.issued'
     _columns = {
-        'tax_line_ids':fields.one2many('l10n.es.aeat.mod340.tax_line_received',
-                                       'invoice_record_id', 'Tax lines'),
+        'tax_line_ids': fields.one2many('l10n.es.aeat.mod340.tax_line_received',
+                                        'invoice_record_id', 'Tax lines'),
     }
+
+
 l10n_es_aeat_mod340_received()
 
+
 class l10n_es_aeat_mod340_investment(osv.osv):
     _name = 'l10n.es.aeat.mod340.investment'
     _description = 'Property Investment'
     _inherit = 'l10n.es.aeat.mod340.issued'
+
+
 l10n_es_aeat_mod340_investment()
 
+
 class l10n_es_aeat_mod340_intracomunitarias(osv.osv):
     _name = 'l10n.es.aeat.mod340.intracomunitarias'
     _description = 'Operations Intracomunitarias'
     _inherit = 'l10n.es.aeat.mod340.issued'
+
+
 l10n_es_aeat_mod340_intracomunitarias()
 
+
 class l10n_es_aeat_mod340_tax_line_issued(osv.osv):
     _name = 'l10n.es.aeat.mod340.tax_line_issued'
     _description = 'Mod340 vat lines issued'
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True),
-        'tax_percentage': fields.float('Tax percentage',digits=(0,2)),
-        'tax_amount': fields.float('Tax amount',digits=(13,2)),
-        'base_amount': fields.float('Base tax bill',digits=(13,2)),
+        'tax_percentage': fields.float('Tax percentage', digits=(0, 2)),
+        'tax_amount': fields.float('Tax amount', digits=(13, 2)),
+        'base_amount': fields.float('Base tax bill', digits=(13, 2)),
         'invoice_record_id': fields.many2one('l10n.es.aeat.mod340.issued',
-             'Invoice issued', required=True, ondelete="cascade", select=1),
+                                             'Invoice issued', required=True, ondelete="cascade", select=1),
     }
+
+
 l10n_es_aeat_mod340_tax_line_issued()
 
+
 class l10n_es_aeat_mod340_tax_line_received(osv.osv):
     _name = 'l10n.es.aeat.mod340.tax_line_received'
     _description = 'Mod340 vat lines received'
     _inherit = 'l10n.es.aeat.mod340.tax_line_issued'
     _columns = {
         'invoice_record_id': fields.many2one('l10n.es.aeat.mod340.received',
-             'Invoice received', required=True, ondelete="cascade", select=1),
+                                             'Invoice received', required=True, ondelete="cascade", select=1),
     }
+
+
 l10n_es_aeat_mod340_tax_line_received()

=== modified file 'l10n_es_aeat_mod340/wizard/calculate_mod340_records.py' (properties changed: -x to +x)
--- l10n_es_aeat_mod340/wizard/calculate_mod340_records.py	2014-02-14 18:02:38 +0000
+++ l10n_es_aeat_mod340/wizard/calculate_mod340_records.py	2014-06-30 10:24:12 +0000
@@ -42,6 +42,15 @@
         wf_service.trg_validate(uid, 'l10n.es.aeat.mod340', ids and ids[0],
                                 'calculate', cr)
 
+    def _wkf_recalculate_records(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+
+        self._recalculate_records(cr, uid, ids, context, recalculate=True)
+        wf_service = netsvc.LocalService("workflow")
+        wf_service.trg_validate(uid, 'l10n.es.aeat.mod340', ids and ids[0],
+                                'calculate', cr)
+
         
 
     def _calculate_records(self, cr, uid, ids, context=None, recalculate=True):
@@ -87,15 +96,14 @@
             
             
             #Limpieza de las facturas calculadas anteriormente
-            
             del_ids = invoices340.search(cr, uid, [
-            ('mod340_id', '=', mod340.id)])
+                ('mod340_id', '=', mod340.id)])
 
             if del_ids:
                 invoices340.unlink(cr, uid, del_ids, context=context)
-                
+
             del_ids = invoices340_rec.search(cr, uid, [
-            ('mod340_id', '=', mod340.id)])
+                ('mod340_id', '=', mod340.id)])
 
             if del_ids:
                 invoices340_rec.unlink(cr, uid, del_ids, context=context)
@@ -104,7 +112,7 @@
                 ('state', 'in', ('open', 'paid'))]
             
             invoice_obj=self.pool.get('account.invoice')
-            invoice_ids = invoice_obj.search(cr, uid,domain, context=context)
+            invoice_ids = invoice_obj.search(cr,uid,domain,context=context)
             for invoice in invoice_obj.browse(cr, uid, invoice_ids, context):
                 include = False
                 for tax_line in invoice.tax_line:
@@ -155,12 +163,13 @@
                         if tax_line.base_code_id and tax_line.base:
                             if tax_line.base_code_id.mod340 == True:
                                 tax_percentage = tax_line.amount/tax_line.base
-        
+                                
                                 values = {
                                     'name': tax_line.name,
                                     'tax_percentage': tax_percentage,
-                                    'tax_amount': tax_line.tax_amount,
-                                    'base_amount': tax_line.base_amount,
+                                    'tax_amount': tax_line.amount,#tax_line.tax_amount,
+                                    'base_amount': tax_line.base, #tax_line.base_amount,
+                                    'base_amount': tax_line.base, #tax_line.base_amount,
                                     'invoice_record_id': invoice_created,
                                 }
                                 if invoice.type=="out_invoice" or invoice.type=="out_refund":
@@ -169,7 +178,7 @@
                                 if invoice.type=="in_invoice" or invoice.type=="in_refund":
                                     received_obj=self.pool.get('l10n.es.aeat.mod340.tax_line_received')
                                     received_obj.create(cr, uid, values)
-                                tot_tax_invoice += tax_line.tax_amount
+                                tot_tax_invoice += tax_line.amount #tax_line.tax_amount
                                 tot_rec += 1
                                 check_tax += tax_line.tax_amount
                                 if tax_percentage >= 0:
@@ -211,6 +220,173 @@
         
         return True
 
+    #LBD: INSERTO FUNCION PARA RECALCULAR TENIENDO EN CUENTA LAS FACTURAS INSERTADAS Y/O ELIMINADAS MANUALMENTE
+    def _recalculate_records(self, cr, uid, ids, context=None, recalculate=True):
+        if context is None:
+            context = {}
+
+        try:
+            report_obj = self.pool.get('l10n.es.aeat.mod340')
+            mod340 = report_obj.browse(cr, uid, ids)[0]
+
+            invoices340 = self.pool.get('l10n.es.aeat.mod340.issued')
+            invoices340_rec = self.pool.get('l10n.es.aeat.mod340.received')
+            period_obj = self.pool.get('account.period')
+
+            mod340.write({
+                'state' : 'calculated',
+                'calculation_date' : time.strftime('%Y-%m-%d %H:%M:%S')
+            })
+
+            if not mod340.company_id.partner_id.vat:
+                raise osv.except_osv(mod340.company_id.partner_id.name,
+                                     _('This company dont have NIF'))
+
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_validate(uid, 'l10n.es.aeat.mod347.report',
+                                    ids and ids[0], 'calculate', cr)
+
+            code = '340'+mod340.fiscalyear_id.code+''
+            code += mod340.period_to.date_stop[5:7]+'0001'
+
+            account_period_ids = period_obj.build_ctx_periods(cr, uid,
+                                  mod340.period_from.id, mod340.period_to.id)
+
+            if len(account_period_ids) == 0:
+                raise osv.except_osv(_('Error'),
+                   _("The periods selected don't belong to the fiscal year %s")
+                   % (mod340.fiscalyear_id.name))
+
+            tot_base = 0
+            tot_amount = 0
+            tot_tot = 0
+            tot_rec = 0
+
+
+            #Limpieza de las facturas calculadas anteriormente
+
+            invoices_ids = invoices340.search(cr, uid, [
+                ('mod340_id', '=', mod340.id)])
+
+            #if del_ids:
+            #    invoices340.unlink(cr, uid, del_ids, context=context)
+
+            invoices_rec_ids = invoices340_rec.search(cr, uid, [
+                ('mod340_id', '=', mod340.id)])
+
+            #if del_ids:
+            #    invoices340_rec.unlink(cr, uid, del_ids, context=context)
+
+            #domain = [('period_id', 'in',account_period_ids),
+            #    ('state', 'in', ('open', 'paid'))]
+
+            invoice_obj=self.pool.get('account.invoice')
+            #invoice_ids = invoice_obj.search(cr, uid,domain, context=context)
+
+            for invoice in invoice_obj.browse(cr, uid, invoices_ids, context):
+                include = False
+                for tax_line in invoice.tax_line:
+                    if tax_line.base_code_id and tax_line.base:
+                        if tax_line.base_code_id.mod340 == True:
+                            include = True
+                if include == True:
+                    if invoice.partner_id.vat_type == 1:
+                        if not invoice.partner_id.vat:
+                            raise osv.except_osv(
+                              _('La siguiente empresa no tiene asignado nif:'),
+                              invoice.partner_id.name)
+
+                    nif = invoice.partner_id.vat and re.match(r"([A-Z]{0,2})(.*)",
+                                          invoice.partner_id.vat).groups()[1]
+                    country_code = invoice.address_invoice_id.country_id.code
+                    
+                    values = {
+                        'mod340_id': mod340.id,
+                        'partner_id':invoice.partner_id.id,
+                        'partner_vat':nif,
+                        'representative_vat': '',
+                        'partner_country_code' : country_code,
+                        'invoice_id':invoice.id,
+                        'base_tax':invoice.amount_untaxed,
+                        'amount_tax':invoice.amount_tax,
+                        'total':invoice.amount_total,
+                        'date_invoice':invoice.date_invoice,
+                    }
+                    if invoice.type in ( 'out_refund','in_refund'):
+                        values['base_tax'] *=-1
+                        values['amount_tax'] *=-1
+                        values['total'] *=-1
+
+
+                    if invoice.type=="out_invoice" or invoice.type=="out_refund":
+                        invoice_created = invoices340.create(cr,uid,values)
+
+                    if invoice.type=="in_invoice" or invoice.type=="in_refund":
+                        invoice_created = invoices340_rec.create(cr,uid,values)
+
+                    tot_tax_invoice = 0
+                    check_tax=0
+                    check_base=0
+
+                    # Add the invoices detail to the partner record
+                    for tax_line in invoice.tax_line:
+                        if tax_line.base_code_id and tax_line.base:
+                            if tax_line.base_code_id.mod340 == True:
+                                tax_percentage = tax_line.amount/tax_line.base
+
+                                values = {
+                                    'name': tax_line.name,
+                                    'tax_percentage': tax_percentage,
+                                    'tax_amount': tax_line.amount,#tax_line.tax_amount,
+                                    'base_amount': tax_line.base, #tax_line.base_amount,
+                                    'invoice_record_id': invoice_created,
+                                }
+                                if invoice.type=="out_invoice" or invoice.type=="out_refund":
+                                    issued_obj = self.pool.get('l10n.es.aeat.mod340.tax_line_issued')
+                                    issued_obj.create(cr, uid, values)
+                                if invoice.type=="in_invoice" or invoice.type=="in_refund":
+                                    received_obj=self.pool.get('l10n.es.aeat.mod340.tax_line_received')
+                                    received_obj.create(cr, uid, values)
+                                tot_tax_invoice += tax_line.amount #tax_line.tax_amount
+                                tot_rec += 1
+                                check_tax += tax_line.tax_amount
+                                if tax_percentage >= 0:
+                                    check_base += tax_line.base_amount
+
+                    tot_base += invoice.amount_untaxed
+                    tot_amount += tot_tax_invoice
+                    tot_tot += invoice.amount_untaxed + tot_tax_invoice
+
+                    if invoice.type=="out_invoice" or invoice.type=="out_refund":
+                        invoices340.write(cr,uid,invoice_created,
+                                          {'amount_tax':tot_tax_invoice})
+                    if invoice.type=="in_invoice" or invoice.type=="in_refund":
+                        invoices340_rec.write(cr,uid,invoice_created,
+                                              {'amount_tax':tot_tax_invoice})
+
+                    sign=1
+                    if  invoice.type in ( 'out_refund','in_refund' ):
+                        sign = -1
+
+                    if str(invoice.amount_untaxed*sign) != str(check_base):
+                        raise osv.except_osv( "REVIEW INVOICE",
+                          _('Invoice  %s, Amount untaxed Lines %.2f do not correspond to AmountUntaxed on Invoice %.2f' )
+                          %(invoice.number, check_base,  invoice.amount_untaxed*sign)  )
+
+            mod340.write({'total_taxable':tot_base,'total_sharetax':tot_amount,
+                      'number_records':tot_rec,'total':tot_tot,'number':code})
+
+            if recalculate:
+                mod340.write({
+                    'state' : 'calculated',
+                    'calculation_date' : time.strftime('%Y-%m-%d %H:%M:%S')
+                })
+
+        except Exception, ex:
+            raise
+
+        return True
+
 
     def calculation_threading(self, cr, uid, ids, context=None):
         if context is None:

=== modified file 'l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py'
--- l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py	2014-02-14 18:02:38 +0000
+++ l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py	2014-06-30 10:24:12 +0000
@@ -82,11 +82,15 @@
         # Número identificativo de la declaración        
         text += self._formatNumber(report.number, 13)
         # Declaración complementaria
-        if (report.type == 'C'): text += 'C'                       
-        else: text += ' '
+        if (report.type == 'C'):
+            text += 'C'
+        else:
+            text += ' '
         # Declaración substitutiva
-        if (report.type == 'S'): text += 'S'
-        else: text += ' '
+        if (report.type == 'S'):
+            text += 'S'
+        else:
+            text += ' '
         # Número identificativo de la declaración anterior
         text += self._formatNumber(report.previous_number, 13)
         period_stop = report.period_to.date_stop[5:7]
@@ -103,14 +107,14 @@
             elif period_stop == '12':
                 period = '4T'
             else:
-                raise osv.except_osv( "ERROR",
-                              _("The period hasn't a valid Mod340 period" ))
+                raise osv.except_osv("ERROR",
+                                     _("The period hasn't a valid Mod340 period"))
         # Periodo
-        text += self._formatString(period,2)
+        text += self._formatString(period, 2)
         # Número total de registros 
         text += self._formatNumber(report.number_records, 9)
         # Importe total de la base imponible     
-        text += self._formatNumber(report.total_taxable, 15, 2,True)
+        text += self._formatNumber(report.total_taxable, 15, 2, True)
         # Importe Total de la cuota del impuesto
         text += self._formatNumber(report.total_sharetax, 15, 2,True)
         # Importe total de las facturas
@@ -215,18 +219,38 @@
             # Clave tipo de libro. Constante 'E'.                                           
             text += 'E'                                                         
             # Clave de operación
-            if invoice_issued.invoice_id.origin_invoices_ids:               
-                text +='D'
-            elif len(invoice_issued.tax_line_ids) > 1: text += 'C'
-            elif invoice_issued.invoice_id.is_ticket_summary == 1: text += 'B'
-            else: text += ' '
-            
-            text += self._formatNumber(invoice_issued.invoice_id.date_invoice.split('-')[0],4)
-            text += self._formatNumber(invoice_issued.invoice_id.date_invoice.split('-')[1],2)
-            text += self._formatNumber(invoice_issued.invoice_id.date_invoice.split('-')[2],2)    
-            text += self._formatNumber(invoice_issued.invoice_id.date_invoice.split('-')[0],4)
-            text += self._formatNumber(invoice_issued.invoice_id.date_invoice.split('-')[1],2)
-            text += self._formatNumber(invoice_issued.invoice_id.date_invoice.split('-')[2],2)    
+
+            tipo_operacion = False
+            if invoice_issued.tax_line_ids[0].name.find('sujeto pasivo') != -1 and not tipo_operacion:
+                text += 'I'
+                tipo_operacion = True
+            elif invoice_issued.tax_line_ids[0].name.find('Intracomunitario') != -1 and not tipo_operacion:
+                text += 'P'
+                tipo_operacion = True
+
+            elif invoice_issued.invoice_id.origin_invoices_ids and not tipo_operacion:
+                text += 'D'
+                tipo_operacion = True
+            elif len(invoice_issued.tax_line_ids) > 1 and not tipo_operacion:
+                text += 'C'
+                tipo_operacion = True
+            elif invoice_issued.invoice_id.is_ticket_summary == 1 and not tipo_operacion:
+                text += 'B'
+                tipo_operacion = True
+            elif not tipo_operacion:
+                text += ' '
+            # if invoice_issued.invoice_id.origin_invoices_ids:
+            #     text +='D'
+            # elif len(invoice_issued.tax_line_ids) > 1: text += 'C'
+            # elif invoice_issued.invoice_id.is_ticket_summary == 1: text += 'B'
+            # else: text += ' '
+
+            text += self._formatNumber(invoice_issued.invoice_id.date_invoice.split('-')[0], 4)
+            text += self._formatNumber(invoice_issued.invoice_id.date_invoice.split('-')[1], 2)
+            text += self._formatNumber(invoice_issued.invoice_id.date_invoice.split('-')[2], 2)
+            text += self._formatNumber(invoice_issued.invoice_id.date_invoice.split('-')[0], 4)
+            text += self._formatNumber(invoice_issued.invoice_id.date_invoice.split('-')[1], 2)
+            text += self._formatNumber(invoice_issued.invoice_id.date_invoice.split('-')[2], 2)
             #Tipo impositivo
             text += self._formatNumber(tax_line.tax_percentage*100,3,2)
             # Base imponible
@@ -334,25 +358,49 @@
             if invoice_received.partner_country_code != 'ES':                     # Número de identificación fiscal en el país de residencia.
                 text += self._formatString(invoice_received.partner_country_code, 2)
                 text += self._formatString(invoice_received.partner_vat, 15)
-            else: text += 17*' '
-            text += 3*' '                                                     # Blancos
-            text += 'R'                                                         # Clave tipo de libro. Constante 'E'.
-            
-            if len(invoice_received.tax_line_ids) > 1: text += 'C'              # Clave de operación
-            else: text += ' '
-            
-            text += self._formatNumber(invoice_received.invoice_id.date_invoice.split('-')[0],4)
-            text += self._formatNumber(invoice_received.invoice_id.date_invoice.split('-')[1],2)
-            text += self._formatNumber(invoice_received.invoice_id.date_invoice.split('-')[2],2)    # Fecha de expedición
-            text += self._formatNumber(invoice_received.invoice_id.date_invoice.split('-')[0],4)
-            text += self._formatNumber(invoice_received.invoice_id.date_invoice.split('-')[1],2)
-            text += self._formatNumber(invoice_received.invoice_id.date_invoice.split('-')[2],2)    # Fecha de operación
-            
-            text += self._formatNumber(tax_line.tax_percentage*100,3,2)                        #Tipo impositivo
-            text += self._formatNumber(tax_line.base_amount, 11,2,True)         # Base imponible
-            text += self._formatNumber(tax_line.tax_amount, 11,2,True)         # Cuota del impuesto
-            text += self._formatNumber(tax_line.tax_amount+tax_line.base_amount, 11,2,True)         # Importe total de la factura
-            text += ' '+self._formatNumber(0, 11,2)                             # Base imponible a coste.
+            else:
+                text += 17 * ' '
+            text += 3 * ' '  # Blancos
+            text += 'R'  # Clave tipo de libro. Constante 'R'.
+
+            tipo_operacionR = False
+
+            # Clave de operación
+            print invoice_received.tax_line_ids[0].name
+            if invoice_received.tax_line_ids[0].name.find('sujeto pasivo') != -1 and not tipo_operacionR:
+                text += 'I'
+                tipo_operacionR = True
+            elif invoice_received.tax_line_ids[0].name.find('Intracomunitario') != -1 and not tipo_operacionR:
+                text += 'P'
+                tipo_operacionR = True
+            elif not tipo_operacionR and len(invoice_received.tax_line_ids) > 1:
+                text += 'C'
+            elif not tipo_operacionR:
+                text += ' '
+
+            # for tax in invoice_received.tax_line_ids:
+            #  if tax.name.find('sujeto pasivo') != -1 and not tipo_operacionR:
+            #      text += 'I'
+            #      tipo_operacionR = True
+            #  elif tax.name.find('Intracomunitario') != -1 and not tipo_operacionR:
+            #       text += 'P'
+            #       tipo_operacionR = True
+
+
+
+            text += self._formatNumber(invoice_received.invoice_id.date_invoice.split('-')[0], 4)
+            text += self._formatNumber(invoice_received.invoice_id.date_invoice.split('-')[1], 2)
+            text += self._formatNumber(invoice_received.invoice_id.date_invoice.split('-')[2], 2)  # Fecha de expedición
+            text += self._formatNumber(invoice_received.invoice_id.date_invoice.split('-')[0], 4)
+            text += self._formatNumber(invoice_received.invoice_id.date_invoice.split('-')[1], 2)
+            text += self._formatNumber(invoice_received.invoice_id.date_invoice.split('-')[2], 2)  # Fecha de operación
+
+            text += self._formatNumber(tax_line.tax_percentage * 100, 3, 2)  #Tipo impositivo
+            text += self._formatNumber(tax_line.base_amount, 11, 2, True)  # Base imponible
+            text += self._formatNumber(tax_line.tax_amount, 11, 2, True)  # Cuota del impuesto
+            text += self._formatNumber(tax_line.tax_amount + tax_line.base_amount, 11, 2,
+                                       True)  # Importe total de la factura
+            text += ' ' + self._formatNumber(0, 11, 2)  # Base imponible a coste.
             text += self._formatString(invoice_received.invoice_id.reference, 40)  # Identificación de la factura
             text += self._formatString(self.pool.get('ir.sequence').get(cr, uid, 'mod340'),18)  # Número de registro
             text += self._formatNumber(1, 18) # Número de facturas
@@ -427,4 +475,5 @@
         
         return True
 
+
 l10n_es_aeat_mod340_export_to_boe()