Merge lp:~asertigs/openerp-spain/7.0-l10n_es_aeat_mod340-binversion into lp:~openerp-spain-team/openerp-spain/7.0

[PabloCM]

Soporte para bienes de inversión, IVA agrario, arreglo de bugs y adaptación a v7

Más info: https://groups.google.com/d/msg/openerp-spain/FsDXI4YOaZw/DNx8ZqXEW58J

[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

De todas formas, tal como hemos hablado en la lista, la propuesta requiere reelaboración que pasaremos a tratar en el code sprint.

Un saludo.

Unmerged revisions

462. By Pablo <pablo@pablo-pc> on 2014-05-30

[IMP] Para determinar las claves de una factura se tiene ahora en cuenta primero la línea de mayor importe
[FIX] Los registros de IVA se crean ahora con clave B si la factura tiene marcado el check de resumen de tickets
[IMP] Mejorado el mensaje de error cuando no se puede determinar el tipo de una línea de impuesto

461. By Pablo <pablo@pablo-pc> on 2014-05-15

[FIX] Eliminado código basura que faltó por quitar en la anterior revisión al eliminar la clave amount_tax
[FIX] Problema con los signos de las bases surgido al soportar moneda distinta a la de la compañía
[MOD] Se permite un descuadre de 1 céntimo al comprobar las bases de los impuestos contra el subtotal de la factura

460. By Pablo <pablo@pablo-pc> on 2014-04-15

[ADD] Añadida opción tiques / factura simplificada a las claves operacionales
[FIX] Arreglada comparación de las bases cuando las bases sumaban 0 (-0.0 != 0.0 en string)
[FIX] Ahora se tiene en cuenta que la moneda de la factura pueda ser distinta de la de la empresa

459. By Pablo <pablo@pablo-pc> on 2014-04-01

[ADD] chart_update para cargar las claves de libro y operación
[ADD] Traducción

458. By Pablo <pablo@pablo-pc> on 2014-03-31

[FIX] Problema en el cálculo de totales cuando no hay ningún registro en el modelo
[FIX] Descuadre en las cuotas debido al recuento doble de las cuotas en compras intracomunitarias
[FIX] Arreglado descuadre en el total de las bases por la separación en líneas de impuesto distintas de un mismo impuesto sobre bases de distinto signo que hace OpenERP

457. By Pablo <pablo@pablo-pc> on 2014-03-28

[FIX] Eliminada opción obsoleta "select" de las vistas
[FIX] Duplicidad en la fecha de cálculo en la vista
[FIX] Eliminada redeclaración de la fecha de cálculo que la convertía en date (en lugar de datetime)
[FIX] Corregido el cálculo de los sumatorios de registros y totales (campos funcionales) y eliminados los sumatorios manuales que se hacían en el calculate, que eran código basura
[FIX] Eliminado código obsoleto en vistas

456. By Pablo <pablo@pablo-pc> on 2014-03-25

[ADD] Añadidos campos de clave operacional y clave de libro a los registros de factura (emitida, recibida, bienes, intra) e impuestos que determinan la clasificación de los registros de IVA.
[MOD] El campo mod340 en los códigos de impuesto ha pasado a ser funcional almacenado, dependiendo de la clave de libro de los impuestos. Si algún impuesto que use un código para su base tiene asignada una clave de libro, el código se considera que debe ser incluido en el 340
[FIX] Ahora los impuestos que se desdoblan por tener impuestos hijo (ej: compras intracomunitarias) sólo generan un registro
[FIX] Cuando una factura es rectificativa y con varios impuestos predomina la clave operacional rectificativa y el número de registros en el desglose es 1 (antes salían múltiples)
[FIX] Soporte para facturas con recargo de equivalencia, ya no se exporta el recargo como otro registro
[ADD] Soporte para IVA agrario: cuando se detecta un impuesto con clave operacional X, su tipo se exporta como 0%
[ADD] Soporte para facturas de bienes de inversión
[ADD] Añadida opción para aplicar o no prorrateo a los bienes de inversión, que determina si se exportarán las facturas de bienes de inversión en su libro o como simples facturas recibidas
[FIX] Ahora las claves de libro se cogen del modelo calculado y no son valores fijos en la exportación a fichero

[IMP/TODO] Añadida función para la exportación de fechas que falta mover a l10n_es_aeat
[TODO] Algunos campos de la exportación de los registros de bienes de inversión. Más información en la descripción de la función
[TODO] Account chart update para cargar claves de libro y operacionales

=== modified file 'l10n_es_aeat_mod340/__openerp__.py'
--- l10n_es_aeat_mod340/__openerp__.py	2014-03-21 01:45:15 +0000
+++ l10n_es_aeat_mod340/__openerp__.py	2014-06-01 16:57:08 +0000
@@ -26,25 +26,29 @@
     'name' : 'Generación de fichero modelo 340 y libro de IVA',
     'version' : '2.0',
     'author' : 'Acysos S.L., Francisco Pascual (Ting), Nan-tic',
+    'contributors': ["Aserti Global Solutions"],
     'website' : 'www.acysos.com, www.ting.es, www.nan-tic.com',
     'category' : 'Localisation/Accounting',
     'description' : '''
 Módulo para la presentación del modelo 340. Exportación a formato AEAT. Libro de IVA
 
-Los impuestos incluidos en este modelo se indican en el Código base cuenta. Por defecto actualiza todos los código base que deban incluirse.
-Si el plan contable esta instalado recuerde utilizar account_chart_update para actualizar los códigos. Contabilidad y Finanzas -> Configuración -> Contabilidad Financiera -> Actualizar plan contable a partir de una plantila de plan contable
+Los impuestos incluidos en este modelo se indican asignándoles una clave de libro.
+Si el plan contable esta instalado recuerde utilizar account_chart_update para actualizar los impuestos.
+Contabilidad -> Configuración -> Cuentas -> Actualizar plan de cuentas
 
-Búsqueda de facturas emitidas y recibidas.
-Exportación a formato de AEAT de facturas emitidas y recibidas.
+Búsqueda de facturas emitidas, recibidas y de inversión.
+Exportación a formato de AEAT de facturas emitidas, recibidas y de inversión.
 Exportación de facturas con varios tipos impositivos. Clave de operación C.
 Facturas intracomunitarias excepto las operaciones a las que hace referencia el artículo 66 del RIVA que tienen un tratamiento especial.
 Facturas rectificativas.
 Facturas resumen de tiques.
+Recargos de equivalencia.
 Permite imprimir el libro de IVA, basado en la misma legislación.
 
+
 --- COSAS PENDIENTES (TODO LIST) ----------------------------------------------
 
-Facturas bienes de inversión
+Facturas bienes de inversión: la prorrata anual definitiva hay que introducirla a mano una vez calculado el modelo. Integrar con módulo assets
 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
@@ -67,8 +71,12 @@
         'mod340_sequence.xml',
         'account_invoice_view.xml',
         'account_view.xml',
+<<<<<<< TREE
         'taxes_data.xml',
     ],
+=======
+        'taxes_common.xml'],
+>>>>>>> MERGE-SOURCE
     'installable' : True,
     'active' : False,
 }

=== modified file 'l10n_es_aeat_mod340/account.py'
--- l10n_es_aeat_mod340/account.py	2014-02-09 16:33:45 +0000
+++ l10n_es_aeat_mod340/account.py	2014-06-01 16:57:08 +0000
@@ -21,171 +21,236 @@
 
 from openerp.osv import orm, fields
 from openerp.tools.translate import _
-
-class account_tax_code_template(orm.Model):
-
-    _inherit = 'account.tax.code.template'
-    
-    _columns = {
-        'mod340':fields.boolean("Include in mod340"),
+from collections import defaultdict
+
+class account_tax(orm.Model):
+    
+    _inherit = 'account.tax'
+
+    def _allowed_pct_by_ledger(self, cr, uid, context=None):
+        tax_obj = self.pool.get('account.tax')
+        res = defaultdict(set)
+        tax_ids = tax_obj.search(cr, uid, [('ledger_key','!=',False)], context=context)
+        for tax in tax_obj.browse(cr, uid, tax_ids, context):
+            res[tax.ledger_key].add(abs(tax.amount))
+        return res
+        
+
+    def get_operation_keys(self, cr, uid, context=None):
+        return [('-', u'Recargo de equivalencia'),
+                (' ', u'Operación habitual'),
+                ('F', u'F-Adquisiciones realizadas por las agencias de viajes directamente en interés del viajero (Régimen especial de agencias de viajes)'),
+                ('H', u'H-Régimen especial de oro de inversión'),
+                ('I', u'I-Inversión del Sujeto pasivo (ISP)'),
+                ('J', u'J-Tiques / Factura simplificada'),
+                ('L', u'L-Adquisiciones a comerciantes minoristas del IGIC'),
+                ('N', u'N-Facturación de las prestaciones de servicios de agencias de viaje que actúan como mediadoras en nombre y por cuenta ajena'),
+                ('P', u'P-Adquisiciones intracomunitarias de bienes.'),
+                ('Q', u'Q-Operaciones a las que se aplique el Régimen especial de bienes usados, objetos de arte, antigüedades y objetos de colección'),
+                ('R', u'R-Operación de arrendamiento de local de negocio'),
+                ('S', u'S-Subvenciones, auxilios o ayudas satisfechas o recibidas, tanto por parte de Administraciones públicas como de entidades privadas'),
+                ('V', u'V-Compras de Agencias viajes'),
+                ('W', u'W-Operaciones sujetas al Impuesto sobre la Producción, los Servicios y la Importación en las Ciudades de Ceuta y Melilla'),
+                ('X', u'X-Operaciones por las que los empresarios o profesionales que satisfagan compensaciones agrícolas, ganaderas y/o pesqueras hayan expedido el recibo correspondiente'),]
+    
+    def _get_operation_keys(self, cr, uid, context=None):
+        return self.get_operation_keys(cr, uid, context=context)
+
+    def get_ledger_keys(self, cr, uid, context=None):
+        return [('E', u'E-Libro registro de facturas expedidas.'),
+                ('F', u'F-Libro registro de facturas expedidas IGIC.'),
+                ('R', u'R-Libro registro de facturas recibidas.'),
+                ('I', u'I-Libro registro de bienes de inversión.'),
+                ('J', u'J-Libro de registro de bienes de inversión IGIC.'),
+                ('S', u'S-Libro de registro de facturas recibidas IGIC.'),
+                ('U', u'U-Libro registro de determinadas operaciones intracomunitarias.')]
+    
+    def _get_ledger_keys(self, cr, uid, context=None):
+        return self.get_ledger_keys(cr, uid, context=context)
+    
+    def get_ledger_keys_out(self, cr, uid, context=None):
+        return [('E', u'E-Libro registro de facturas expedidas.'),
+                ('F', u'F-Libro registro de facturas expedidas IGIC.'),
+                ('U', u'U-Libro registro de determinadas operaciones intracomunitarias.')]
+    
+    def _get_ledger_keys_out(self, cr, uid, context=None):
+        return self.get_ledger_keys_out(cr, uid, context=context)
+    
+    def get_ledger_keys_in(self, cr, uid, context=None):
+        return [('R', u'R-Libro registro de facturas recibidas.'),
+                ('I', u'I-Libro registro de bienes de inversión.'),
+                ('J', u'J-Libro de registro de bienes de inversión IGIC.'),
+                ('S', u'S-Libro de registro de facturas recibidas IGIC.'),
+                ('U', u'U-Libro registro de determinadas operaciones intracomunitarias.')]
+    
+    def _get_ledger_keys_in(self, cr, uid, context=None):
+        return self.get_ledger_keys_in(cr, uid, context=context)
+
+    def _calc_ledger(self, cr, uid, ids, field_names, arg, context=None):
+        res = dict.fromkeys(ids, {})
+        for tax in self.browse(cr, uid, ids, context):
+            res[tax.id]['ledger_key_out'] = False
+            res[tax.id]['ledger_key_in'] = False
+            if tax.type_tax_use == "purchase":
+                res[tax.id]['ledger_key_in'] = tax.ledger_key
+            elif tax.type_tax_use == "sale":
+                res[tax.id]['ledger_key_out'] = tax.ledger_key
+        return res
+            
+    def _set_ledger(self, cr, uid, ids, field_names, field_value, arg, context):
+        if not isinstance(ids, (tuple, list)):
+            ids = [ids]
+        taxes = self.browse(cr, uid, ids, context)
+        for field in field_names:
+            if field == "ledger_key_in":
+                self.write(cr, uid, [tax.id for tax in taxes if tax.type_tax_use in ('purchase', 'all')], {'ledger_key': field_value}, context)
+            else:
+                self.write(cr, uid, [tax.id for tax in taxes if tax.type_tax_use in ('sale', 'all')], {'ledger_key': field_value}, context)
+        
+    def onchange_ledger(self, cr, uid, ids, field, key, context=None):
+        value = {
+            'ledger_key': key
+        }
+        return {'value': value}
+    
+    def onchange_type_tax_use(self, cr, uid, ids, context=None):
+        value = {
+            'ledger_key': False,
+            'ledger_key_in': False,
+            'ledger_key_out': False
+        }
+        return { 'value': value }
+
+    _columns = {
+        'operation_key': fields.selection(_get_operation_keys, 'Operation Key'),
+        'ledger_key': fields.selection(_get_ledger_keys, 'Ledger Key', help="Determines to which ledger the invoice with this tax will be assigned. Setting a value makes the tax to be accounted in 340 declaration"),
+        'ledger_key_in': fields.function(_calc_ledger, type="selection", fnct_inv=_set_ledger, selection=_get_ledger_keys_in, string='Ledger Key', multi="ledger",
+                                         help="Determines to which ledger the invoice with this tax will be assigned. Setting a value makes the tax to be accounted in 340 declaration"),
+        'ledger_key_out': fields.function(_calc_ledger, type="selection", fnct_inv=_set_ledger, selection=_get_ledger_keys_out, string='Ledger Key', multi="ledger",
+                                          help="Determines to which ledger the invoice with this tax will be assigned. Setting a value makes the tax to be accounted in 340 declaration"),
+    }
+
+class account_tax_template(orm.Model):
+
+    _inherit = 'account.tax.template'
+    
+    def _get_ledger_keys(self, cr, uid, context=None):
+        return self.pool.get('account.tax').get_ledger_keys(cr, uid, context=context)
+    
+    def _get_operation_keys(self, cr, uid, context=None):
+        return self.pool.get('account.tax').get_operation_keys(cr, uid, context=context)
+    
+    _columns = {
+        'operation_key': fields.selection(_get_operation_keys, 'Operation Key'),
+        'ledger_key': fields.selection(_get_ledger_keys, 'Ledger Key'),
     }
 
 class account_tax_code(orm.Model):
 
     _inherit = 'account.tax.code'
     
+    def _calc_mod340(self, cr, uid, ids, name, args, context=None):
+        tax_obj = self.pool.get('account.tax')
+        res = {}
+        for tax in self.browse(cr, uid, ids, context=context):
+            res[tax.id] = len(tax_obj.search(cr, uid, [('base_code_id','=',tax.id),('ledger_key','!=',False)], context=context)) > 0
+        return res
+    
+    def _get_code_affected_by_tax(self, cr, uid, ids, context=None):
+        code_ids = set()
+        for tax in self.pool.get('account.tax').browse(cr, uid, ids, context=context):
+            code_ids.add(tax.base_code_id.id)
+        return list(code_ids)
+    
     _columns = {
-        'mod340':fields.boolean("Include in mod340"),
+        'mod340': fields.function(_calc_mod340, type="boolean", string="Include in mod340",
+                                  store={
+                                        'account.tax': (_get_code_affected_by_tax, ['base_code_id', 'ledger_key'], 10),
+                                  })
     }
 
 class wizard_update_charts_accounts(orm.TransientModel):
     _inherit = 'wizard.update.charts.accounts'
     
-    def _find_tax_codes(self, cr, uid, wizard, context=None):
-        """
-        Search for, and load, tax code templates to create/update.
-        """
-        new_tax_codes = 0
-        updated_tax_codes = 0
-        tax_code_template_mapping = {}
-        
-        tax_code_templ_obj = self.pool.get('account.tax.code.template')
-        tax_code_obj = self.pool.get('account.tax.code')
-        wiz_tax_code_obj = self.pool.get('wizard.update.charts.accounts.tax.code')
-        
-        # Remove previous tax codes
-        wiz_tax_code_obj.unlink(cr, uid, wiz_tax_code_obj.search(cr, uid, []))
-        
-        #
-        # Search for new / updated tax codes
-        #
-        root_tax_code_id = wizard.chart_template_id.tax_code_root_id.id
-        children_tax_code_template = tax_code_templ_obj.search(cr, uid, 
-                   [('parent_id', 'child_of', [root_tax_code_id])], order='id')
-        for tax_code_template in tax_code_templ_obj.browse(cr, uid, 
-                                                   children_tax_code_template):
-            # Ensure the tax code template is on the map (search for the mapped tax code id).
-            self._map_tax_code_template(cr, uid, wizard, 
-                                        tax_code_template_mapping, 
-                                        tax_code_template, context)
+    def _find_taxes(self, cr, uid, wizard, chart_template_ids, context=None):
+        """
+        En caso de actualizar impuestos, añade a los impuestos modificados los que
+        tengan claves de operación o libro distintas de sus plantillas
+        """
+        tax_obj = self.pool['account.tax']
+        tax_templ_obj = self.pool['account.tax.template']
+        wiz_taxes_obj = self.pool['wizard.update.charts.accounts.tax']
+        res = super(wizard_update_charts_accounts, self)._find_taxes(cr, uid, wizard, chart_template_ids, context)
+        
+        if not wizard.update_tax:
+            return res
+        updated_taxes = res['updated']
+        tax_templ_mapping = res['mapping']
+        tax_templ_ids = tax_templ_obj.search(cr, uid,
+                                            [('chart_template_id',
+                                              'in',
+                                              chart_template_ids)],
+                                            context=context)
+        
+        for tax_templ in tax_templ_obj.browse(cr, uid, tax_templ_ids,
+                                              context=context):
 
-            tax_code_id = tax_code_template_mapping.get(tax_code_template.id)
-            if not tax_code_id:
-                new_tax_codes += 1
-                wiz_tax_code_obj.create(cr, uid, {
-                        'tax_code_id': tax_code_template.id,
+            tax_id = self._map_tax_template(cr, uid, wizard,
+                                            tax_templ_mapping,
+                                            tax_templ, context=context)
+            
+            if not tax_id:
+                continue
+            
+            modified = False
+            notes = ""
+            tax = tax_obj.browse(cr, uid, tax_id, context=context)
+            if tax.operation_key != tax_templ.operation_key:
+                notes += _("The operation key is different.\n")
+                modified = True
+            if tax.ledger_key != tax_templ.ledger_key:
+                notes += _("The ledger key is different.\n")
+                modified = True
+            if modified:
+                wiz_tax_id = wiz_taxes_obj.search(cr, uid, [('update_chart_wizard_id','=',wizard.id),('update_tax_id','=',tax.id)], context=context)
+                if wiz_tax_id:
+                    wiz_tax_line = wiz_taxes_obj.browse(cr, uid, wiz_tax_id[0], context)
+                    wiz_taxes_obj.write(cr, uid, wiz_tax_line.id, {'notes': wiz_tax_line.notes + notes}, context)
+                else:
+                    updated_taxes += 1
+                    wiz_taxes_obj.create(cr, uid, {
+                        'tax_id': tax_templ.id,
                         'update_chart_wizard_id': wizard.id,
-                        'type': 'new',
+                        'type': 'updated',
+                        'update_tax_id': tax_id,
+                        'notes': notes,
                     }, context)
-            elif wizard.update_tax_code:
-                #
-                # Check the tax code for changes.
-                #
-                modified = False
-                notes = ""
-                tax_code = tax_code_obj.browse(cr, uid, tax_code_id, context=context)
-
-                if tax_code.code != tax_code_template.code:
-                    notes += _("The code field is different.\n")
-                    modified = True
-                if tax_code.info != tax_code_template.info:
-                    notes += _("The info field is different.\n")
-                    modified = True
-                if tax_code.sign != tax_code_template.sign:
-                    notes += _("The sign field is different.\n")
-                    modified = True
-                if tax_code.mod340 != tax_code_template.mod340:
-                    notes += _("The Mod 340 field is different.\n")
-                    modified = True
-
-                # TODO: We could check other account fields for changes...
-
-                if modified:
-                    #
-                    # Tax code to update.
-                    #
-                    updated_tax_codes += 1
-                    wiz_tax_code_obj.create(cr, uid, {
-                            'tax_code_id': tax_code_template.id,
-                            'update_chart_wizard_id': wizard.id,
-                            'type': 'updated',
-                            'update_tax_code_id': tax_code_id,
-                            'notes': notes,
-                        }, context)
-
-        return { 'new': new_tax_codes, 'updated': updated_tax_codes, 
-                'mapping': tax_code_template_mapping }
-                
-    def _update_tax_codes(self, cr, uid, wizard, log, context=None):
-        """
-        Search for, and load, tax code templates to create/update.
-        """
-        tax_code_obj = self.pool.get('account.tax.code')
-
-        root_tax_code_id = wizard.chart_template_id.tax_code_root_id.id
-
-        new_tax_codes = 0
-        updated_tax_codes = 0
-        tax_code_template_mapping = {}
-
-        for wiz_tax_code in wizard.tax_code_ids:
-            tax_code_template = wiz_tax_code.tax_code_id
-            tax_code_name = (root_tax_code_id == tax_code_template.id) and wizard.company_id.name or tax_code_template.name
-
-            # Ensure the parent tax code template is on the map.
-            self._map_tax_code_template(cr, uid, wizard, 
-                                        tax_code_template_mapping, 
-                                        tax_code_template.parent_id, context)
-
-            #
-            # Values
-            #
-            vals = {
-                'name': tax_code_name,
-                'code': tax_code_template.code,
-                'info': tax_code_template.info,
-                'parent_id': tax_code_template.parent_id and tax_code_template_mapping.get(tax_code_template.parent_id.id),
-                'company_id': wizard.company_id.id,
-                'sign': tax_code_template.sign,
-                'mod340': tax_code_template.mod340
+                    
+        res['updated'] = updated_taxes
+        return res
+
+    def _update_taxes(self, cr, uid, wizard, log, tax_code_template_mapping, context=None):
+        """
+        Vuelve a reprocesar las líneas de impuestos para actualizar las claves de operación y libro
+        """
+        res = super(wizard_update_charts_accounts, self)._update_taxes(cr, uid, wizard, log, tax_code_template_mapping, context)
+        taxes = self.pool['account.tax']
+
+        if not wizard.update_tax:
+            return res
+        
+        for wiz_tax in wizard.tax_ids:
+            tax_template = wiz_tax.tax_id
+
+            vals_tax = {
+                'operation_key': tax_template.operation_key,
+                'ledger_key': tax_template.ledger_key
             }
 
-            tax_code_id = None
-            modified = False
-
-            if wiz_tax_code.type == 'new':
-                #
-                # Create the tax code
-                #
-                tax_code_id = tax_code_obj.create(cr, uid, vals)
-                log.add(_("Created tax code %s.\n") % tax_code_name)
-                new_tax_codes += 1
-                modified = True
-            elif wizard.update_tax_code and wiz_tax_code.update_tax_code_id:
-                #
-                # Update the tax code
-                #
-                tax_code_id = wiz_tax_code.update_tax_code_id.id
-                tax_code_obj.write(cr, uid, [tax_code_id], vals)
-                log.add(_("Updated tax code %s.\n") % tax_code_name)
-                updated_tax_codes += 1
-                modified = True
-            else:
-                tax_code_id = wiz_tax_code.update_tax_code_id and wiz_tax_code.update_tax_code_id.id
-                modified = False
-
-            # Store the tax codes on the map
-            tax_code_template_mapping[tax_code_template.id] = tax_code_id
-
-            if modified:
-                #
-                # Detect errors
-                #
-                if tax_code_template.parent_id and not tax_code_template_mapping.get(tax_code_template.parent_id.id):
-                    log.add(_("Tax code %s: The parent tax code %s can not be set.\n") % (tax_code_name, tax_code_template.parent_id.name), True)
-
-        return {
-            'new': new_tax_codes,
-            'updated': updated_tax_codes,
-            'mapping': tax_code_template_mapping
-        }
+            if wiz_tax.type == 'updated' and wiz_tax.update_tax_id:
+                taxes.write(cr, uid, [wiz_tax.update_tax_id.id], vals_tax)
+#                 log.add(_("mod340: Updated tax %s.\n") % tax_template.name)
+
+        #No necesitamos llevar control de taxes_pending_for_accounts ni detectar errores, ya lo hizo super
+        return res
+

=== modified file 'l10n_es_aeat_mod340/account_invoice.py'
--- l10n_es_aeat_mod340/account_invoice.py	2014-02-09 16:33:45 +0000
+++ l10n_es_aeat_mod340/account_invoice.py	2014-06-01 16:57:08 +0000
@@ -21,10 +21,84 @@
 
 from openerp.osv import orm, fields
 from openerp.tools.translate import _
+from openerp.tools.float_utils import float_round 
 
 class account_invoice(orm.Model):
     _inherit = 'account.invoice'
     
+    def get_340_classification(self, cr, uid, invoice_id, context=None):            
+        invoice = self.browse(cr, uid, invoice_id, context)
+        if invoice.is_ticket_summary:
+            return 'E', 'B'
+        #Intentamos determinar la clasificación primero en función de la línea de más importe
+        max_line = max(invoice.invoice_line, key=lambda x: abs(x.price_subtotal))
+        taxes = filter(lambda x: x.ledger_key and x.operation_key != '-', max_line.invoice_line_tax_id)
+        if taxes:
+            return taxes[0].ledger_key, (taxes[0].operation_key or ' ')
+        #y si no cualquier otra
+        for line in invoice.invoice_line:
+            taxes = filter(lambda x: x.ledger_key and x.operation_key != '-', line.invoice_line_tax_id)
+            if taxes:
+                return taxes[0].ledger_key, (taxes[0].operation_key or ' ')
+        raise orm.except_orm(
+                          'Error',
+                          'No se pudo determinar la clasificacion de la factura %s porque sus impuestos no se declaran en el modelo 340' % invoice.number)
+
+    
+    def get_inv_good_names(self, cr, uid, invoice_id, tax_percentage, context=None):
+        names = []
+        invoice = self.browse(cr, uid, invoice_id, context)
+        tax_percentage = abs(tax_percentage)
+        for line in invoice.invoice_line:
+            for tax in line.invoice_line_tax_id:
+                if tax.ledger_key in ('I','J') and tax.amount == tax_percentage:
+                    names.append(line.name)
+                    break
+        return ', '.join(names)
+    
+    def get_cc_amounts(self, cr, uid, invoice_id, context=None):
+        #Créditos Zikzakmedia SL @ account_invoice_currency
+        invoice = self.browse(cr, uid, invoice_id, context)
+        if invoice.company_id.currency_id == invoice.currency_id:
+            return {
+                'cc_amount_untaxed': invoice.amount_untaxed,
+                'cc_amount_tax': invoice.amount_tax,
+                'cc_amount_total': invoice.amount_total,
+            }
+        
+        res = {
+            'cc_amount_untaxed': 0.0,
+            'cc_amount_tax': 0.0,
+            'cc_amount_total': 0.0,
+        }
+
+        ## It could be computed only in open or paid invoices with a generated account move
+        if invoice.move_id:
+            precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
+            ## Accounts to compute amount_untaxed
+            line_account = []
+            for line in invoice.invoice_line:
+                if line.account_id.id not in line_account:
+                    line_account.append(line.account_id.id)
+
+            ## Accounts to compute amount_tax
+            tax_account = []
+            for line in invoice.tax_line:
+                if line.account_id.id not in tax_account and line.amount != 0:
+                    tax_account.append(line.account_id.id)
+
+            ## The company currency amounts are the debit-credit amounts in the account moves
+            for line in invoice.move_id.line_id:
+                if line.account_id.id in line_account:
+                    res['cc_amount_untaxed'] += float_round(line.debit - line.credit, precision)
+                if line.account_id.id in tax_account:
+                    res['cc_amount_tax'] += float_round(line.debit - line.credit, precision)
+            if invoice.type in ('out_invoice', 'in_refund'):
+                res['cc_amount_untaxed'] = -res['cc_amount_untaxed']
+                res['cc_amount_tax'] = -res['cc_amount_tax']
+            res['cc_amount_total'] = res['cc_amount_tax'] + res['cc_amount_untaxed']
+        return res
+    
     _columns = {
         'is_ticket_summary': fields.boolean('Ticket Summary', 
                             help='Check if this invoice is a ticket summary'),

=== modified file 'l10n_es_aeat_mod340/account_view.xml'
--- l10n_es_aeat_mod340/account_view.xml	2014-03-20 00:33:19 +0000
+++ l10n_es_aeat_mod340/account_view.xml	2014-06-01 16:57:08 +0000
@@ -1,17 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+<<<<<<< TREE
         <record id="view_tax_code_template_form_mod340" model="ir.ui.view">
             <field name="name">account.tax.code.template.form.mod340</field>
             <field name="model">account.tax.code.template</field>
             <field name="inherit_id" ref="account.view_tax_code_template_form"/>
+=======
+    
+    	<record id="view_account_tax_template_form_mod340" model="ir.ui.view">
+            <field name="name">account.tax.template.form</field>
+            <field name="model">account.tax.template</field>
+            <field name="inherit_id" ref="account.view_account_tax_template_form"/>
+>>>>>>> MERGE-SOURCE
             <field name="arch" type="xml">
-                <field name="sign" position="after">
-                    <field name="mod340"/>
-                </field>
+            	<xpath expr="//field[@name='ref_tax_sign']" position="after">
+            		<group string="Modelo 340">
+            			<field name="ledger_key"/>
+            			<field name="operation_key"/>
+            		</group>
+            	</xpath>
             </field>
         </record>
-        
+
         <record id="view_tax_code_form_mod340" model="ir.ui.view">
             <field name="name">account.tax.code.form.mod340</field>
             <field name="model">account.tax.code</field>
@@ -22,5 +33,23 @@
                 </field>
             </field>
         </record>
+        
+        <record id="view_tax_form_mod340" model="ir.ui.view">
+            <field name="name">account.tax.form.mod340</field>
+            <field name="model">account.tax</field>
+            <field name="inherit_id" ref="account.view_tax_form"/>
+            <field name="arch" type="xml">
+        		<field name="child_depend" position="after">
+        			<separator string="Modelo 340" colspan="2"/>
+        			<field name="ledger_key" on_change="onchange_ledger('ledger_key', ledger_key, context)" attrs="{'invisible': [('type_tax_use','!=','all')]}"/>
+        			<field name="ledger_key_in" on_change="onchange_ledger('ledger_key_in', ledger_key_in, context)" attrs="{'invisible': [('type_tax_use','!=','purchase')]}"/>
+        			<field name="ledger_key_out" on_change="onchange_ledger('ledger_key_out', ledger_key_out,  context)" attrs="{'invisible': [('type_tax_use','!=','sale')]}"/>
+        			<field name="operation_key"/>
+        		</field>
+        		<field name="type_tax_use" position="attributes">
+        			<attribute name="on_change">onchange_type_tax_use(context)</attribute>
+        		</field>
+        	</field>
+        </record>
     </data>
 </openerp>
\ No newline at end of file

=== modified file 'l10n_es_aeat_mod340/i18n/es.po'
--- l10n_es_aeat_mod340/i18n/es.po	2014-05-12 06:40:26 +0000
+++ l10n_es_aeat_mod340/i18n/es.po	2014-06-01 16:57:08 +0000
@@ -4,21 +4,26 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
+"Project-Id-Version: OpenERP Server 7.0-20140331-231318\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-02 18:10+0000\n"
-"PO-Revision-Date: 2014-03-18 22:33+0000\n"
-"Last-Translator: Ignacio Ibeas (www.acysos.com) <[e-mail]>\n"
+"POT-Creation-Date: 2014-04-01 10:51+0000\n"
+"PO-Revision-Date: 2014-04-01 10:51+0000\n"
+"Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
+<<<<<<< TREE
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2014-05-12 06:39+0000\n"
 "X-Generator: Launchpad (build 16996)\n"
+=======
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+>>>>>>> MERGE-SOURCE
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:vat_book:0
+#: report:vat book:0
 msgid "FACTURAS DE SALIDA"
 msgstr "FACTURAS DE SALIDA"
 
@@ -29,16 +34,14 @@
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "Compañía:"
 msgstr "Compañía:"
 
 #. module: l10n_es_aeat_mod340
 #: model:ir.actions.act_window,name:l10n_es_aeat_mod340.action_l10n_es_aeat_mod340_report
 msgid "AEAT model 340"
-msgstr "Declaración AEAT 340"
+msgstr "Modelo AEAT 340"
 
 #. module: l10n_es_aeat_mod340
 #: view:l10n.es.aeat.mod340.issued:0
@@ -51,10 +54,14 @@
 msgstr "Exportar Modelo AEAT 340 al formato del BOE"
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/account.py:89
-#, python-format
-msgid "The code field is different.\n"
-msgstr "El campo código es diferente.\n"
+#: help:l10n.es.aeat.mod340.report,investment_goods_prorating:0
+msgid "If checked, the investment goods invoices will be exported in their ledger. If not, they will be exported as received invoices"
+msgstr "Si se marca, las facturas de bienes de inversión se exportarán en su libro. Si no, se exportarán como facturas recibidas"
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.report,investment_goods_prorating:0
+msgid "Investment goods prorating"
+msgstr "Prorrata de bienes de inversión"
 
 #. module: l10n_es_aeat_mod340
 #: view:l10n.es.aeat.mod340.report:0
@@ -67,26 +74,22 @@
 msgstr "Total"
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/account.py:161
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:126
 #, python-format
-msgid "Created tax code %s.\n"
-msgstr "Código de impuesto %s creado.\n"
+msgid "The periods selected don't belong to the fiscal year %s"
+msgstr "Los periodos seleccionados no pertenecen al año fiscal %s"
 
 #. module: l10n_es_aeat_mod340
-#: view:l10n.es.aeat.mod340.report:0
-msgid "Susbtitutive/complementary declaration"
-msgstr "Declaración sustitutiva/complementaría"
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:87
+#, python-format
+msgid "No match found for tax percentage %s"
+msgstr "No match found for tax percentage %s"
 
 #. module: l10n_es_aeat_mod340
 #: view:l10n.es.aeat.mod340.report:0
 #: field:l10n.es.aeat.mod340.report,company_id:0
 msgid "Company"
-msgstr "Compañía"
-
-#. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340.report,total_sharetax:0
-msgid "Total Share Tax"
-msgstr "Total impuestos"
+msgstr "Compañia"
 
 #. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340.report,number_records:0
@@ -94,13 +97,10 @@
 msgstr "Registros"
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:390
+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:411
 #, python-format
-msgid ""
-"The type 2 received record must be 500 characters long for each Vat registry"
-msgstr ""
-"El registro de tipo 2 debe tener una longitud de 500 caracteres por cada "
-"registro de IVA"
+msgid "The type 2 received record must be 500 characters long for each Vat registry"
+msgstr "El registro de tipo 2 debe tener una longitud de 500 caracteres por cada registro de IVA"
 
 #. module: l10n_es_aeat_mod340
 #: selection:l10n.es.aeat.mod340.report,type:0
@@ -117,6 +117,8 @@
 #: field:l10n.es.aeat.mod340.investment,base_tax:0
 #: field:l10n.es.aeat.mod340.issued,base_tax:0
 #: field:l10n.es.aeat.mod340.received,base_tax:0
+#: field:l10n.es.aeat.mod340.tax_line_intra,base_amount:0
+#: field:l10n.es.aeat.mod340.tax_line_investment,base_amount:0
 #: field:l10n.es.aeat.mod340.tax_line_issued,base_amount:0
 #: field:l10n.es.aeat.mod340.tax_line_received,base_amount:0
 msgid "Base tax bill"
@@ -129,9 +131,7 @@
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "Apellidos y nombre de contacto:"
 msgstr "Apellidos y nombre de contacto:"
 
@@ -142,7 +142,6 @@
 
 #. module: l10n_es_aeat_mod340
 #: field:account.tax.code,mod340:0
-#: field:account.tax.code.template,mod340:0
 msgid "Include in mod340"
 msgstr "Incluir en el modelo 340"
 
@@ -177,13 +176,11 @@
 msgstr "6 - Otro documento probatorio"
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:283
+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:291
+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:529
 #, python-format
-msgid ""
-"The type 2 issued record must be 500 characters long for each Vat registry"
-msgstr ""
-"El registro de tipo 2 debe tener una longitud de 500 caracteres por cada "
-"registro de IVA"
+msgid "The type 2 issued record must be 500 characters long for each Vat registry"
+msgstr "El registro de tipo 2 debe tener una longitud de 500 caracteres por cada registro de IVA"
 
 #. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340.report,period_from:0
@@ -191,24 +188,21 @@
 msgstr "Periodo inicial"
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/account.py:170
-#, python-format
-msgid "Updated tax code %s.\n"
-msgstr "Código de impuesto %s actualizado.\n"
+#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_report
+#: field:l10n.es.aeat.mod340.intracomunitarias,mod340_id:0
+#: field:l10n.es.aeat.mod340.investment,mod340_id:0
+#: field:l10n.es.aeat.mod340.issued,mod340_id:0
+#: field:l10n.es.aeat.mod340.received,mod340_id:0
+#: view:l10n.es.aeat.mod340.report:0
+msgid "Model 340"
+msgstr "Modelo 340"
 
 #. module: l10n_es_aeat_mod340
 #: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_intracomunitarias
-#: field:l10n.es.aeat.mod340.report,intracomunitarias:0
 msgid "Operations Intracomunitarias"
 msgstr "Operaciones intracomunitarias"
 
 #. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340.tax_line_issued,tax_amount:0
-#: field:l10n.es.aeat.mod340.tax_line_received,tax_amount:0
-msgid "Tax amount"
-msgstr "Impuestos"
-
-#. module: l10n_es_aeat_mod340
 #: view:l10n.es.aeat.mod340.report:0
 #: field:l10n.es.aeat.mod340.report,ean13:0
 msgid "Electronic Code VAT reverse charge"
@@ -220,35 +214,20 @@
 msgstr "Periodo final"
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/account.py:98
-#, python-format
-msgid "The Mod 340 field is different.\n"
-msgstr "El campo Mod 340 es diferente.\n"
-
-#. module: l10n_es_aeat_mod340
 #: view:l10n.es.aeat.mod340.report:0
 msgid "Identification"
 msgstr "Identificación"
 
 #. module: l10n_es_aeat_mod340
-#: view:l10n.es.aeat.mod340.report:0
-msgid "295"
-msgstr "295"
-
-#. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340.intracomunitarias:0
+#: view:l10n.es.aeat.mod340.investment:0
 #: view:l10n.es.aeat.mod340.issued:0
 #: view:l10n.es.aeat.mod340.received:0
 msgid "Total Tax"
-msgstr "Total Impuestos"
-
-#. module: l10n_es_aeat_mod340
-#: model:ir.actions.report.xml,name:l10n_es_aeat_mod340.report_mod340_action
-msgid "mod340 report"
-msgstr "mod340 report"
+msgstr "Cuota"
 
 #. module: l10n_es_aeat_mod340
 #: report:vat book:0
-#: report:vat_book:0
 msgid "LIBRO DE IVA"
 msgstr "LIBRO DE IVA"
 
@@ -258,10 +237,42 @@
 msgstr "Facturas"
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:66
-#, python-format
-msgid "This company dont have NIF"
-msgstr "Esta compañía no tiene CIF/NIF"
+#: field:l10n.es.aeat.mod340.tax_line_intra,tax_amount:0
+#: field:l10n.es.aeat.mod340.tax_line_investment,tax_amount:0
+#: field:l10n.es.aeat.mod340.tax_line_issued,tax_amount:0
+#: field:l10n.es.aeat.mod340.tax_line_received,tax_amount:0
+msgid "Tax amount"
+msgstr "Cuota"
+
+#. module: l10n_es_aeat_mod340
+#: field:account.tax,ledger_key:0
+#: field:account.tax,ledger_key_in:0
+#: field:account.tax,ledger_key_out:0
+#: field:account.tax.template,ledger_key:0
+#: field:l10n.es.aeat.mod340.intracomunitarias,ledger_key:0
+#: field:l10n.es.aeat.mod340.investment,ledger_key:0
+#: field:l10n.es.aeat.mod340.issued,ledger_key:0
+#: field:l10n.es.aeat.mod340.received,ledger_key:0
+msgid "Ledger Key"
+msgstr "Clave de libro"
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.tax_line_intra,surcharge_percentage:0
+#: field:l10n.es.aeat.mod340.tax_line_investment,surcharge_percentage:0
+#: field:l10n.es.aeat.mod340.tax_line_issued,surcharge_percentage:0
+#: field:l10n.es.aeat.mod340.tax_line_received,surcharge_percentage:0
+msgid "Surcharge percentage"
+msgstr "Tipo de recargo"
+
+#. module: l10n_es_aeat_mod340
+#: model:ir.model,name:l10n_es_aeat_mod340.model_account_tax
+msgid "Tax"
+msgstr "Impuesto"
+
+#. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340.report:0
+msgid "Fiscal Year"
+msgstr "Año fiscal"
 
 #. module: l10n_es_aeat_mod340
 #: selection:res.partner,vat_type:0
@@ -279,6 +290,11 @@
 msgstr "Estado"
 
 #. module: l10n_es_aeat_mod340
+#: model:ir.model,name:l10n_es_aeat_mod340.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr "Plantilla para los impuestos"
+
+#. module: l10n_es_aeat_mod340
 #: model:ir.ui.menu,name:l10n_es_aeat_mod340.menu_aeat_mod340_report
 msgid "AEAT 340 Model"
 msgstr "Declaración AEAT 340"
@@ -289,11 +305,10 @@
 #: field:l10n.es.aeat.mod340.issued,amount_tax:0
 #: field:l10n.es.aeat.mod340.received,amount_tax:0
 msgid "Total tax"
-msgstr "Total impuestos"
+msgstr "Cuota"
 
 #. module: l10n_es_aeat_mod340
 #: report:vat book:0
-#: report:vat_book:0
 msgid "Nº de factura"
 msgstr "Nº de factura"
 
@@ -303,9 +318,19 @@
 #: field:l10n.es.aeat.mod340.issued,date_invoice:0
 #: field:l10n.es.aeat.mod340.received,date_invoice:0
 msgid "Date Invoice"
-msgstr "Fecha Factura"
-
-#. module: l10n_es_aeat_mod340
+msgstr "Fecha factura"
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.tax_line_intra,surcharge_amount:0
+#: field:l10n.es.aeat.mod340.tax_line_investment,surcharge_amount:0
+#: field:l10n.es.aeat.mod340.tax_line_issued,surcharge_amount:0
+#: field:l10n.es.aeat.mod340.tax_line_received,surcharge_amount:0
+msgid "Surcharge amount"
+msgstr "Cuota de recargo"
+
+#. module: l10n_es_aeat_mod340
+#: view:account.tax:0
+#: view:account.tax.template:0
 #: model:ir.actions.report.xml,name:l10n_es_aeat_mod340.report_mod340
 msgid "Modelo 340"
 msgstr "Modelo 340"
@@ -321,7 +346,7 @@
 msgstr "Tipo de soporte"
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:105
+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:113
 #, python-format
 msgid "The period hasn't a valid Mod340 period"
 msgstr "El periodo no es válido para el Módelo 340"
@@ -337,32 +362,24 @@
 msgstr "1 - Corresponde a un NIF"
 
 #. module: l10n_es_aeat_mod340
-#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_export_to_boe
-msgid "Export AEAT Model 340 to BOE format"
-msgstr "Exportar Modelo AEAT 340 al formato del BOE"
-
-#. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:126
+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:134
 #, python-format
 msgid "The type 1 record must be 500 characters long"
 msgstr "El registro de tipo 1 tiene que tener 500 caracteres de longitud"
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "CIF/NIF:"
 msgstr "CIF/NIF:"
 
 #. module: l10n_es_aeat_mod340
-#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_tax_line_issued
-msgid "Mod340 vat lines issued"
-msgstr "Líneas de impuestos emitidos"
+#: field:l10n.es.aeat.mod340.report,calculation_date:0
+msgid "Calculation date"
+msgstr "Fecha de cálculo"
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 msgid "CIF/NIF del representante legal:"
 msgstr "CIF/NIF del representante legal:"
 
@@ -376,21 +393,13 @@
 msgstr "Empresa"
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:80
-#, python-format
-msgid "The periods selected don't belong to the fiscal year %s"
-msgstr "Los periodos seleccionados no pertenecen al año fiscal %s"
-
-#. module: l10n_es_aeat_mod340
 #: model:ir.actions.act_window,help:l10n_es_aeat_mod340.action_l10n_es_aeat_mod340_report
 msgid "Create and query AEAT Model 340 reports"
 msgstr "Crear informe del Modelo AEAT 340"
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "Cuota impuesto"
 msgstr "Cuota impuesto"
 
@@ -400,30 +409,42 @@
 msgstr "Líneas de impuestos recibidos"
 
 #. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340.report:0
+msgid "Other intracommunity operations"
+msgstr "Otras opreaciones intracomunitarias"
+
+#. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 msgid "MODELO AEAT 340"
 msgstr "MODELO AEAT 340"
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/account.py:95
-#, python-format
-msgid "The sign field is different.\n"
-msgstr "El campo signo es diferente.\n"
+#: view:l10n.es.aeat.mod340.investment:0
+#: view:l10n.es.aeat.mod340.report:0
+msgid "Investment goods"
+msgstr "Bienes de inversión"
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.export_to_boe,state:0
+msgid "unknown"
+msgstr "unknown"
+
+#. module: l10n_es_aeat_mod340
+#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_tax_line_investment
+msgid "Mod340 vat lines investment"
+msgstr "Líneas de inversión del mod340"
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 msgid "Tipo de declaración"
 msgstr "Tipo de declaración"
 
 #. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340.report,calculation_date:0
-msgid "Calculation date"
-msgstr "Fecha de cálculo"
+#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_tax_line_issued
+msgid "Mod340 vat lines issued"
+msgstr "Líneas de impuestos emitidos"
 
 #. module: l10n_es_aeat_mod340
-#: model:ir.actions.report.xml,name:l10n_es_aeat_mod340.report_vat_book_action
 #: model:ir.actions.report.xml,name:l10n_es_aeat_mod340.vat_book
 msgid "Vat Book"
 msgstr "Libro de IVA"
@@ -434,10 +455,9 @@
 msgstr "Número de tiques"
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/account.py:185
-#, python-format
-msgid "Tax code %s: The parent tax code %s can not be set.\n"
-msgstr "Código de impuesto %s: el padre de %s no puede ser guardado.\n"
+#: field:l10n.es.aeat.mod340.report,total_sharetax:0
+msgid "Total Share Tax"
+msgstr "Total impuestos"
 
 #. module: l10n_es_aeat_mod340
 #: selection:l10n.es.aeat.mod340.report,support_type:0
@@ -446,9 +466,7 @@
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "Fecha"
 msgstr "Fecha"
 
@@ -458,15 +476,21 @@
 msgstr "En processo"
 
 #. module: l10n_es_aeat_mod340
-#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340
-#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_report
-#: field:l10n.es.aeat.mod340.intracomunitarias,mod340_id:0
-#: field:l10n.es.aeat.mod340.investment,mod340_id:0
-#: field:l10n.es.aeat.mod340.issued,mod340_id:0
-#: field:l10n.es.aeat.mod340.received,mod340_id:0
-#: view:l10n.es.aeat.mod340.report:0
-msgid "Model 340"
-msgstr "Modelo 340"
+#: field:l10n.es.aeat.mod340.investment,prorata:0
+msgid "Definitive yearly prorata"
+msgstr "Prorrata anual definitiva"
+
+#. module: l10n_es_aeat_mod340
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:115
+#, python-format
+msgid "This company dont have NIF"
+msgstr "Esta compañía no tiene CIF/NIF"
+
+#. module: l10n_es_aeat_mod340
+#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_received
+#: field:l10n.es.aeat.mod340.report,received:0
+msgid "Invoices Received"
+msgstr "Facturas recibidas"
 
 #. module: l10n_es_aeat_mod340
 #: view:l10n.es.aeat.mod340.report:0
@@ -485,14 +509,15 @@
 msgstr "open"
 
 #. module: l10n_es_aeat_mod340
-#: view:l10n.es.aeat.mod340.issued:0
-#: view:l10n.es.aeat.mod340.received:0
-msgid "Total Base"
-msgstr "Total Base"
+#: code:addons/l10n_es_aeat_mod340/account.py:211
+#, python-format
+msgid "The ledger key is different.\n"
+""
+msgstr "La clave de libro es diferente.\n"
+""
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 msgid "Número de la declaración anterior:"
 msgstr "Número de la declaración anterior:"
 
@@ -512,19 +537,36 @@
 msgstr "Active si esta factura es un resumen de tiques"
 
 #. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340.export_to_boe,state:0
-msgid "unknown"
-msgstr "unknown"
-
-#. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340.report,contact_phone:0
-msgid "Phone"
-msgstr "Teléfono"
-
-#. module: l10n_es_aeat_mod340
-#: field:account.invoice,last_ticket:0
-msgid "Last ticket"
-msgstr "Último tique"
+#: view:l10n.es.aeat.mod340.tax_line_investment:0
+msgid "Tax line investment goods"
+msgstr "Línea de impuesto de bienes de inversión"
+
+#. module: l10n_es_aeat_mod340
+#: report:report mod340:0
+#: report:vat book:0
+msgid "Teléfono de contacto:"
+msgstr "Teléfono de contacto:"
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.tax_line_investment,goods_identification:0
+msgid "Investment goods identification"
+msgstr "Identificación del bien"
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.investment,use_date:0
+msgid "Goods use start date"
+msgstr "Fecha de inicio de utilización"
+
+#. module: l10n_es_aeat_mod340
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:260
+#, python-format
+msgid "Invoice %s: Unable to determine the surcharged tax because it is not mapped in the partner's fiscal position %s"
+msgstr "Factura %s: No se pudo determinar el impuesto con recargo porque no está mapeado en la posición fiscal de la empresa %s"
+
+#. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340.tax_line_intra:0
+msgid "Tax line intracommunity"
+msgstr "Línea de impuesto intracomunitaria"
 
 #. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340.report,previous_number:0
@@ -538,13 +580,16 @@
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "Ejercicio fiscal:"
 msgstr "Ejercicio fiscal:"
 
 #. module: l10n_es_aeat_mod340
+#: field:account.invoice,last_ticket:0
+msgid "Last ticket"
+msgstr "Último tique"
+
+#. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340.intracomunitarias,partner_country_code:0
 #: field:l10n.es.aeat.mod340.investment,partner_country_code:0
 #: field:l10n.es.aeat.mod340.issued,partner_country_code:0
@@ -573,12 +618,20 @@
 msgstr "Facturas emitidas"
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:79
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:58
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:86
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:125
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:259
 #, python-format
 msgid "Error"
 msgstr "Error"
 
 #. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340.report:0
+msgid "Susbtitutive/complementary declaration"
+msgstr "Declaración sustitutiva/complementaría"
+
+#. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340.intracomunitarias,representative_vat:0
 #: field:l10n.es.aeat.mod340.investment,representative_vat:0
 #: field:l10n.es.aeat.mod340.issued,representative_vat:0
@@ -598,14 +651,19 @@
 msgstr "Facturas emitidas"
 
 #. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340.intracomunitarias:0
+msgid "Other Intracommunity Operations"
+msgstr "Otras operaciones intracomunitarias"
+
+#. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "Base imponible"
 msgstr "Base imponible"
 
 #. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.tax_line_intra,invoice_record_id:0
+#: field:l10n.es.aeat.mod340.tax_line_investment,invoice_record_id:0
 #: field:l10n.es.aeat.mod340.tax_line_received,invoice_record_id:0
 msgid "Invoice received"
 msgstr "Facturas recibidas"
@@ -652,19 +710,17 @@
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
-#: report:vat book:0
-#: report:vat_book:0
-msgid "Teléfono de contacto:"
-msgstr "Teléfono de contacto:"
-
-#. module: l10n_es_aeat_mod340
-#: report:report mod340:0
-#: report:report_mod340:0
 msgid "Código electrónico autoliquidación IVA:"
 msgstr "Código electrónico autoliquidación IVA:"
 
 #. module: l10n_es_aeat_mod340
+#: help:account.tax,ledger_key:0
+#: help:account.tax,ledger_key_in:0
+#: help:account.tax,ledger_key_out:0
+msgid "Determines to which ledger the invoice with this tax will be assigned. Setting a value makes the tax to be accounted in 340 declaration"
+msgstr "Determina a qué libro se asignará una factura con este impuesto. Establecer un valor hace que el impuesto se tenga en cuenta en la declaración del modelo 340"
+
+#. module: l10n_es_aeat_mod340
 #: selection:res.partner,vat_type:0
 msgid "5 - Certificado de residencia fiscal"
 msgstr "5 - Certificado de residencia fiscal"
@@ -676,6 +732,8 @@
 msgstr "AEAT 340"
 
 #. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.tax_line_intra,tax_percentage:0
+#: field:l10n.es.aeat.mod340.tax_line_investment,tax_percentage:0
 #: field:l10n.es.aeat.mod340.tax_line_issued,tax_percentage:0
 #: field:l10n.es.aeat.mod340.tax_line_received,tax_percentage:0
 msgid "Tax percentage"
@@ -687,12 +745,16 @@
 msgstr "Facturas recibidas"
 
 #. module: l10n_es_aeat_mod340
+#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_tax_line_intra
+msgid "Mod340 vat lines intra-community"
+msgstr "Línea de impuesto intracomunitario del mod340"
+
+#. module: l10n_es_aeat_mod340
 #: help:l10n.es.aeat.mod340.report,number_records:0
 #: help:l10n.es.aeat.mod340.report,total:0
 #: help:l10n.es.aeat.mod340.report,total_sharetax:0
 #: help:l10n.es.aeat.mod340.report,total_taxable:0
-msgid ""
-"The declaration will include partners with the total \n"
+msgid "The declaration will include partners with the total \n"
 "                of operations over this limit"
 msgstr "La declaración incluye las empresas que no superen este limite"
 
@@ -703,21 +765,15 @@
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "CIF/NIF"
 msgstr "CIF/NIF"
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:196
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:275
 #, python-format
-msgid ""
-"Invoice  %s, Amount untaxed Lines %.2f do not correspond to AmountUntaxed on "
-"Invoice %.2f"
-msgstr ""
-"Invoice  %s, Amount untaxed Lines %.2f do not correspond to AmountUntaxed on "
-"Invoice %.2f"
+msgid "Invoice  %s, Amount untaxed Lines %.2f do not correspond to AmountUntaxed on Invoice %.2f"
+msgstr "Factura  %s, el importe sin impuesto de las líneas %.2f no se corresponde con el importe sin impuesto de la factura %.2f"
 
 #. module: l10n_es_aeat_mod340
 #: help:res.partner,vat_type:0
@@ -725,10 +781,13 @@
 msgstr "Clave número de identificación en el país de residencia. Modelo 340."
 
 #. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340.report:0
+msgid "322"
+msgstr "322"
+
+#. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "Número de factura"
 msgstr "Número de factura"
 
@@ -746,8 +805,17 @@
 msgstr "NIF del representante legal."
 
 #. module: l10n_es_aeat_mod340
+#: field:account.tax,operation_key:0
+#: field:account.tax.template,operation_key:0
+#: field:l10n.es.aeat.mod340.intracomunitarias,operation_key:0
+#: field:l10n.es.aeat.mod340.investment,operation_key:0
+#: field:l10n.es.aeat.mod340.issued,operation_key:0
+#: field:l10n.es.aeat.mod340.received,operation_key:0
+msgid "Operation Key"
+msgstr "Clave de operación"
+
+#. module: l10n_es_aeat_mod340
 #: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_investment
-#: field:l10n.es.aeat.mod340.report,investment:0
 msgid "Property Investment"
 msgstr "Inmovilizado"
 
@@ -758,12 +826,13 @@
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 msgid "Número:"
 msgstr "Número:"
 
 #. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340.report,name:0
+#: field:l10n.es.aeat.mod340.tax_line_intra,name:0
+#: field:l10n.es.aeat.mod340.tax_line_investment,name:0
 #: field:l10n.es.aeat.mod340.tax_line_issued,name:0
 #: field:l10n.es.aeat.mod340.tax_line_received,name:0
 msgid "Name"
@@ -783,25 +852,33 @@
 msgstr "NIF del representante legal"
 
 #. module: l10n_es_aeat_mod340
+#: code:addons/l10n_es_aeat_mod340/account.py:208
+#, python-format
+msgid "The operation key is different.\n"
+""
+msgstr "La clave de operación es diferente.\n"
+""
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.report,investment:0
+msgid "Investment Goods"
+msgstr "Bienes de inversión"
+
+#. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 msgid "Tipo de soporte:"
 msgstr "Tipo de soporte:"
 
 #. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340.report,attach_id:0
-msgid "BOE file"
-msgstr "Archivo BOE"
-
-#. module: l10n_es_aeat_mod340
 #: view:l10n.es.aeat.mod340.report:0
 msgid "Draft models"
 msgstr "Modelos en borrador"
 
 #. module: l10n_es_aeat_mod340
-#: view:l10n.es.aeat.mod340.report:0
-msgid "Fiscal Year"
-msgstr "Año fiscal"
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:59
+#, python-format
+msgid "Invoice %s: Unable to determine the tax line %s source tax. The base code of the source tax may have been changed, please recompute the invoice taxes"
+msgstr "Factura %s: No se pudo determinar el impuesto origen de la línea de impuesto %s. El código de la base del impuesto origen puede haber sido cambiado, por favor recalcule los impuestos de la factura"
 
 #. module: l10n_es_aeat_mod340
 #: view:account.invoice:0
@@ -809,16 +886,22 @@
 msgstr "Pagos"
 
 #. module: l10n_es_aeat_mod340
-#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_received
-#: field:l10n.es.aeat.mod340.report,received:0
-msgid "Invoices Received"
-msgstr "Facturas recibidas"
-
-#. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/account.py:92
-#, python-format
-msgid "The info field is different.\n"
-msgstr "El campo descripción es diferente.\n"
+#: field:l10n.es.aeat.mod340.report,intracomunitarias:0
+msgid "Intra-community Operations"
+msgstr "Operaciones intracomunitarias"
+
+#. module: l10n_es_aeat_mod340
+#: sql_constraint:l10n.es.aeat.mod340.investment:0
+msgid "The prorata must be between 0 and 100."
+msgstr "La prorrata debe estar entre 0 y 100."
+
+#. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340.intracomunitarias:0
+#: view:l10n.es.aeat.mod340.investment:0
+#: view:l10n.es.aeat.mod340.issued:0
+#: view:l10n.es.aeat.mod340.received:0
+msgid "Total Base"
+msgstr "Total Base"
 
 #. module: l10n_es_aeat_mod340
 #: selection:l10n.es.aeat.mod340.report,support_type:0
@@ -832,13 +915,16 @@
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "Empresa"
 msgstr "Empresa"
 
 #. module: l10n_es_aeat_mod340
+#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_export_to_boe
+msgid "Export Report to BOE Format"
+msgstr "Exportar a formato BOE"
+
+#. module: l10n_es_aeat_mod340
 #: selection:l10n.es.aeat.mod340.report,type:0
 msgid "Complementary"
 msgstr "Complementaria"
@@ -850,9 +936,7 @@
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "Total factura"
 msgstr "Total factura"
 
@@ -862,15 +946,20 @@
 msgstr "Archivo"
 
 #. module: l10n_es_aeat_mod340
+#: view:account.tax:0
+msgid "onchange_type_tax_use(context)"
+msgstr "onchange_type_tax_use(context)"
+
+#. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "FACTURAS DE ENTRADA"
 msgstr "FACTURAS DE ENTRADA"
 
 #. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340.intracomunitarias:0
 #: field:l10n.es.aeat.mod340.intracomunitarias,total:0
+#: view:l10n.es.aeat.mod340.investment:0
 #: field:l10n.es.aeat.mod340.investment,total:0
 #: view:l10n.es.aeat.mod340.issued:0
 #: field:l10n.es.aeat.mod340.issued,total:0
@@ -881,130 +970,8 @@
 msgstr "Total"
 
 #. module: l10n_es_aeat_mod340
-#: model:ir.model,name:l10n_es_aeat_mod340.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Plantilla códigos de impuestos"
-
-#. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:118
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:167
 #, python-format
 msgid "La siguiente empresa no tiene asignado nif:"
 msgstr "La siguiente empresa no tiene asignado nif:"
 
-#~ msgid "May"
-#~ msgstr "Mayo"
-
-#~ msgid "June"
-#~ msgstr "Junio"
-
-#~ msgid "First quarter"
-#~ msgstr "Primer trimestre"
-
-#~ msgid "Third quarter"
-#~ msgstr "Tercer trimestre"
-
-#~ msgid "Second quarter"
-#~ msgstr "Segundo trimestre"
-
-#~ msgid "January"
-#~ msgstr "Enero"
-
-#~ msgid "Fourth quarter"
-#~ msgstr "Cuarto trimestre"
-
-#~ msgid "March"
-#~ msgstr "Marzo"
-
-#~ msgid "February"
-#~ msgstr "Febrero"
-
-#~ msgid "April"
-#~ msgstr "Abril"
-
-#~ msgid "August"
-#~ msgstr "Agosto"
-
-#~ msgid "September"
-#~ msgstr "Septiembre"
-
-#~ msgid "October"
-#~ msgstr "Octubre"
-
-#~ msgid "November"
-#~ msgstr "Noviembre"
-
-#~ msgid "December"
-#~ msgstr "Diciembre"
-
-#~ msgid "July"
-#~ msgstr "Julio"
-
-#, python-format
-#~ msgid "All real state records state code field must be filled."
-#~ msgstr ""
-#~ "Los registros de propiedades inmobiliarias deben ser rellenados manualmente."
-
-#~ msgid "Create and query AEAT Model 340 Reports"
-#~ msgstr "Crear informe del Model AEAT 340"
-
-#, python-format
-#~ msgid "Error!"
-#~ msgstr "Error!"
-
-#~ msgid "Confirm"
-#~ msgstr "Confirmar"
-
-#, python-format
-#~ msgid "340_report_%s.txt"
-#~ msgstr "340_report_%s.txt"
-
-#, python-format
-#~ msgid "%Y-%m-%d"
-#~ msgstr "%d-%m-%Y"
-
-#~ msgid "Export to BOE"
-#~ msgstr "Exportar al BOE"
-
-#, python-format
-#~ msgid "The periods selected don't belong to the fiscal year  %s"
-#~ msgstr "Los periodos seleccionados no pertenecen al año fiscal  %s"
-
-#~ msgid "Declaration Number"
-#~ msgstr "Número de declaración"
-
-#~ msgid "Canceled"
-#~ msgstr "Cancelado"
-
-#~ msgid "Calculate"
-#~ msgstr "Calcular"
-
-#, python-format
-#~ msgid "All partner state code field must be filled."
-#~ msgstr "Todos las empresas deben tener provincia."
-
-#, python-format
-#~ msgid "All partner vat number field must be filled."
-#~ msgstr "Todas las empresas deben tener CIF/NIF."
-
-#~ msgid "Processing"
-#~ msgstr "Procesando"
-
-#~ msgid "Cancel"
-#~ msgstr "Cancelar"
-
-#~ msgid "Recalculate"
-#~ msgstr "Recalcular"
-
-#~ msgid "AEAT Model 340"
-#~ msgstr "Modelo AEAT 340"
-
-#~ msgid ""
-#~ "The declaration will include partners with the total of operations over this "
-#~ "limit"
-#~ msgstr "La declaración incluye las empresas que no superen este limite"
-
-#~ msgid "Previous Declaration Number"
-#~ msgstr "Número de la declaración anterior"
-
-#~ msgid "Period"
-#~ msgstr "Periodo"

=== modified file 'l10n_es_aeat_mod340/i18n/l10n_es_aeat_mod340.pot'
--- l10n_es_aeat_mod340/i18n/l10n_es_aeat_mod340.pot	2014-02-14 18:31:18 +0000
+++ l10n_es_aeat_mod340/i18n/l10n_es_aeat_mod340.pot	2014-06-01 16:57:08 +0000
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
+"Project-Id-Version: OpenERP Server 7.0-20140331-231318\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-02 18:10+0000\n"
-"PO-Revision-Date: 2014-02-02 18:10+0000\n"
+"POT-Creation-Date: 2014-04-01 10:50+0000\n"
+"PO-Revision-Date: 2014-04-01 10:50+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:vat_book:0
+#: report:vat book:0
 msgid "FACTURAS DE SALIDA"
 msgstr ""
 
@@ -28,9 +28,7 @@
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "Compañía:"
 msgstr ""
 
@@ -50,10 +48,13 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/account.py:89
-#, python-format
-msgid "The code field is different.\n"
-""
+#: help:l10n.es.aeat.mod340.report,investment_goods_prorating:0
+msgid "If checked, the investment goods invoices will be exported in their ledger. If not, they will be exported as received invoices"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.report,investment_goods_prorating:0
+msgid "Investment goods prorating"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -67,15 +68,15 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/account.py:161
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:126
 #, python-format
-msgid "Created tax code %s.\n"
-""
+msgid "The periods selected don't belong to the fiscal year %s"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: view:l10n.es.aeat.mod340.report:0
-msgid "Susbtitutive/complementary declaration"
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:87
+#, python-format
+msgid "No match found for tax percentage %s"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -85,17 +86,12 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340.report,total_sharetax:0
-msgid "Total Share Tax"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340.report,number_records:0
 msgid "Records"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:390
+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:411
 #, python-format
 msgid "The type 2 received record must be 500 characters long for each Vat registry"
 msgstr ""
@@ -115,6 +111,8 @@
 #: field:l10n.es.aeat.mod340.investment,base_tax:0
 #: field:l10n.es.aeat.mod340.issued,base_tax:0
 #: field:l10n.es.aeat.mod340.received,base_tax:0
+#: field:l10n.es.aeat.mod340.tax_line_intra,base_amount:0
+#: field:l10n.es.aeat.mod340.tax_line_investment,base_amount:0
 #: field:l10n.es.aeat.mod340.tax_line_issued,base_amount:0
 #: field:l10n.es.aeat.mod340.tax_line_received,base_amount:0
 msgid "Base tax bill"
@@ -127,9 +125,7 @@
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "Apellidos y nombre de contacto:"
 msgstr ""
 
@@ -140,7 +136,6 @@
 
 #. module: l10n_es_aeat_mod340
 #: field:account.tax.code,mod340:0
-#: field:account.tax.code.template,mod340:0
 msgid "Include in mod340"
 msgstr ""
 
@@ -175,7 +170,8 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:283
+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:291
+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:529
 #, python-format
 msgid "The type 2 issued record must be 500 characters long for each Vat registry"
 msgstr ""
@@ -186,25 +182,21 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/account.py:170
-#, python-format
-msgid "Updated tax code %s.\n"
-""
+#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_report
+#: field:l10n.es.aeat.mod340.intracomunitarias,mod340_id:0
+#: field:l10n.es.aeat.mod340.investment,mod340_id:0
+#: field:l10n.es.aeat.mod340.issued,mod340_id:0
+#: field:l10n.es.aeat.mod340.received,mod340_id:0
+#: view:l10n.es.aeat.mod340.report:0
+msgid "Model 340"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
 #: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_intracomunitarias
-#: field:l10n.es.aeat.mod340.report,intracomunitarias:0
 msgid "Operations Intracomunitarias"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340.tax_line_issued,tax_amount:0
-#: field:l10n.es.aeat.mod340.tax_line_received,tax_amount:0
-msgid "Tax amount"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
 #: view:l10n.es.aeat.mod340.report:0
 #: field:l10n.es.aeat.mod340.report,ean13:0
 msgid "Electronic Code VAT reverse charge"
@@ -216,36 +208,20 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/account.py:98
-#, python-format
-msgid "The Mod 340 field is different.\n"
-""
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
 #: view:l10n.es.aeat.mod340.report:0
 msgid "Identification"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: view:l10n.es.aeat.mod340.report:0
-msgid "295"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340.intracomunitarias:0
+#: view:l10n.es.aeat.mod340.investment:0
 #: view:l10n.es.aeat.mod340.issued:0
 #: view:l10n.es.aeat.mod340.received:0
 msgid "Total Tax"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: model:ir.actions.report.xml,name:l10n_es_aeat_mod340.report_mod340_action
-msgid "mod340 report"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
 #: report:vat book:0
-#: report:vat_book:0
 msgid "LIBRO DE IVA"
 msgstr ""
 
@@ -255,9 +231,41 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:66
-#, python-format
-msgid "This company dont have NIF"
+#: field:l10n.es.aeat.mod340.tax_line_intra,tax_amount:0
+#: field:l10n.es.aeat.mod340.tax_line_investment,tax_amount:0
+#: field:l10n.es.aeat.mod340.tax_line_issued,tax_amount:0
+#: field:l10n.es.aeat.mod340.tax_line_received,tax_amount:0
+msgid "Tax amount"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: field:account.tax,ledger_key:0
+#: field:account.tax,ledger_key_in:0
+#: field:account.tax,ledger_key_out:0
+#: field:account.tax.template,ledger_key:0
+#: field:l10n.es.aeat.mod340.intracomunitarias,ledger_key:0
+#: field:l10n.es.aeat.mod340.investment,ledger_key:0
+#: field:l10n.es.aeat.mod340.issued,ledger_key:0
+#: field:l10n.es.aeat.mod340.received,ledger_key:0
+msgid "Ledger Key"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.tax_line_intra,surcharge_percentage:0
+#: field:l10n.es.aeat.mod340.tax_line_investment,surcharge_percentage:0
+#: field:l10n.es.aeat.mod340.tax_line_issued,surcharge_percentage:0
+#: field:l10n.es.aeat.mod340.tax_line_received,surcharge_percentage:0
+msgid "Surcharge percentage"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: model:ir.model,name:l10n_es_aeat_mod340.model_account_tax
+msgid "Tax"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340.report:0
+msgid "Fiscal Year"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -276,6 +284,11 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: model:ir.model,name:l10n_es_aeat_mod340.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
 #: model:ir.ui.menu,name:l10n_es_aeat_mod340.menu_aeat_mod340_report
 msgid "AEAT 340 Model"
 msgstr ""
@@ -290,7 +303,6 @@
 
 #. module: l10n_es_aeat_mod340
 #: report:vat book:0
-#: report:vat_book:0
 msgid "Nº de factura"
 msgstr ""
 
@@ -303,6 +315,16 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.tax_line_intra,surcharge_amount:0
+#: field:l10n.es.aeat.mod340.tax_line_investment,surcharge_amount:0
+#: field:l10n.es.aeat.mod340.tax_line_issued,surcharge_amount:0
+#: field:l10n.es.aeat.mod340.tax_line_received,surcharge_amount:0
+msgid "Surcharge amount"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: view:account.tax:0
+#: view:account.tax.template:0
 #: model:ir.actions.report.xml,name:l10n_es_aeat_mod340.report_mod340
 msgid "Modelo 340"
 msgstr ""
@@ -318,7 +340,7 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:105
+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:113
 #, python-format
 msgid "The period hasn't a valid Mod340 period"
 msgstr ""
@@ -334,32 +356,24 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_export_to_boe
-msgid "Export AEAT Model 340 to BOE format"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:126
+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:134
 #, python-format
 msgid "The type 1 record must be 500 characters long"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "CIF/NIF:"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_tax_line_issued
-msgid "Mod340 vat lines issued"
+#: field:l10n.es.aeat.mod340.report,calculation_date:0
+msgid "Calculation date"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 msgid "CIF/NIF del representante legal:"
 msgstr ""
 
@@ -373,21 +387,13 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:80
-#, python-format
-msgid "The periods selected don't belong to the fiscal year %s"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
 #: model:ir.actions.act_window,help:l10n_es_aeat_mod340.action_l10n_es_aeat_mod340_report
 msgid "Create and query AEAT Model 340 reports"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "Cuota impuesto"
 msgstr ""
 
@@ -397,31 +403,42 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340.report:0
+msgid "Other intracommunity operations"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 msgid "MODELO AEAT 340"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/account.py:95
-#, python-format
-msgid "The sign field is different.\n"
-""
+#: view:l10n.es.aeat.mod340.investment:0
+#: view:l10n.es.aeat.mod340.report:0
+msgid "Investment goods"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.export_to_boe,state:0
+msgid "unknown"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_tax_line_investment
+msgid "Mod340 vat lines investment"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 msgid "Tipo de declaración"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340.report,calculation_date:0
-msgid "Calculation date"
+#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_tax_line_issued
+msgid "Mod340 vat lines issued"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: model:ir.actions.report.xml,name:l10n_es_aeat_mod340.report_vat_book_action
 #: model:ir.actions.report.xml,name:l10n_es_aeat_mod340.vat_book
 msgid "Vat Book"
 msgstr ""
@@ -432,10 +449,8 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/account.py:185
-#, python-format
-msgid "Tax code %s: The parent tax code %s can not be set.\n"
-""
+#: field:l10n.es.aeat.mod340.report,total_sharetax:0
+msgid "Total Share Tax"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -445,9 +460,7 @@
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "Fecha"
 msgstr ""
 
@@ -457,14 +470,20 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340
-#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_report
-#: field:l10n.es.aeat.mod340.intracomunitarias,mod340_id:0
-#: field:l10n.es.aeat.mod340.investment,mod340_id:0
-#: field:l10n.es.aeat.mod340.issued,mod340_id:0
-#: field:l10n.es.aeat.mod340.received,mod340_id:0
-#: view:l10n.es.aeat.mod340.report:0
-msgid "Model 340"
+#: field:l10n.es.aeat.mod340.investment,prorata:0
+msgid "Definitive yearly prorata"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:115
+#, python-format
+msgid "This company dont have NIF"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_received
+#: field:l10n.es.aeat.mod340.report,received:0
+msgid "Invoices Received"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -484,14 +503,14 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: view:l10n.es.aeat.mod340.issued:0
-#: view:l10n.es.aeat.mod340.received:0
-msgid "Total Base"
+#: code:addons/l10n_es_aeat_mod340/account.py:211
+#, python-format
+msgid "The ledger key is different.\n"
+""
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 msgid "Número de la declaración anterior:"
 msgstr ""
 
@@ -511,18 +530,35 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340.export_to_boe,state:0
-msgid "unknown"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340.report,contact_phone:0
-msgid "Phone"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: field:account.invoice,last_ticket:0
-msgid "Last ticket"
+#: view:l10n.es.aeat.mod340.tax_line_investment:0
+msgid "Tax line investment goods"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: report:report mod340:0
+#: report:vat book:0
+msgid "Teléfono de contacto:"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.tax_line_investment,goods_identification:0
+msgid "Investment goods identification"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.investment,use_date:0
+msgid "Goods use start date"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:260
+#, python-format
+msgid "Invoice %s: Unable to determine the surcharged tax because it is not mapped in the partner's fiscal position %s"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340.tax_line_intra:0
+msgid "Tax line intracommunity"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -537,13 +573,16 @@
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "Ejercicio fiscal:"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: field:account.invoice,last_ticket:0
+msgid "Last ticket"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340.intracomunitarias,partner_country_code:0
 #: field:l10n.es.aeat.mod340.investment,partner_country_code:0
 #: field:l10n.es.aeat.mod340.issued,partner_country_code:0
@@ -572,12 +611,20 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:79
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:58
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:86
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:125
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:259
 #, python-format
 msgid "Error"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340.report:0
+msgid "Susbtitutive/complementary declaration"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340.intracomunitarias,representative_vat:0
 #: field:l10n.es.aeat.mod340.investment,representative_vat:0
 #: field:l10n.es.aeat.mod340.issued,representative_vat:0
@@ -597,14 +644,19 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340.intracomunitarias:0
+msgid "Other Intracommunity Operations"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "Base imponible"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.tax_line_intra,invoice_record_id:0
+#: field:l10n.es.aeat.mod340.tax_line_investment,invoice_record_id:0
 #: field:l10n.es.aeat.mod340.tax_line_received,invoice_record_id:0
 msgid "Invoice received"
 msgstr ""
@@ -651,19 +703,17 @@
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
-#: report:vat book:0
-#: report:vat_book:0
-msgid "Teléfono de contacto:"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: report:report mod340:0
-#: report:report_mod340:0
 msgid "Código electrónico autoliquidación IVA:"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: help:account.tax,ledger_key:0
+#: help:account.tax,ledger_key_in:0
+#: help:account.tax,ledger_key_out:0
+msgid "Determines to which ledger the invoice with this tax will be assigned. Setting a value makes the tax to be accounted in 340 declaration"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
 #: selection:res.partner,vat_type:0
 msgid "5 - Certificado de residencia fiscal"
 msgstr ""
@@ -675,6 +725,8 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.tax_line_intra,tax_percentage:0
+#: field:l10n.es.aeat.mod340.tax_line_investment,tax_percentage:0
 #: field:l10n.es.aeat.mod340.tax_line_issued,tax_percentage:0
 #: field:l10n.es.aeat.mod340.tax_line_received,tax_percentage:0
 msgid "Tax percentage"
@@ -686,6 +738,11 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_tax_line_intra
+msgid "Mod340 vat lines intra-community"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
 #: help:l10n.es.aeat.mod340.report,number_records:0
 #: help:l10n.es.aeat.mod340.report,total:0
 #: help:l10n.es.aeat.mod340.report,total_sharetax:0
@@ -701,14 +758,12 @@
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "CIF/NIF"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:196
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:275
 #, python-format
 msgid "Invoice  %s, Amount untaxed Lines %.2f do not correspond to AmountUntaxed on Invoice %.2f"
 msgstr ""
@@ -719,10 +774,13 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340.report:0
+msgid "322"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "Número de factura"
 msgstr ""
 
@@ -740,8 +798,17 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: field:account.tax,operation_key:0
+#: field:account.tax.template,operation_key:0
+#: field:l10n.es.aeat.mod340.intracomunitarias,operation_key:0
+#: field:l10n.es.aeat.mod340.investment,operation_key:0
+#: field:l10n.es.aeat.mod340.issued,operation_key:0
+#: field:l10n.es.aeat.mod340.received,operation_key:0
+msgid "Operation Key"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
 #: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_investment
-#: field:l10n.es.aeat.mod340.report,investment:0
 msgid "Property Investment"
 msgstr ""
 
@@ -752,12 +819,13 @@
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 msgid "Número:"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340.report,name:0
+#: field:l10n.es.aeat.mod340.tax_line_intra,name:0
+#: field:l10n.es.aeat.mod340.tax_line_investment,name:0
 #: field:l10n.es.aeat.mod340.tax_line_issued,name:0
 #: field:l10n.es.aeat.mod340.tax_line_received,name:0
 msgid "Name"
@@ -777,24 +845,31 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: code:addons/l10n_es_aeat_mod340/account.py:208
+#, python-format
+msgid "The operation key is different.\n"
+""
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.report,investment:0
+msgid "Investment Goods"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 msgid "Tipo de soporte:"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340.report,attach_id:0
-msgid "BOE file"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
 #: view:l10n.es.aeat.mod340.report:0
 msgid "Draft models"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: view:l10n.es.aeat.mod340.report:0
-msgid "Fiscal Year"
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:59
+#, python-format
+msgid "Invoice %s: Unable to determine the tax line %s source tax. The base code of the source tax may have been changed, please recompute the invoice taxes"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -803,16 +878,21 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_received
-#: field:l10n.es.aeat.mod340.report,received:0
-msgid "Invoices Received"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/account.py:92
-#, python-format
-msgid "The info field is different.\n"
-""
+#: field:l10n.es.aeat.mod340.report,intracomunitarias:0
+msgid "Intra-community Operations"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: sql_constraint:l10n.es.aeat.mod340.investment:0
+msgid "The prorata must be between 0 and 100."
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340.intracomunitarias:0
+#: view:l10n.es.aeat.mod340.investment:0
+#: view:l10n.es.aeat.mod340.issued:0
+#: view:l10n.es.aeat.mod340.received:0
+msgid "Total Base"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -827,13 +907,16 @@
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "Empresa"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_export_to_boe
+msgid "Export Report to BOE Format"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
 #: selection:l10n.es.aeat.mod340.report,type:0
 msgid "Complementary"
 msgstr ""
@@ -845,9 +928,7 @@
 
 #. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "Total factura"
 msgstr ""
 
@@ -857,15 +938,20 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: view:account.tax:0
+msgid "onchange_type_tax_use(context)"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
 #: report:report mod340:0
-#: report:report_mod340:0
 #: report:vat book:0
-#: report:vat_book:0
 msgid "FACTURAS DE ENTRADA"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340.intracomunitarias:0
 #: field:l10n.es.aeat.mod340.intracomunitarias,total:0
+#: view:l10n.es.aeat.mod340.investment:0
 #: field:l10n.es.aeat.mod340.investment,total:0
 #: view:l10n.es.aeat.mod340.issued:0
 #: field:l10n.es.aeat.mod340.issued,total:0
@@ -876,12 +962,7 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: model:ir.model,name:l10n_es_aeat_mod340.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:118
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:167
 #, python-format
 msgid "La siguiente empresa no tiene asignado nif:"
 msgstr ""

=== modified file 'l10n_es_aeat_mod340/mod340.py'
--- l10n_es_aeat_mod340/mod340.py	2014-02-24 14:45:52 +0000
+++ l10n_es_aeat_mod340/mod340.py	2014-06-01 16:57:08 +0000
@@ -27,12 +27,10 @@
 
 from openerp.osv import orm, fields
 import time
-from datetime import datetime
-from openerp import netsvc
-from openerp import tools
-import math
-from openerp.tools.translate import _
-from openerp import pooler
+import netsvc
+import tools
+import pooler
+
 
 class l10n_es_aeat_mod340_report(orm.Model):
    
@@ -65,26 +63,34 @@
         return 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)
+        result = dict.fromkeys(ids, 
+                               dict.fromkeys(['number_records','total_taxable','total_sharetax','total'], 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
+            for invoice_rec in model.issued:
+                result[model.id]['number_records'] += len( invoice_rec.tax_line_ids )
+                result[model.id]['total_taxable'] += invoice_rec.base_tax
+                result[model.id]['total_sharetax'] += invoice_rec.amount_tax
+                result[model.id]['total'] += invoice_rec.base_tax + invoice_rec.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
+            for invoice_rec in model.received:
+                result[model.id]['number_records'] += len( invoice_rec.tax_line_ids )
+                result[model.id]['total_taxable'] += invoice_rec.base_tax
+                result[model.id]['total_sharetax'] += invoice_rec.amount_tax
+                result[model.id]['total'] += invoice_rec.base_tax + invoice_rec.amount_tax
+                
+            for invoice_rec in model.investment:
+                result[model.id]['number_records'] += len( invoice_rec.tax_line_ids )
+                result[model.id]['total_taxable'] += invoice_rec.base_tax
+                result[model.id]['total_sharetax'] += invoice_rec.amount_tax
+                result[model.id]['total'] += invoice_rec.base_tax + invoice_rec.amount_tax
+                
+            for invoice_rec in model.intracomunitarias:
+                result[model.id]['number_records'] += len( invoice_rec.tax_line_ids )
+                result[model.id]['total_taxable'] += invoice_rec.base_tax
+                result[model.id]['total_sharetax'] += invoice_rec.amount_tax
+                result[model.id]['total'] += invoice_rec.base_tax + invoice_rec.amount_tax
 
         return result
 
@@ -96,8 +102,8 @@
                                 size=64, string="Name"),
         'declaration_number': fields.char("Declaration number", size=64,
                                           readonly=True),
-        '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',
@@ -109,14 +115,14 @@
                                     'mod340_id','Invoices Received',
                                     states={'done': [('readonly', True)]}),
         'investment': fields.one2many('l10n.es.aeat.mod340.investment',
-                                      'mod340_id','Property Investment'),
+                                      'mod340_id','Investment Goods'),
         'intracomunitarias': fields.one2many(
                              'l10n.es.aeat.mod340.intracomunitarias',
-                             'mod340_id','Operations Intracomunitarias'),
+                             'mod340_id','Intra-community Operations'),
         
         'ean13': fields.char('Electronic Code VAT reverse charge', size=16),
 
-        'total_taxable':  fields.function(_get_number_records, method=True,
+        '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"""),
@@ -132,12 +138,13 @@
             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),
+        'investment_goods_prorating': fields.boolean("Investment goods prorating", 
+            help="If checked, the investment goods invoices will be exported in their ledger. If not, they will be exported as received invoices")
     }
     _defaults = {
-        'number' : lambda *a: '340',
-        'declaration_number' : lambda *a: '340',
-               }
+        'number': '340',
+        'declaration_number': '340',
+    }
 
     def set_done(self, cr, uid, id, *args):
         self.write(cr,uid,id,{'calculation_date': time.strftime('%Y-%m-%d'),
@@ -159,23 +166,70 @@
 class l10n_es_aeat_mod340_issued(orm.Model):
     _name = 'l10n.es.aeat.mod340.issued'
     _description = 'Invoices invoice'
+    
+    def get_ledger_keys(self, cr, uid, context=None):
+        return [('E', u'E-Libro registro de facturas expedidas.'),
+                ('F', u'F-Libro registro de facturas expedidas IGIC.'),
+                ('U', u'U-Libro registro de determinadas operaciones intracomunitarias (envío).')]
+
+    def _get_ledger_keys(self, cr, uid, context=None):
+        return self.get_ledger_keys(cr, uid, context=context)
+    
+    def get_operation_keys(self, cr, uid, context=None):
+        return [(' ', u'Operación habitual'),
+                ('A', u'A-Asiento resumen de facturas'),
+                ('B', u'B-Asiento resumen de tique'),
+                ('C', u'C-Factura con varios asientos (varios tipos impositivos)'),
+                ('D', u'D-Factura rectificativa'),
+                ('E', u'E-IVA/IGIC devengado pendiente de emitir factura'),
+                ('G', u'G-Régimen especial de grupo de entidades en IVA o IGIC'),
+                ('H', u'H-Régimen especial de oro de inversión'),
+                ('I', u'I-Inversión del Sujeto pasivo (ISP)'),
+                ('J', u'J-Tiques'),
+                ('K', u'K-Rectificación de errores registrales'),
+                ('M', u'M-IVA/IGIC facturado pendiente de devengar (emitida factura)'),
+                ('N', u'N-Facturación de las prestaciones de servicios de agencias de viaje que actúan como mediadoras en nombre y por cuenta ajena'),
+                ('O', u'O-Factura emitida en sustitución de tiques facturados y declarados'),
+                ('Q', u'Q-Operaciones a las que se aplique el Régimen especial de bienes usados, objetos de arte, antigüedades y objetos de colección'),
+                ('R', u'R-Operación de arrendamiento de local de negocio'),
+                ('S', u'S-Subvenciones, auxilios o ayudas satisfechas o recibidas, tanto por parte de Administraciones públicas como de entidades privadas'),
+                ('T', u'T-Cobros por cuenta de terceros de honorarios profesionales o de derechos derivados de la propiedad intelectual, industrial, de autor u otros por cuenta de sus socios, asociados o colegiados efectuados por sociedades, asociaciones, colegios profesionales u otras entidades que, entre sus funciones, realicen las de cobro'),
+                ('U', u'U-Operación de seguros'),
+                ('V', u'V-Compras de Agencias viajes'),
+                ('W', u'W-Operaciones sujetas al Impuesto sobre la Producción, los Servicios y la Importación en las Ciudades de Ceuta y Melilla'),
+                ('X', u'X-Operaciones por las que los empresarios o profesionales que satisfagan compensaciones agrícolas, ganaderas y/o pesqueras hayan expedido el recibo correspondiente'),
+                ('Z', u'Z-Régimen especial del criterio de caja'),
+                ('1', u'1-IVA criterio de caja. Asiento resumen de facturas'),
+                ('2', u'2-IVA criterio de caja. Factura con varios asientos (varios tipos impositivos)'),
+                ('3', u'3-IVA criterio de caja. Factura rectificativa'),
+                ('4', u'4-IVA criterio de caja. Adquisiciones realizadas por las agencias de viajes directamente en interés del viajero (Régimen especial de agencia de viajes)'),
+                ('5', u'5-IVA criterio de caja. Factura simplificada'),
+                ('6', u'6-IVA criterio de caja. Rectificación de errores registrales'),
+                ('7', u'7-IVA criterio de caja. Facturación de las prestaciones de servicios de agencias de viaje que actúan como mediadoras en nombre y por cuenta ajena. (Disposición adicional 4.ª RD 1496/2003)'),
+                ('8', u'8-IVA criterio de caja. Operación de arrendamiento de local de negocio.')]
+    
+    def _get_operation_keys(self, cr, uid, context=None):
+        return self.get_operation_keys(cr, uid, context=context)
+    
     _columns = {                        
         'mod340_id': fields.many2one('l10n.es.aeat.mod340.report','Model 340',
                                      ondelete="cascade"),
-        'partner_id':fields.many2one('res.partner','Partner',
+        'partner_id': fields.many2one('res.partner','Partner',
                                      ondelete="cascade"),
-        'partner_vat':fields.char('Company CIF/NIF',size=12),
+        'partner_vat': fields.char('Company CIF/NIF',size=12),
         'representative_vat': fields.char('L.R. VAT number', size=9,
                                       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)),
+        '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),
+        'ledger_key': fields.selection(_get_ledger_keys, 'Ledger Key', required=True, readonly=True),
+        'operation_key': fields.selection(_get_operation_keys, 'Operation Key', required=True, readonly=True),
     }
     
     _order = 'date_invoice asc, invoice_id asc'
@@ -184,20 +238,79 @@
     _name = 'l10n.es.aeat.mod340.received'
     _description = 'Invoices Received'
     _inherit = 'l10n.es.aeat.mod340.issued'
+    
+    def get_ledger_keys(self, cr, uid, context=None):
+        return [('R', u'R-Libro registro de facturas recibidas.'),
+                ('I', u'I-Libro registro de bienes de inversión.'),
+                ('J', u'J-Libro de registro de bienes de inversión IGIC.'),
+                ('S', u'S-Libro de registro de facturas recibidas IGIC.'),
+                ('U', u'U-Libro registro de determinadas operaciones intracomunitarias (recepción).')]
+
+    def _get_ledger_keys(self, cr, uid, context=None):
+        return self.get_ledger_keys(cr, uid, context=context)
+    
+    def get_operation_keys(self, cr, uid, context=None):
+        return  [(' ', u'Operación habitual'),
+                 ('A', u'A-Asiento resumen de facturas'),
+                 ('B', u'B-Asiento resumen de tiques / facturas simplificadas'),
+                 ('C', u'C-Factura con varios asientos(varios tipo impositivos)'),
+                 ('D', u'D-Factura rectificativa'),
+                 ('F', u'F-Adquisiciones realizadas por las agencias de viajes directamente en interés del viajero (Régimen especial de agencias de viajes)'),
+                 ('G', u'G-Régimen especial de grupo de entidades en IVA o IGIC'),
+                 ('H', u'H-Régimen especial de oro de inversión'),
+                 ('I', u'I-Inversión del Sujeto pasivo (ISP)'),
+                 ('J', u'J-Tiques / facturas simplificadas'),
+                 ('K', u'K-Rectificación anotaciones registrales'),
+                 ('L', u'L-Adquisiciones a comerciantes minoristas del IGIC'),
+                 ('P', u'P-Adquisiciones intracomunitarias de bienes.'),
+                 ('Q', u'Q-Operaciones a las que se aplique el régimen especial de bienes usados, ...'),
+                 ('R', u'R-Operación de arrendamiento de local de negocio.'),
+                 ('S', u'S-Subvenciones, auxilios o ayudas satisfechas o recibidas, tanto por parte de Administraciones públicas como de entidades privadas.'),
+                 ('W', u'W-Operaciones sujetas al Impuesto sobre la Producción, los Servicios y la Importación en las Ciudades de Ceuta y Melilla.'),
+                 ('X', u'X-Operaciones por las que los empresarios o profesionales que satisfagan compensaciones agrícolas, ganaderas y/o pesqueras hayan expedido el recibo correspondiente.'),
+                 ('Z', u'Z-Régimen especial del criterio de caja.'),
+                 ('1', u'1-IVA criterio de caja. Asiento resumen de facturas.'),
+                 ('2', u'2-IVA criterio de caja. Factura con varios asientos (varios tipos impositivos).'),
+                 ('3', u'3-IVA criterio de caja. Factura rectificativa.'),
+                 ('4', u'4-IVA criterio de caja. Adquisiciones realizadas por las agencias de viajes directamente en interés del viajero (Régimen especial de agencias de viajes.'),
+                 ('5', u'5-IVA criterio de caja. Factura simplificada.'),
+                 ('6', u'6-IVA criterio de caja. Rectificación de errores registrales.'),
+                 ('7', u'7-IVA criterio de caja. Facturación de las prestaciones de servicios de agencias de viaje que actúan como mediadoras en nombre y por cuenta ajena (Disposición adicional 4ª RD 1496/2003).'),
+                 ('8', u'8-IVA criterio de caja. Operación de arrendamiento de local de negocio.')]
+ 
+    def _get_operation_keys(self, cr, uid, context=None):
+        return self.get_operation_keys(cr, uid, context=context)
+    
     _columns = {
-        'tax_line_ids':fields.one2many('l10n.es.aeat.mod340.tax_line_received',
+        'tax_line_ids': fields.one2many('l10n.es.aeat.mod340.tax_line_received',
                                        'invoice_record_id', 'Tax lines'),
+        'ledger_key': fields.selection(_get_ledger_keys, 'Ledger Key', required=True, readonly=True),
+        'operation_key': fields.selection(_get_operation_keys, 'Operation Key', required=True),
     }
 
 class l10n_es_aeat_mod340_investment(orm.Model):
     _name = 'l10n.es.aeat.mod340.investment'
     _description = 'Property Investment'
-    _inherit = 'l10n.es.aeat.mod340.issued'
+    _inherit = 'l10n.es.aeat.mod340.received'
+    
+    _columns = {
+        'tax_line_ids': fields.one2many('l10n.es.aeat.mod340.tax_line_investment',
+                                        'invoice_record_id', 'Tax lines'),
+        'use_date': fields.date("Goods use start date"),
+        'prorata': fields.integer("Definitive yearly prorata"), 
+    }
+    
+    _sql_constraints = [('prorata_range','check(prorata >= 0 and prorata <= 100)','The prorata must be between 0 and 100.')]
 
 class l10n_es_aeat_mod340_intracomunitarias(orm.Model):
     _name = 'l10n.es.aeat.mod340.intracomunitarias'
     _description = 'Operations Intracomunitarias'
     _inherit = 'l10n.es.aeat.mod340.issued'
+    
+    _columns = {
+        'tax_line_ids': fields.one2many('l10n.es.aeat.mod340.tax_line_intra',
+                                        'invoice_record_id', 'Tax lines'),  
+    }
 
 class l10n_es_aeat_mod340_tax_line_issued(orm.Model):
     _name = 'l10n.es.aeat.mod340.tax_line_issued'
@@ -209,6 +322,8 @@
         '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),
+        'surcharge_percentage': fields.float('Surcharge percentage',digits=(0,2)),
+        'surcharge_amount': fields.float('Surcharge amount',digits=(13,2)),
     }
 
 class l10n_es_aeat_mod340_tax_line_received(orm.Model):
@@ -219,3 +334,24 @@
         'invoice_record_id': fields.many2one('l10n.es.aeat.mod340.received',
              'Invoice received', required=True, ondelete="cascade", select=1),
     }
+    
+class l10n_es_aeat_mod340_tax_line_investment(orm.Model):
+    _name = 'l10n.es.aeat.mod340.tax_line_investment'
+    _description = 'Mod340 vat lines investment'
+    _inherit = 'l10n.es.aeat.mod340.tax_line_issued'
+    _columns = {
+        'invoice_record_id': fields.many2one('l10n.es.aeat.mod340.investment',
+             'Invoice received', required=True, ondelete="cascade", select=1),
+        'goods_identification': fields.char("Investment goods identification", size=17),
+    }
+
+    
+
+class l10n_es_aeat_mod340_tax_line_intra(orm.Model):
+    _name = 'l10n.es.aeat.mod340.tax_line_intra'
+    _description = 'Mod340 vat lines intra-community'
+    _inherit = 'l10n.es.aeat.mod340.tax_line_issued'
+    _columns = {
+        'invoice_record_id': fields.many2one('l10n.es.aeat.mod340.intracomunitarias',
+             'Invoice received', required=True, ondelete="cascade", select=1),
+    }

=== modified file 'l10n_es_aeat_mod340/mod340_view.xml'
--- l10n_es_aeat_mod340/mod340_view.xml	2014-03-20 00:33:19 +0000
+++ l10n_es_aeat_mod340/mod340_view.xml	2014-06-01 16:57:08 +0000
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+<<<<<<< TREE
         <!-- Modelo 340 -->
         <record model="ir.ui.view" id="view_l10n_es_aeat_mod340_tree">
             <field name="name">l10n.es.aeat.mod340.tree</field>
@@ -17,11 +18,30 @@
             </field>
         </record>
     
+=======
+		<!-- Modelo 340 -->
+		<record model="ir.ui.view" id="view_l10n_es_aeat_mod340_tree">
+			<field name="name">l10n.es.aeat.mod340.tree</field>
+			<field name="model">l10n.es.aeat.mod340.report</field>
+			<field name="arch" type="xml">
+	            <tree string="Model 340">
+	                <field name="fiscalyear_id"/>
+	                <field name="period_from"/>
+	                <field name="period_to"/>
+	                <field name="number"/>
+	                <field name="type"/>
+	                <field name="state" invisible="1"/>
+	            </tree>
+			</field>
+		</record>
+	
+>>>>>>> MERGE-SOURCE
         <record id="view_l10n_es_aeat_mod340_form" model="ir.ui.view">
             <field name="name">l10n_es.aeat.mod340.form</field>
             <field name="model">l10n.es.aeat.mod340.report</field>
             <field name="inherit_id" ref="l10n_es_aeat.view_l10n_es_aeat_report_form"/>
             <field name="arch" type="xml">
+<<<<<<< TREE
                 <button name="%(l10n_es_aeat.action_wizard_aeat_export)d" position="attributes">
                     <attribute name="name">%(action_wizard_aeat_mod340_export)d</attribute>
                 </button>
@@ -183,6 +203,328 @@
         </record>
     
         <record id="view_l10n_es_aeat_mod340_report_search" model="ir.ui.view">
+=======
+		        <button name="%(l10n_es_aeat.action_wizard_aeat_export)d" position="attributes">
+		            <attribute name="name">%(action_wizard_aeat_mod340_export)d</attribute>
+		        </button>
+	            <field name="fiscalyear_id" position="after">
+					<field name="period_from" required="1" domain="[('fiscalyear_id','=',fiscalyear_id)]"/>
+					<field name="period_to" required="1" domain="[('fiscalyear_id','=',fiscalyear_id)]"/>
+	            </field>
+	            <field name="calculation_date" position="after">
+	              	<field name="declaration_number"/>
+	               	<field name="support_type"/>
+	               	<field name="investment_goods_prorating"/>
+	            </field>
+				<group string="Declaración" position="after">
+	                <notebook colspan="4">
+	                    <page string="General">
+	                        <group string="Identification" colspan="4">
+	                            <field name="phone_contact" />
+	                            <field name="name_contact" />
+	                            <field name="representative_vat" />
+	                        </group>
+	                        <group string="Susbtitutive/complementary declaration" colspan="4">
+	                            <field name="type"/>
+	                            <field name="previous_number"/>
+	                        </group>
+	                        <group string="Electronic Code VAT reverse charge" colspan="4">
+	                            <field name="ean13" nolabel="1"/>
+	                        </group>
+	                        <group string="Summary" colspan="4">
+	                    			<field name="number_records"/>
+	                    			<field name="total_taxable"/>
+	                    			<field name="total_sharetax"/>
+	                    			<field name="total"/>
+	                    		</group>
+	                    		<group colspan="4" col="10">                                
+	                        </group>
+	                    </page>
+	                    <page string="Issued invoice">
+	                        <field name="issued" nolabel="1" />
+	                    </page>
+	                    <page string="Received invoice">
+	                        <field name="received" nolabel="1" /> 
+	                    </page>
+	                    <page string="Investment goods">
+	                    	<field name="investment" nolabel="1"/>
+	                    </page>
+	                    <!-- TODO: intracommunity-->
+	                    <page string="Other intracommunity operations" invisible="1">
+	                    	<field name="intracomunitarias" nolabel="1"/>
+	                    </page>
+	                </notebook>
+				</group>
+	         </field>
+		</record>
+		<!-- FIN Modelo 340 -->
+	
+	
+	    <!--Invoice Issued-->
+	    
+	    <record id="view_l10n_es_aeat_mod340_invoice_issued_tree" model="ir.ui.view">
+	        <field name="name">l10n.es.aeat.mod340.issued.tree</field>
+	        <field name="model">l10n.es.aeat.mod340.issued</field>
+	        <field name="arch" type="xml">
+	            <tree string="Issued invoices">
+	            	<field name="date_invoice"/>
+	                <field name="partner_id"/>
+	                <field name="operation_key"/>
+	                <field name="partner_country_code"/>
+	                <field name="partner_vat"/>
+	                <field name="invoice_id"/>
+	                <field name="base_tax" sum="Total Base" />
+	                <field name="amount_tax" sum="Total Tax" />
+	                <field name="total" sum="Total"/>
+	            </tree>   
+	        </field>
+	    </record>
+	    
+	    <record id="view_l10n_es_aeat_mod340_invoice_issued_form" model="ir.ui.view">
+	        <field name="name">l10n.es.aeat.mod340.issued.form</field>
+	        <field name="model">l10n.es.aeat.mod340.issued</field>
+	        <field name="arch" type="xml">
+	            <form string="Issued invoices">
+	                <field name="invoice_id"/>
+	                <newline/>
+	                <field name="partner_id"/>
+	                <field name="partner_vat"/>
+	                <field name="representative_vat"/>
+	                <field name="partner_country_code"/>
+	                <newline/>
+	                <field name="base_tax" />
+	                <field name="amount_tax" />
+	                <newline/>
+	                <field name="total"/>
+	                <field name="ledger_key"/>
+	                <field name="tax_line_ids"/>
+	                <field name="operation_key"/>
+	            </form>   
+	        </field>
+	    </record>
+	
+	    <!--Invoice Received-->
+	    
+	    <record id="view_l10n_es_aeat_mod340_invoice_received_tree" model="ir.ui.view">
+	        <field name="name">l10n.es.aeat.mod340.received.tree</field>
+	        <field name="model">l10n.es.aeat.mod340.received</field>
+	        <field name="arch" type="xml">
+	            <tree string="Received invoices">
+	                <field name="partner_id"/>
+	                <field name="operation_key"/>
+	                <field name="partner_country_code"/>
+	                <field name="partner_vat"/>
+	                <field name="invoice_id"/>
+	                <field name="base_tax" sum="Total Base"/>
+	                <field name="amount_tax" sum="Total Tax"/>
+	                <field name="total" sum="Total"/>
+	            </tree>   
+	        </field>
+	    </record>
+	    
+	    <record id="view_l10n_es_aeat_mod340_invoice_received_form" model="ir.ui.view">
+	        <field name="name">l10n.es.aeat.mod340.received.form</field>
+	        <field name="model">l10n.es.aeat.mod340.received</field>
+	        <field name="arch" type="xml">
+	            <form string="Received invoices">
+	                <field name="invoice_id"/>
+	                <newline/>
+	                <field name="partner_id"/>
+	                <field name="partner_vat"/>
+	                <field name="representative_vat"/>
+	                <field name="partner_country_code"/>
+	                <newline/>
+	                <field name="base_tax"/>
+	                <field name="amount_tax"/>
+	                <newline/>
+	                <field name="total"/>
+	                <field name="ledger_key"/>
+	                <field name="tax_line_ids"/>
+	                <field name="operation_key"/>
+	            </form>   
+	        </field>
+	    </record>
+	    
+	    <!--Investment goods -->
+	    
+	    <record id="view_l10n_es_aeat_mod340_invoice_investment_tree" model="ir.ui.view">
+	        <field name="name">l10n.es.aeat.mod340.investment.tree</field>
+	        <field name="model">l10n.es.aeat.mod340.investment</field>
+	        <field name="arch" type="xml">
+	            <tree string="Investment goods">
+	                <field name="partner_id"/>
+	                <field name="operation_key"/>
+	                <field name="partner_country_code"/>
+	                <field name="partner_vat"/>
+	                <field name="invoice_id"/>
+	                <field name="base_tax" sum="Total Base"/>
+	                <field name="amount_tax" sum="Total Tax"/>
+	                <field name="total" sum="Total"/>
+	            </tree>   
+	        </field>
+	    </record>
+	    
+	    <record id="view_l10n_es_aeat_mod340_invoice_investment_form" model="ir.ui.view">
+	        <field name="name">l10n.es.aeat.mod340.investment.form</field>
+	        <field name="model">l10n.es.aeat.mod340.investment</field>
+	        <field name="arch" type="xml">
+	            <form string="Investment goods">
+	            	<group>
+	            		<field name="invoice_id"/>
+	            		<field name="partner_id"/>
+	            		<field name="representative_vat"/>
+	            		<field name="base_tax"/>
+	            		<field name="amount_tax"/>
+	            		<field name="total"/>
+	            		<field name="tax_line_ids"/>
+	            	</group>
+	            	<group>
+	            		<field name="partner_vat"/>
+	            		<field name="partner_country_code"/>
+	            		<field name="ledger_key"/>
+	            		<field name="operation_key"/>
+	            		<field name="use_date"/>
+	            		<field name="prorata"/>
+					</group>
+	            </form>   
+	        </field>
+	    </record>
+	    
+	    <!--Other Intracommunity Operations -->
+	    
+	    <record id="view_l10n_es_aeat_mod340_invoice_intra_tree" model="ir.ui.view">
+	        <field name="name">l10n.es.aeat.mod340.intra.tree</field>
+	        <field name="model">l10n.es.aeat.mod340.intracomunitarias</field>
+	        <field name="arch" type="xml">
+	            <tree string="Other Intracommunity Operations">
+	                <field name="partner_id"/>
+	                <field name="operation_key"/>
+	                <field name="partner_country_code"/>
+	                <field name="partner_vat"/>
+	                <field name="invoice_id"/>
+	                <field name="base_tax" sum="Total Base"/>
+	                <field name="amount_tax" sum="Total Tax"/>
+	                <field name="total" sum="Total"/>
+	            </tree>   
+	        </field>
+	    </record>
+	    
+	    <record id="view_l10n_es_aeat_mod340_invoice_intra_form" model="ir.ui.view">
+	        <field name="name">l10n.es.aeat.mod340.intra.form</field>
+	        <field name="model">l10n.es.aeat.mod340.intracomunitarias</field>
+	        <field name="arch" type="xml">
+	            <form string="Other Intracommunity Operations">
+	                <field name="invoice_id"/>
+	                <newline/>
+	                <field name="partner_id"/>
+	                <field name="partner_vat"/>
+	                <field name="representative_vat"/>
+	                <field name="partner_country_code"/>
+	                <newline/>
+	                <field name="base_tax"/>
+	                <field name="amount_tax"/>
+	                <newline/>
+	                <field name="total"/>
+	                <field name="ledger_key"/>
+	                <field name="tax_line_ids"/>
+	                <field name="operation_key"/>
+	            </form>   
+	        </field>
+	    </record>
+	    
+	    
+	    <!--Vat Lines-->
+	    
+	    <record id="view_l10n_es_aeat_mod340_tax_line_issued_form" model="ir.ui.view">
+	        <field name="name">l10n.es.aeat.mod340.tax_line_issued.form</field>
+	        <field name="model">l10n.es.aeat.mod340.tax_line_issued</field>
+	        <field name="arch" type="xml">
+	            <form string="Tax line issued">
+	            	<group>
+	            		<field name="name"/>
+	            		<field name="base_amount"/>
+	            		<field name="tax_percentage"/>
+		                <field name="tax_amount"/>
+	            	</group>
+	                <group>
+						<separator colspan="2"/>
+						<separator colspan="2"/>
+						<separator colspan="2"/>
+	                	<field name="surcharge_percentage"/>
+		                <field name="surcharge_amount"/>
+	                </group>
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record id="view_l10n_es_aeat_mod340_tax_line_issued_tree" model="ir.ui.view">
+	        <field name="name">l10n.es.aeat.mod340.tax_line_issued.tree</field>
+	        <field name="model">l10n.es.aeat.mod340.tax_line_issued</field>
+	        <field name="arch" type="xml">
+	            <tree string="Tax line issued">
+	            	<field name="name"/>
+	            	<field name="surcharge_percentage"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record id="view_l10n_es_aeat_mod340_tax_line_received_form" model="ir.ui.view">
+	        <field name="name">l10n.es.aeat.mod340.tax_line_received.form</field>
+	        <field name="model">l10n.es.aeat.mod340.tax_line_received</field>
+	        <field name="arch" type="xml">
+	            <form string="Tax line received">
+	                <group>
+	            		<field name="name"/>
+	            		<field name="base_amount"/>
+	            		<field name="tax_percentage"/>
+		                <field name="tax_amount"/>
+	            	</group>
+	                <group>
+						<separator colspan="2"/>
+						<separator colspan="2"/>
+						<separator colspan="2"/>
+	                	<field name="surcharge_percentage"/>
+		                <field name="surcharge_amount"/>
+	                </group>
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record id="view_l10n_es_aeat_mod340_tax_line_investment_form" model="ir.ui.view">
+	        <field name="name">l10n.es.aeat.mod340.tax_line_investment.form</field>
+	        <field name="model">l10n.es.aeat.mod340.tax_line_investment</field>
+	        <field name="arch" type="xml">
+	            <form string="Tax line investment goods">
+	                <group>
+	            		<field name="name"/>
+	            		<field name="base_amount"/>
+	            		<field name="tax_percentage"/>
+		                <field name="tax_amount"/>
+	            	</group>
+	            	<group>
+	            		<field name="goods_identification"/>
+	            	</group>
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record id="view_l10n_es_aeat_mod340_tax_line_intra_form" model="ir.ui.view">
+	        <field name="name">l10n.es.aeat.mod340.tax_line_intra.form</field>
+	        <field name="model">l10n.es.aeat.mod340.tax_line_intra</field>
+	        <field name="arch" type="xml">
+	            <form string="Tax line intracommunity">
+	                <group>
+	            		<field name="name"/>
+	            		<field name="base_amount"/>
+	            		<field name="tax_percentage"/>
+		                <field name="tax_amount"/>
+	            	</group>
+	            </form>
+	        </field>
+	    </record>
+	
+		<record id="view_l10n_es_aeat_mod340_report_search" model="ir.ui.view">
+>>>>>>> MERGE-SOURCE
             <field name="name">AEAT Model 340 (search)</field>
             <field name="model">l10n.es.aeat.mod340.report</field>
             <field name="arch" type="xml">

=== modified file 'l10n_es_aeat_mod340/res_partner.py'
--- l10n_es_aeat_mod340/res_partner.py	2014-02-09 16:33:45 +0000
+++ l10n_es_aeat_mod340/res_partner.py	2014-06-01 16:57:08 +0000
@@ -26,9 +26,7 @@
 from openerp.osv import orm, fields
 
 class res_partner(orm.Model):
-    """
-    Extends the partners to add the include_in_mod347 field
-    """
+
     _inherit = "res.partner"
     
     _columns = {

=== modified file 'l10n_es_aeat_mod340/security/ir.model.access.csv'
--- l10n_es_aeat_mod340/security/ir.model.access.csv	2014-02-09 16:33:45 +0000
+++ l10n_es_aeat_mod340/security/ir.model.access.csv	2014-06-01 16:57:08 +0000
@@ -6,3 +6,5 @@
 access_l10n_es_aeat_mod340_intracomunitarias_manager,l10n_es_aeat_mod340_intracomunitarias manager,model_l10n_es_aeat_mod340_intracomunitarias,l10n_es_aeat.group_account_aeat,1,1,1,1
 access_l10n_es_aeat_mod340_tax_line_issued,l10n_es_aeat_mod340_tax_line_issued,model_l10n_es_aeat_mod340_tax_line_issued,l10n_es_aeat.group_account_aeat,1,1,1,1
 access_l10n_es_aeat_mod340_tax_line_received,l10n_es_aeat_mod340_tax_line_received,model_l10n_es_aeat_mod340_tax_line_received,l10n_es_aeat.group_account_aeat,1,1,1,1
+access_l10n_es_aeat_mod340_tax_line_investment,l10n_es_aeat_mod340_tax_line_investment,model_l10n_es_aeat_mod340_tax_line_investment,l10n_es_aeat.group_account_aeat,1,1,1,1
+access_l10n_es_aeat_mod340_tax_line_intra,l10n_es_aeat_mod340_tax_line_intra,model_l10n_es_aeat_mod340_tax_line_intra,l10n_es_aeat.group_account_aeat,1,1,1,1

=== added file 'l10n_es_aeat_mod340/taxes_common.xml'
--- l10n_es_aeat_mod340/taxes_common.xml	1970-01-01 00:00:00 +0000
+++ l10n_es_aeat_mod340/taxes_common.xml	2014-06-01 16:57:08 +0000
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+        <!-- Plantilla común de impuestos para España.
+        
+        Cargamos las claves para los impuestos presentes en l10n_es rev XXXXXX
+        
+        TODO: poner revisión o fecha cuando se mergee la refactorización que ha hecho Pedro
+        https://code.launchpad.net/~pedro.baeza/openerp-spain/7.0-l10n_es-refactorized/+merge/196807
+        -->
+
+		<!-- NUEVOS (mover a su sitio) -->
+		<!-- 12% IVA Soportado régimen agricultura -->
+		<record id="l10n_es.iva_sop_12_agr" model="account.tax.template">
+        	<field name="ledger_key">R</field>
+        	<field name="operation_key">X</field>
+        </record>
+        <!-- IVA 21% Intracomunitario. Servicios -->
+        <record id="l10n_es.iva_IC_compras_21_sv" model="account.tax.template">
+            <field name="ledger_key">R</field>
+        	<field name="operation_key">I</field>
+        </record>
+        <!-- IVA 21% Intracomunitario. Servicios (1) -->
+        <record id="l10n_es.iva_IC_compras_21_sv_1" model="account.tax.template">
+            <field name="ledger_key">R</field>
+        	<field name="operation_key">I</field>
+        </record>
+        <!-- IVA 21% Intracomunitario. Servicios (2) -->
+        <record id="l10n_es.iva_IC_compras_21_sv_2" model="account.tax.template">
+            <field name="ledger_key">R</field>
+        	<field name="operation_key">I</field>
+        </record>
+        <!-- FIN NUEVOS -->
+
+        <!-- IVA soportado -->
+		<!-- 4% IVA Soportado (operaciones corrientes) -->
+        <record id="l10n_es.iva_sop_4" model="account.tax.template">
+        	<field name="ledger_key">R</field>
+        </record>
+
+		<!-- 4% IVA Soportado (bienes de inversión) -->
+        <record id="l10n_es.iva_sop_4_inv" model="account.tax.template">
+            <field name="ledger_key">I</field>
+        </record>
+
+		<!-- 10% IVA Soportado (operaciones corrientes) -->
+        <record id="l10n_es.iva_sop_10" model="account.tax.template">
+            <field name="ledger_key">R</field>
+        </record>
+
+		<!-- 10% IVA Soportado (bienes de inversión) -->
+        <record id="l10n_es.iva_sop_10_inv" model="account.tax.template">
+			<field name="ledger_key">I</field>
+        </record>
+
+		<!-- 21% IVA Soportado (operaciones corrientes) -->
+        <record id="l10n_es.iva_sop_21" model="account.tax.template">
+			<field name="ledger_key">R</field>
+        </record>
+
+		<!-- 21% IVA Soportado (bienes de inversión) -->
+        <record id="l10n_es.iva_sop_21_inv" model="account.tax.template">
+            <field name="ledger_key">I</field>
+        </record>
+
+        <!-- Plantillas para Extracomunitario-->
+        <!-- IVA compras -->
+        <!-- IVA 0% Importaciones bienes corrientes -->
+        <record id="l10n_es.iva_X0_compras_bc" model="account.tax.template">
+            <field name="ledger_key">R</field>
+        </record>
+        <!-- IVA 0% Importaciones bienes de inversión -->
+        <record id="l10n_es.iva_X0_compras_bi" model="account.tax.template">
+            <field name="ledger_key">I</field>
+        </record>
+		<!-- IVA 4% Importaciones bienes corrientes -->
+        <record id="l10n_es.iva_X4_compras_bc" model="account.tax.template">
+            <field name="ledger_key">R</field>
+        </record>
+        <!-- IVA 4% Importaciones bienes de inversión -->
+        <record id="l10n_es.iva_X4_compras_bi" model="account.tax.template">
+            <field name="ledger_key">I</field>
+        </record>
+		<!-- IVA 10% Importaciones bienes corrientes -->
+        <record id="l10n_es.iva_X10_compras_bc" model="account.tax.template">
+            <field name="ledger_key">R</field>
+        </record>
+        <!-- IVA 10% Importaciones bienes de inversión -->
+        <record id="l10n_es.iva_X10_compras_bi" model="account.tax.template">
+            <field name="ledger_key">I</field>
+        </record>
+		<!-- IVA 21% Importaciones bienes corrientes -->
+        <record id="l10n_es.iva_X21_compras_bc" model="account.tax.template">
+            <field name="ledger_key">R</field>
+        </record>
+        <!-- IVA 21% Importaciones bienes de inversión -->
+        <record id="l10n_es.iva_X21_compras_bi" model="account.tax.template">
+            <field name="ledger_key">I</field>
+        </record>
+
+        <!-- IVA EXPORTACIONES (VENTAS )-->
+        <!-- IVA 0% Exportaciones -->
+        <record id="l10n_es.iva_X0" model="account.tax.template">
+            <field name="ledger_key">E</field>
+        </record>
+
+        <!-- Inversión del sujeto pasivo -->
+        <!-- IVA 21% Inversión del sujeto pasivo -->
+        <record id="l10n_es.iva_ISP_compras_21" model="account.tax.template">
+            <field name="ledger_key">R</field>
+            <field name="operation_key">I</field>
+        </record>
+        <!-- IVA 21% Inversión del sujeto pasivo (1) -->
+        <record id="l10n_es.iva_ISP_compras_21_1" model="account.tax.template">
+            <field name="ledger_key">R</field>
+            <field name="operation_key">I</field>
+        </record>
+        <!-- IVA 21% Inversión del sujeto pasivo (2) -->
+        <record id="l10n_es.iva_ISP_compras_21_2" model="account.tax.template">
+            <field name="ledger_key">R</field>
+            <field name="operation_key">I</field>
+        </record>
+        <!-- IVA 21% Inversión del sujeto pasivo (3) -->
+        <record id="l10n_es.iva_ISP_compras_21_3" model="account.tax.template">
+            <field name="ledger_key">R</field>
+            <field name="operation_key">I</field>
+        </record>
+
+        <!-- IVA REPERCUTIDO-->
+        <!-- IVA 4% -->
+        <record id="l10n_es.iva_rep_4" model="account.tax.template">
+            <field name="ledger_key">E</field>
+        </record>
+		<!-- IVA 10% -->
+        <record id="l10n_es.iva_rep_10" model="account.tax.template">
+            <field name="ledger_key">E</field>
+        </record>
+		<!-- IVA 21% -->
+        <record id="l10n_es.iva_rep_21" model="account.tax.template">
+            <field name="ledger_key">E</field>
+        </record>
+
+        <!-- Plantillas para recargo de equivalencia-->
+        <!-- 0.50% Recargo Equivalencia Ventas -->
+        <record id="l10n_es.re_05" model="account.tax.template">
+            <field name="ledger_key">E</field>
+            <field name="operation_key">-</field>
+        </record>
+		<!-- 1.4% Recargo Equivalencia Ventas -->
+        <record id="l10n_es.re_14" model="account.tax.template">
+            <field name="ledger_key">E</field>
+            <field name="operation_key">-</field>
+        </record>
+		<!-- 5.2% Recargo Equivalencia Ventas -->
+        <record id="l10n_es.re_52" model="account.tax.template">
+            <field name="ledger_key">E</field>
+            <field name="operation_key">-</field>
+        </record>
+		<!-- 0.50% Recargo Equivalencia Compras -->
+        <record id="l10n_es.re_buy_05" model="account.tax.template">
+            <field name="ledger_key">R</field>
+            <field name="operation_key">-</field>
+        </record>
+		<!-- 1.4% Recargo Equivalencia Compras -->
+        <record id="l10n_es.re_buy_14" model="account.tax.template">
+            <field name="ledger_key">R</field>
+            <field name="operation_key">-</field>
+        </record>
+		<!-- 5.2% Recargo Equivalencia Compras -->
+        <record id="l10n_es.re_buy_52" model="account.tax.template">
+            <field name="ledger_key">R</field>
+            <field name="operation_key">-</field>
+        </record>
+
+        <!-- OPERACIONES INTRACOMUNITARIAS -->
+
+        <!-- VENTAS -->
+        <!-- IVA 0% Intracomunitario -->
+        <record id="l10n_es.iva_IO" model="account.tax.template">
+            <field name="ledger_key">E</field>
+        </record>
+
+        <!-- COMPRAS -->
+		<!-- IVA 4% Intracomunitario. Bienes corrientes -->
+        <record id="l10n_es.iva_IC_compras_4_bc" model="account.tax.template">
+            <field name="ledger_key">R</field>
+            <field name="operation_key">P</field>
+        </record>
+        <!-- IVA 4% Intracomunitario. Bienes corrientes (1) -->
+        <record id="l10n_es.iva_IC_compras_4_bc_1" model="account.tax.template">
+            <field name="ledger_key">R</field>
+            <field name="operation_key">P</field>
+        </record>
+        <!-- IVA 4% Intracomunitario. Bienes corrientes (2) -->
+        <record id="l10n_es.iva_IC_compras_4_bc_2" model="account.tax.template">
+            <field name="ledger_key">R</field>
+            <field name="operation_key">P</field>
+        </record>
+		<!-- IVA 4% Intracomunitario. Bienes de inversión -->
+        <record id="l10n_es.iva_IC_compras_4_bi" model="account.tax.template">
+            <field name="ledger_key">I</field>
+            <field name="operation_key">P</field>
+        </record>
+        <!-- IVA 4% Intracomunitario. Bienes de inversión (1) -->
+        <record id="l10n_es.iva_IC_compras_4_bi_1" model="account.tax.template">
+            <field name="ledger_key">I</field>
+            <field name="operation_key">P</field>
+        </record>
+        <!-- IVA 4% Intracomunitario. Bienes de inversión (2) -->
+        <record id="l10n_es.iva_IC_compras_4_bi_2" model="account.tax.template">
+            <field name="ledger_key">I</field>
+            <field name="operation_key">P</field>
+        </record>
+		<!-- IVA 10% Intracomunitario. Bienes corrientes -->
+        <record id="l10n_es.iva_IC_compras_10_bc" model="account.tax.template">
+            <field name="ledger_key">R</field>
+            <field name="operation_key">P</field>
+        </record>
+        <!-- IVA 10% Intracomunitario. Bienes corrientes (1) -->
+        <record id="l10n_es.iva_IC_compras_10_bc_1" model="account.tax.template">
+            <field name="ledger_key">R</field>
+            <field name="operation_key">P</field>
+        </record>
+        <!-- IVA 10% Intracomunitario. Bienes corrientes (2) -->
+        <record id="l10n_es.iva_IC_compras_10_bc_2" model="account.tax.template">
+            <field name="ledger_key">R</field>
+            <field name="operation_key">P</field>
+        </record>
+		<!-- IVA 10% Intracomunitario. Bienes de inversión -->
+        <record id="l10n_es.iva_IC_compras_10_bi" model="account.tax.template">
+            <field name="ledger_key">I</field>
+            <field name="operation_key">P</field>
+        </record>
+        <!-- IVA 10% Intracomunitario. Bienes de inversión (1) -->
+        <record id="l10n_es.iva_IC_compras_10_bi_1" model="account.tax.template">
+            <field name="ledger_key">I</field>
+            <field name="operation_key">P</field>
+        </record>
+        <!-- IVA 10% Intracomunitario. Bienes de inversión (2) -->
+        <record id="l10n_es.iva_IC_compras_10_bi_2" model="account.tax.template">
+            <field name="ledger_key">I</field>
+            <field name="operation_key">P</field>
+        </record>
+		<!-- IVA 21% Intracomunitario. Bienes corrientes -->
+        <record id="l10n_es.iva_IC_compras_21_bc" model="account.tax.template">
+            <field name="ledger_key">R</field>
+            <field name="operation_key">P</field>
+        </record>
+        <!-- IVA 21% Intracomunitario. Bienes corrientes (1) -->
+        <record id="l10n_es.iva_IC_compras_21_bc_1" model="account.tax.template">
+            <field name="ledger_key">R</field>
+            <field name="operation_key">P</field>
+        </record>
+        <!-- IVA 21% Intracomunitario. Bienes corrientes (2) -->
+        <record id="l10n_es.iva_IC_compras_21_bc_2" model="account.tax.template">
+            <field name="ledger_key">R</field>
+            <field name="operation_key">P</field>
+        </record>
+		<!-- IVA 21% Intracomunitario. Bienes de inversión -->
+        <record id="l10n_es.iva_IC_compras_21_bi" model="account.tax.template">
+            <field name="ledger_key">I</field>
+            <field name="operation_key">P</field>
+        </record>
+        <!-- IVA 21% Intracomunitario. Bienes de inversión (1) -->
+        <record id="l10n_es.iva_IC_compras_21_bi_1" model="account.tax.template">
+            <field name="ledger_key">I</field>
+            <field name="operation_key">P</field>
+        </record>
+        <!-- IVA 21% Intracomunitario. Bienes de inversión (2) -->
+        <record id="l10n_es.iva_IC_compras_21_bi_2" model="account.tax.template">
+            <field name="ledger_key">I</field>
+            <field name="operation_key">P</field>
+        </record>
+		<!-- IVA Soportado exento (operaciones corrientes) -->
+        <record id="l10n_es.iva_sop_ex" model="account.tax.template">
+            <field name="ledger_key">R</field>
+        </record>
+		<!-- IVA Exento -->
+        <record id="l10n_es.iva_rep_ex" model="account.tax.template">
+            <field name="ledger_key">E</field>
+        </record>
+
+    </data>
+</openerp>

=== renamed file 'l10n_es_aeat_mod340/taxes_data.xml' => 'l10n_es_aeat_mod340/taxes_data.xml.THIS'
=== modified file 'l10n_es_aeat_mod340/wizard/calculate_mod340_records.py'
--- l10n_es_aeat_mod340/wizard/calculate_mod340_records.py	2014-02-24 14:45:52 +0000
+++ l10n_es_aeat_mod340/wizard/calculate_mod340_records.py	2014-06-01 16:57:08 +0000
@@ -26,8 +26,8 @@
 import re
 from openerp.tools.translate import _
 from openerp.osv import orm
-from datetime import datetime
-from dateutil.relativedelta import relativedelta
+from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
+from openerp.tools.float_utils import float_round
 
 class l10n_es_aeat_mod340_calculate_records(orm.TransientModel):
     _name = "l10n.es.aeat.mod340.calculate_records"
@@ -45,6 +45,48 @@
         
 
     def _calculate_records(self, cr, uid, ids, context=None, recalculate=True):
+        fiscal_position_tax_obj = self.pool.get('account.fiscal.position.tax')
+        def _get_source_tax(tax_line, pct, inv):
+            ''' Recupera cuál es el impuesto que originó la línea de impuesto a partir
+                de su tipo y su código base '''
+            for line in inv.invoice_line:
+                for tax in line.invoice_line_tax_id:
+                    if tax.base_code_id.id == tax_line.base_code_id.id and pct == tax.amount:
+                        return tax
+                    for child_tax in tax.child_ids:
+                        if child_tax.base_code_id.id == tax_line.base_code_id.id and pct == child_tax.amount:
+                            return child_tax
+            raise orm.except_orm(_('Error'),
+                                 _("Invoice %s: Unable to determine the tax line %s source tax. The base code of the source tax may have been changed, please recompute the invoice taxes") % (inv.number,tax_line.name)) 
+
+        
+        def _get_surcharged_tax(position_id, surcharge_id):
+            mapping_ids = fiscal_position_tax_obj.search(cr, uid, [('position_id','=',position_id),
+                                                                   ('tax_dest_id','=',surcharge_id)], context=context)
+            if not mapping_ids:
+                return False
+            mapping = fiscal_position_tax_obj.browse(cr, uid, mapping_ids[0], context)
+            mapping_ids = fiscal_position_tax_obj.search(cr, uid, [('position_id','=',position_id),
+                                                                   ('tax_src_id','=',mapping.tax_src_id.id),
+                                                                   ('tax_dest_id','!=',surcharge_id)], context=context)
+            if not mapping_ids:
+                return False
+            mapping = fiscal_position_tax_obj.browse(cr, uid, mapping_ids[0], context)
+            return mapping.tax_dest_id.id
+            
+        def _rounded_pct(allowed_pcts, pct, key, invoice, threshold=0.01):
+            pcts = allowed_pcts[key]
+            sign = 1
+            if pct < 0:
+                sign = -1
+                pct = pct * -1
+            candidates = [(x, abs(x-pct)) for x in pcts]
+            candidates.sort(key=lambda x: x[1])
+            if candidates[0][1] <= threshold:
+                return candidates[0][0] * sign
+            raise orm.except_orm(_('Error'),
+                                 _("Invoice %s: No match found for tax percentage %s") % (invoice.number, pct)) 
+            
         if context is None:
             context = {}
 
@@ -54,12 +96,22 @@
             
             invoices340 = self.pool.get('l10n.es.aeat.mod340.issued')
             invoices340_rec = self.pool.get('l10n.es.aeat.mod340.received')
+            invoices340_inv = self.pool.get('l10n.es.aeat.mod340.investment')
+            invoices340_intra = self.pool.get('l10n.es.aeat.mod340.intracomunitarias')
             period_obj = self.pool.get('account.period')
+            precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
+            tax_obj = self.pool.get('account.tax')
             
-            mod340.write({
-                'state' : 'calculated',
-                'calculation_date' : time.strftime('%Y-%m-%d %H:%M:%S')
-            })
+            allowed_tax_pct = tax_obj._allowed_pct_by_ledger(cr, uid, context)
+            ledger2obj = {
+                'I': invoices340_inv,
+                'J': invoices340_inv,
+                'U': invoices340_intra,
+                'E': invoices340,
+                'F': invoices340,
+                'R': invoices340_rec,
+                'S': invoices340_rec
+            }
         
             if not mod340.company_id.partner_id.vat:
                 raise orm.except_orm(mod340.company_id.partner_id.name,
@@ -68,9 +120,6 @@
             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)
@@ -80,25 +129,27 @@
                    _("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
             
-            del_ids = invoices340.search(cr, uid, [
-            ('mod340_id', '=', mod340.id)])
+            del_ids = invoices340.search(cr, uid, [('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)])
+            del_ids = invoices340_rec.search(cr, uid, [('mod340_id', '=', mod340.id)])
 
             if del_ids:
                 invoices340_rec.unlink(cr, uid, del_ids, context=context)
+                
+            del_ids = invoices340_inv.search(cr, uid, [('mod340_id', '=', mod340.id)])
+
+            if del_ids:
+                invoices340_inv.unlink(cr, uid, del_ids, context=context)
+            
+            del_ids = invoices340_intra.search(cr, uid, [('mod340_id', '=', mod340.id)])
+
+            if del_ids:
+                invoices340_intra.unlink(cr, uid, del_ids, context=context)
             
             domain = [('period_id', 'in',account_period_ids), 
                 ('state', 'in', ('open', 'paid'))]
@@ -111,6 +162,7 @@
                     if tax_line.base_code_id and tax_line.base:
                         if tax_line.base_code_id.mod340 == True:
                             include = True
+                            break
                 if include == True:
                     if invoice.partner_id.vat_type == 1:
                         if not invoice.partner_id.vat:
@@ -122,7 +174,8 @@
                         re.match(r"([A-Z]{0,2})(.*)",
                                  invoice.partner_id.vat).groups()[1]
                     country_code = invoice.partner_id.country_id.code
-                    
+                    ledger_key, operation_key = invoice_obj.get_340_classification(cr, uid, invoice.id, context)
+                    amounts = invoice_obj.get_cc_amounts(cr, uid, invoice.id, context)
                     values = {
                         'mod340_id': mod340.id,
                         'partner_id': invoice.partner_id.id,
@@ -130,33 +183,49 @@
                         '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,
+                        'base_tax': amounts['cc_amount_untaxed'],
+                        'total': amounts['cc_amount_total'],
                         'date_invoice': invoice.date_invoice,
+                        'ledger_key': ledger_key,
+                        'operation_key': operation_key
                     }
+                    if ledger_key in ('I', 'J'):
+                        values['use_date'] = 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)
+                    invoice_created = ledger2obj[ledger_key].create(cr,uid,values)
                     
                     tot_tax_invoice = 0
-                    check_tax = 0
                     check_base = 0
-                    
+                    added_tax_lines = []
+                    values_taxes = {}
+                    values_surcharges = {}
                     # 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
-        
+                                tax_percentage = _rounded_pct(allowed_tax_pct, tax_percentage, ledger_key, invoice)
+                                source_tax = _get_source_tax(tax_line, tax_percentage, invoice)
+                                
+                                #El IVA agrario aunque tenga tipo 12% debe declararse con 0%
+                                if source_tax.operation_key and source_tax.operation_key == 'X':
+                                    tax_percentage = 0
+                                
+                                #No se debe contar la base de los recargos de equivalencia o el
+                                #check fallará al sumar el doble que el subtotal de la factura
+                                if tax_percentage >= 0 and source_tax.operation_key != '-':
+                                    check_base += tax_line.base
+                                
+                                #Los impuestos que se desdoblan en 2 hijos como los de
+                                #compras intra solo deben generar un registro
+                                if (tax_line.base_amount, tax_percentage) in added_tax_lines:
+                                    continue
+                                
+                                tot_tax_invoice += tax_line.tax_amount
+                                added_tax_lines.append((tax_line.base_amount, tax_percentage*-1))
                                 values = {
                                     'name': tax_line.name,
                                     'tax_percentage': tax_percentage,
@@ -164,54 +233,58 @@
                                     'base_amount': 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.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):
+                                if source_tax.ledger_key in ('I','J'):
+                                    values['goods_identification'] = invoice_obj.get_inv_good_names(cr, uid, invoice.id, tax_percentage, context)
+                                    
+                                # Separamos recargos de los impuestos corrientes y agrupamos por impuesto
+                                # Esta agrupación se hace porque un mismo impuesto OpenERP lo desdobla en 2 líneas de impuestos
+                                # si hay líneas con importe positivo (línea impuesto con base con un signo) 
+                                # y negativo (línea impuesto con base de signo opuesto)
+                                if source_tax.operation_key and source_tax.operation_key == '-':
+                                    if source_tax.id in values_surcharges:
+                                        for key in ['tax_amount', 'base_amount']:
+                                            values_surcharges[source_tax.id][key] += values[key]
+                                    else:
+                                        values_surcharges[source_tax.id] = values
+                                else:
+                                    if source_tax.id in values_taxes:
+                                        for key in ['tax_amount', 'base_amount']:
+                                            values_taxes[source_tax.id][key] += values[key]
+                                    else:
+                                        values_taxes[source_tax.id] = values
+
+                    #Juntamos los recargos con los registros de impuestos a los que afectan
+                    position_id = invoice.fiscal_position.id
+                    for surcharge_id, values in values_surcharges.items():
+                        surcharged_tax_id = _get_surcharged_tax(position_id, surcharge_id)
+                        if not surcharged_tax_id:
+                            raise orm.except_orm(_('Error'),
+                                                 _("Invoice %s: Unable to determine the surcharged tax because it is not mapped in the partner's fiscal position %s") 
+                                                 % (invoice.number, surcharge_id.description))
+                        values_taxes[surcharged_tax_id]['surcharge_percentage'] = values['tax_percentage']
+                        values_taxes[surcharged_tax_id]['surcharge_amount'] = values['tax_amount']
+                        
+                    ledger2obj[ledger_key].write(cr, uid, invoice_created, 
+                                                 {'tax_line_ids': [(0,0, values) for values in values_taxes.values()],
+                                                  'amount_tax':tot_tax_invoice}, context)
+                        
+                    if abs(float_round(invoice.amount_untaxed, precision)-float_round(check_base, precision)) > 0.01:
                         raise orm.except_orm( "REVIEW INVOICE",
-                          _('Invoice  %s, Amount untaxed Lines %.2f do not correspond to AmountUntaxed on Invoice %.2f' )
+                          _('Invoice  %s, Amount untaxed on Lines %.2f do not correspond to AmountUntaxed on Invoice %.2f' )
                           %(invoice.number, check_base,  
-                            invoice.amount_untaxed*sign)  )
+                            invoice.amount_untaxed)  )
                 
-            mod340.write({'total_taxable':tot_base,'total_sharetax':tot_amount,
-                      'number_records':tot_rec,'total':tot_tot,
-                      'declaration_number':code})
-            
-            if recalculate:
-                mod340.write({
-                    'state' : 'calculated',
-                    'calculation_date' : time.strftime('%Y-%m-%d %H:%M:%S')
-                })
+            code = '340' + mod340.fiscalyear_id.code
+            code += mod340.period_to.date_stop[5:7] + '0001'
+            mod340.write({
+                'declaration_number':code,
+                'state' : 'calculated',
+                'calculation_date' : time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+            })
          
         except Exception, ex:
             raise
-        
-        
-        
+  
         return True
 
 

=== modified file 'l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py'
--- l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py	2014-02-16 18:24:48 +0000
+++ l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py	2014-06-01 16:57:08 +0000
@@ -26,11 +26,19 @@
 from openerp.osv import orm
 import base64
 import time
+from openerp.tools.misc import DEFAULT_SERVER_DATE_FORMAT
 
 
 class l10n_es_aeat_mod340_export_to_boe(orm.TransientModel):
     _inherit = "l10n.es.aeat.report.export_to_boe"
     _name = "l10n.es.aeat.mod340.export_to_boe"
+    
+    def _formatDate(self, date_str):
+        #TODO: mover este método a l10n.es.aeat.report.export_to_boe
+        if not date_str:
+            return '0'*8
+        date = datetime.strptime(date_str,DEFAULT_SERVER_DATE_FORMAT)
+        return datetime.strftime(date, "%Y%m%d")
 
     def _get_formatted_declaration_record(self, cr, uid, report, context=None):
         """
@@ -146,10 +154,9 @@
             79-95       Número de identificación fiscal en el país de
                         residencia. TODO de momento blancos.
             96-98       Blancos
-            99          Clave tipo de libro. Constante 'E'.
-            100         Clave de operación. Constante ' ' para un solo tipo de
-                        IVA. Constante 'C' para varios tipos de IVA. TODO Resto
-                        de operaciones. Varios tipos impositivos.
+            99          Clave tipo de libro.
+            100         Clave de operación. Recuperado de los impuestos de la factura.
+                        Constante 'C' para varios tipos de IVA.
             101-108     Fecha de expedición
             109-116     Fecha de operación. Se consigna la misma que
                         expedición. TODO. Fecha del uso del bien.
@@ -167,8 +174,8 @@
             246-325     Intervalo de acumulación. Vacio. TODO Intervalo de
                         resumenes de facturas o tickets.
             326-365     Identificación de la factura rectificativa. TODO.
-            366-370     Tipo recargo de equivalencia. TODO.
-            371-384     Cuota recargo de equivalencia. TODO.
+            366-370     Tipo recargo de equivalencia.
+            371-384     Cuota recargo de equivalencia.
             385         Situación del Inmueble #TODO
             386-410     Referencia Catastral #TODO
             411-425     Importe Percibido en Metálico #TODO
@@ -210,27 +217,19 @@
             else: text += 17 * ' '
             # Blancos
             text += 3 * ' '
-            # Clave tipo de libro. Constante 'E'.                                           
-            text += 'E'                                                         
+            # Clave tipo de libro.                                          
+            text += self._formatString(invoice_issued.ledger_key, 1)                                                       
             # 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)    
+                clave_operacion = 'D'
+            elif len(invoice_issued.tax_line_ids) > 1: clave_operacion = 'C'
+            elif invoice_issued.invoice_id.is_ticket_summary == 1: clave_operacion = 'B'
+            else: clave_operacion = self._formatString(invoice_issued.operation_key, 1) 
+            text += clave_operacion
+            
+            text += self._formatDate(invoice_issued.invoice_id.date_invoice)
+            text += self._formatDate(invoice_issued.invoice_id.date_invoice)
+            
             #Tipo impositivo
             text += self._formatNumber(tax_line.tax_percentage * 100, 3, 2)
             # Base imponible
@@ -252,7 +251,12 @@
                 text += self._formatNumber(invoice_issued.invoice_id.number_tickets, 8)
             else: text += self._formatNumber(1, 8)
             # Número de registros (Desglose)
-            text += self._formatNumber(len(invoice_issued.tax_line_ids), 2)
+            # Si una rectificativa lleva varios tipos de impuesto, 
+            # se debe declarar con clave D y registros 1 (como si fueran facturas individuales)
+            if clave_operacion == 'D':
+                text += self._formatNumber(1, 2)
+            else:
+                text += self._formatNumber(len(invoice_issued.tax_line_ids), 2)
             # Intervalo de identificación de la acumulación
             if invoice_issued.invoice_id.is_ticket_summary == 1:      
                 text += self._formatString(invoice_issued.invoice_id.first_ticket, 40)
@@ -262,9 +266,9 @@
             text +=  self._formatString( ",".join( [x.number for x in \
                         invoice_issued.invoice_id.origin_invoices_ids]) , 40 )
             # Tipo Recargo de equivalencia
-            text += self._formatNumber(0, 5) 
+            text += self._formatNumber(tax_line.surcharge_percentage, 3, 2)
             # Couta del recargo de equivalencia 
-            text += ' '+self._formatNumber(0, 11, 2)  
+            text += self._formatNumber(tax_line.surcharge_amount, 11, 2,True)
             #Situación del Inmueble #TODO
             text += '0'
             #Referencia Catastral #TODO
@@ -305,8 +309,9 @@
             78          Clave de identificación en el país de residencia
             79-95       Número de identificación fiscal en el país de residencia. TODO de momento blancos.
             96-98       Blancos
-            99          Clave tipo de libro. Constante 'R'.
-            100         Clave de operación. Constante ' ' para un solo tipo de IVA. Constante 'C' para varios tipos de IVA. TODO Resto de operaciones. Varios tipos impositivos.
+            99          Clave tipo de libro.
+            100         Clave de operación. Constante ' ' para un solo tipo de IVA. Recuperado de los impuestos de la factura.
+                        Constante 'C' para varios tipos de IVA.
             101-108     Fecha de expedición
             109-116     Fecha de operación. Se consigna la misma que expedición. TODO. Fecha del uso del bien.
             117-121     Tipo impositivo
@@ -354,19 +359,18 @@
             else: text += 17*' '
             # Blancos
             text += 3*' '   
-            # Clave tipo de libro. Constante 'R'.                                                  
-            text += 'R'                                                         
+            # Clave tipo de libro.                 
+            ledger_key = invoice_received.ledger_key
+            if ledger_key in ('I','J'):
+                ledger_key = 'R'                       
+            text += self._formatString(ledger_key, 1)
             # Clave de operación
-            if len(invoice_received.tax_line_ids) > 1: text += 'C'              
-            else: text += ' '
+            if len(invoice_received.tax_line_ids) > 1 and invoice_received.operation_key not in ('P','I'): text += 'C'              
+            else: text += self._formatString(invoice_received.operation_key, 1)  
             # 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) 
+            text += self._formatDate(invoice_received.invoice_id.date_invoice)
             # Fecha de operació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)    
+            text += self._formatDate(invoice_received.invoice_id.date_invoice)  
             #Tipo impositivo
             text += self._formatNumber(tax_line.tax_percentage * 100, 3, 2) 
             # Base imponible                       
@@ -406,6 +410,127 @@
         
         assert len(text) == 502*len(invoice_received.tax_line_ids), _("The type 2 received record must be 500 characters long for each Vat registry")
         return text
+                
+    
+    def _get_formatted_invoice_investment(self, cr, uid, report, invoice_investment):
+        """
+        Returns a type 2, investment goods invoice, formated record
+
+        Format of the record:
+            Tipo de Registro 2 – Registro de facturas de bienes de inversión
+            Posiciones  Descripción
+            1           Tipo de Registro
+            2-4         Modelo Declaración
+            5-8         Ejercicio
+            9-17        NIF del declarante
+            18-26       NIF del declarado
+            27-35       NIF del representante legal
+            36-75       Apellidos y nombre, razón social o
+                        denominación del declarado
+            76-77       Código país
+            78          Clave de identificación en el país de residencia
+            79-95       Número de identificación fiscal en el país de
+                        residencia. TODO de momento blancos.
+            96-98       Blancos
+            99          Clave tipo de libro. 'I' o 'J' (IGIC), según impuesto.
+            100         Clave de operación. Recuperado de los impuestos de la factura.
+                        Constante 'C' para varios tipos de IVA.
+            101-108     Fecha de expedición
+            109-116     Fecha de operación. Se consigna la misma que
+                        expedición. TODO. Fecha del uso del bien.
+            117-121     Tipo impositivo
+            122-135     Base imponible
+            136-149     Cuota del impuesto
+            150-163     Importe total de la factura
+            164-177     Base imponible a coste. TODO de momento 0.
+            178-217     Identificación de la factura
+            218-235     Número de registro
+            236-238     Prorrata anual definitiva
+            239-252     Regularización anual de la deducción TODO
+            253-292     Identificación de la entrega
+            293-306     Regularización anual de la deducción efectuada TODO
+            307-314     Fecha de inicio de la utilización
+            315-331     Identificación del bien
+            332-500     BLANCO
+
+        """
+        text = ''
+        for tax_line in invoice_investment.tax_line_ids:
+            # Tipo de Registro
+            text += '2'
+            # Modelo Declaración
+            text += '340'
+            # Ejercicio                                                 
+            text += self._formatString(report.fiscalyear_id.code, 4)
+            # NIF del declarante       
+            text += self._formatString(report.company_vat, 9)
+            # NIF del declarado        
+            if invoice_investment.partner_country_code == 'ES': 
+                text += self._formatString(invoice_investment.partner_vat, 9)
+            else: text += self._formatString(' ', 9)
+            # NIF del representante legal
+            text += self._formatString(invoice_investment.representative_vat, 9)
+            # Apellidos y nombre, razón social o denominación del declarado
+            text += self._formatString(invoice_investment.partner_id.name, 40)
+            # Código país
+            text += self._formatString(invoice_investment.partner_country_code, 2)
+            # Clave de identificación en el país de residencia
+            text += self._formatNumber(invoice_investment.partner_id.vat_type, 1)
+            # Número de identificación fiscal en el país de residencia.   
+            if invoice_investment.partner_country_code != 'ES':
+                text += self._formatString(invoice_investment.partner_country_code, 2)
+                text += self._formatString(invoice_investment.partner_vat, 15)
+            else: text += 17 * ' '
+            # Blancos
+            text += 3 * ' '
+            # Clave tipo de libro. 'I' o 'J' (IGIC), según impuesto.
+            text += self._formatString(invoice_investment.ledger_key, 1)                         
+            # Clave de operación
+            if len(invoice_investment.tax_line_ids) > 1 and invoice_investment.operation_key not in ('P','I'): text += 'C'              
+            else: text += self._formatString(invoice_investment.operation_key, 1) 
+            
+            text += self._formatDate(invoice_investment.invoice_id.date_invoice)
+            text += self._formatDate(invoice_investment.invoice_id.date_invoice)
+            #Tipo impositivo
+            text += self._formatNumber(tax_line.tax_percentage * 100, 3, 2)
+            # Base imponible
+            text += self._formatNumber(tax_line.base_amount, 11, 2, True)
+            # Cuota del impuesto 
+            text += self._formatNumber(tax_line.tax_amount, 11, 2, True)
+            # Importe total de la factura
+            text += self._formatNumber(tax_line.tax_amount+
+                                       tax_line.base_amount, 11, 2, True)
+            # Base imponible a coste.     
+            text += ' '+self._formatNumber(0, 11, 2)
+            # Identificación de la factura  
+            text += self._formatString(invoice_investment.invoice_id.number, 40)
+            # Número de registro
+            sequence_obj = self.pool.get('ir.sequence')
+            text += self._formatString(sequence_obj.get(cr, uid, 'mod340'), 18)
+            #Prorrata anual definitiva
+            text += self._formatNumber(invoice_investment.prorata, 3, 0)
+            #Regularización anual de la deducción TODO
+            text += ' ' + '0'*13
+            #Identificación de la entrega
+#             Se consignarán la identificación de la factura que
+#             corresponde en el LIBRO REGISTRO DE FACTURAS
+#             EXPEDIDAS que recoge la entrega.
+#             Esto qué es? la referencia del proveedor??
+            text += self._formatString(invoice_investment.invoice_id.reference, 40)
+            #Regularización de la deducción efectuada (transmisiones) TODO
+            text += ' ' + '0'*13
+            #Fecha de inicio de la utilización
+            text += self._formatDate(invoice_investment.use_date)
+            #Identificación del bien
+            text += self._formatString(tax_line.goods_identification, 17)
+            #Blancos
+            text += ' '*169
+            text += '\r\n'
+        assert len(text) == 502 * len(invoice_investment.tax_line_ids), _("The type 2 issued record must be 500 characters long for each Vat registry")
+        return text
+        
+        
+        
     
     def _get_formatted_other_records(self, cr, uid, report,context=None):
         file_contents = ''
@@ -413,10 +538,19 @@
         for invoice_issued in report.issued:
             file_contents += self._get_formatted_invoice_issued(cr,uid,report, 
                                                                 invoice_issued)
-
+ 
         for invoice_received in report.received:
             file_contents += self._get_formatted_invoice_received(cr,uid,
                                                       report, invoice_received)
+            
+        if report.investment_goods_prorating:
+            for invoice_investment in report.investment:
+                file_contents += self._get_formatted_invoice_investment(cr,uid,
+                                                          report, invoice_investment)
+        else:
+            for invoice_investment in report.investment:
+                file_contents += self._get_formatted_invoice_received(cr,uid,
+                                                      report, invoice_investment)
 
         return file_contents