Merge lp:~acysos-team/openerp-spain/openerp-spain-7.0-mod340 into lp:~openerp-spain-team/openerp-spain/7.0

[Ignacio Ibeas (www.acysos.com)]

Hola,

Migración del Modelo 340 a OpenERP 7.0 incluida refactorización y mejoras como la impresión del Libro de IVA.

Saludos

[Pedro Manuel Baeza (pedro.baeza)]

Procedo a la inclusión, puesto que es la primera revisión del módulo para v7. Cualquier cuestión, se realiza vía revisión.

Un saludo.

review: Approve

=== modified file 'l10n_es_aeat_mod340/__init__.py'
--- l10n_es_aeat_mod340/__init__.py	2012-09-08 15:32:47 +0000
+++ l10n_es_aeat_mod340/__init__.py	2014-02-03 11:19:23 +0000
@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (c) 20011 Ting (http://www.ting.es) All Rights Reserved.
-#    Copyright (c) 2011 Acysos S.L. (http://acysos.com) All Rights Reserved
+#    Copyright (c) 2011-2013 Acysos S.L. (http://acysos.com) All Rights Reserved
 #                       Ignacio Ibeas Izquierdo <[e-mail]>
 #                      
 #    $Id$
@@ -27,4 +27,5 @@
 import mod340
 import res_partner
 import account_invoice
+import account
 
 
=== modified file 'l10n_es_aeat_mod340/__openerp__.py'
--- l10n_es_aeat_mod340/__openerp__.py	2013-01-28 10:29:06 +0000
+++ l10n_es_aeat_mod340/__openerp__.py	2014-02-03 11:19:23 +0000
@@ -3,9 +3,8 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (c) 2011 Ting (http://www.ting.es) All Rights Reserved.
-#    Copyright (c) 2011 Acysos S.L. (http://acysos.com) All Rights Reserved
+#    Copyright (c) 2011-2013 Acysos S.L. (http://acysos.com) All Rights Reserved
 #                       Ignacio Ibeas Izquierdo <[e-mail]>
-#                       
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -24,22 +23,24 @@
 ##############################################################################
 
 {
-    "name" : "Generación de fichero modelo 340",
-    "version" : "1.0",
-    "author" : "Acysos S.L., Francisco Pascual (Ting), Nan-tic",
-    "website" : "http://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.
-
---- ESTADO ACTUAL -------------------------------------------------------------
-
-Búsqueda de facturas emitidas y recibidas. Excluidas lineas de impuestos con IRPF.
+    'name' : 'Generación de fichero modelo 340 y libro de IVA',
+    'version' : '2.0',
+    'author' : 'Acysos S.L., Francisco Pascual (Ting), Nan-tic',
+    '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
+
+Búsqueda de facturas emitidas y recibidas.
 Exportación a formato de AEAT de facturas emitidas y recibidas.
-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
+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.
+Permite imprimir el libro de IVA, basado en la misma legislación.
 
 --- COSAS PENDIENTES (TODO LIST) ----------------------------------------------
 
@@ -47,19 +48,29 @@
 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
-
-ADVERTENCIA: Los periodos de la empresas deben coincidir con los peridos de presentación de IVA.
-""",
-    "website" : "www.acysos.com, www.ting.es",
-    "license" : "AGPL-3",
-    "depends" : ["account",
-                 "base_vat",
-                 "l10n_es_aeat",
-                 "account_refund_original",
+''',
+    'license' : 'AGPL-3',
+    'depends' : ['account',
+                 'base_vat',
+                 'l10n_es_aeat',
+                 'account_refund_original',
+                 'account_chart_update',
                  ],
-    "init_xml" : [],
-    "demo_xml" : [],
-    "update_xml" : ['report/report_view.xml',"mod340_view.xml","mod340_workflow.xml","security/ir.model.access.csv", "res_partner_view.xml","mod340_sequence.xml","account_invoice_view.xml"],
-    "installable" : False,
-    "active" : False,
+    'init_xml' : [],
+    'demo_xml' : [],
+    'update_xml' : [
+        'report/report_view.xml',
+        'wizard/export_mod340_to_boe.xml',
+        'mod340_view.xml',
+        'mod340_workflow.xml',
+        'security/ir.model.access.csv',
+        'res_partner_view.xml',
+        'mod340_sequence.xml',
+        'account_invoice_view.xml',
+        'account_view.xml',
+        'taxes_data.xml',
+        'taxes_data_pymes.xml',
+        'taxes_data_assoc.xml'],
+    'installable' : True,
+    'active' : False,
 }
 
=== added file 'l10n_es_aeat_mod340/account.py'
--- l10n_es_aeat_mod340/account.py	1970-01-01 00:00:00 +0000
+++ l10n_es_aeat_mod340/account.py	2014-02-03 11:19:23 +0000
@@ -0,0 +1,190 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (c) 2013 Acysos S.L. (http://acysos.com) All Rights Reserved
+#                       Ignacio Ibeas Izquierdo <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+class account_tax_code_template(osv.osv):
+
+    _inherit = 'account.tax.code.template'
+    
+    _columns = {
+        'mod340':fields.boolean("Include in mod340"),
+    }
+    
+account_tax_code_template()
+
+class account_tax_code(osv.osv):
+
+    _inherit = 'account.tax.code'
+    
+    _columns = {
+        'mod340':fields.boolean("Include in mod340"),
+    }
+    
+account_tax_code()
+
+class wizard_update_charts_accounts(osv.osv_memory):
+    _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)
+
+            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,
+                        'update_chart_wizard_id': wizard.id,
+                        'type': 'new',
+                    }, 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
+            }
+
+            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
+        }
+    
+wizard_update_charts_accounts()
 \ No newline at end of file
 
=== modified file 'l10n_es_aeat_mod340/account_invoice_view.xml'
--- l10n_es_aeat_mod340/account_invoice_view.xml	2012-09-08 15:32:47 +0000
+++ l10n_es_aeat_mod340/account_invoice_view.xml	2014-02-03 11:19:23 +0000
@@ -2,6 +2,24 @@
 <openerp>
     <data>
         
+        <record id="view_customer_account_invoice_ticket_form" model="ir.ui.view">
+            <field name="name">Account invoice - Ticket summary</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                 <page string="Payments" position="after">
+                     <page string="AEAT 340">
+                         <field name="is_ticket_summary"/>
+                         <group colspan="4" col="4" attrs="{'invisible': [('is_ticket_summary','=',False)]}">
+                             <field name="first_ticket" attrs="{'required':[('is_ticket_summary','=',True)]}"/>
+                             <field name="last_ticket" attrs="{'required':[('is_ticket_summary','=',True)]}"/>
+                             <field name="number_tickets" attrs="{'required':[('is_ticket_summary','=',True)]}"/>
+                         </group>
+                     </page>
+                 </page>
+            </field>
+        </record>
+        
         <!-- Supplier Invoice -->
         
         <record id="invoice_supplier_mod340_form" model="ir.ui.view">
@@ -15,25 +33,5 @@
             </field>
         </record>
         
-        <record id="view_customer_account_invoice_ticket_form" model="ir.ui.view">
-            <field name="name">Account invoice - Ticket summary</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_form"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="/form/notebook" position="inside">
-                        <page string="AEAT 340">
-                            <field name="is_ticket_summary"/>
-                            <group colspan="4" col="4" attrs="{'invisible': [('is_ticket_summary','=',False)]}">
-                                <field name="first_ticket" attrs="{'required':[('is_ticket_summary','=',True)]}"/>
-                                <field name="last_ticket" attrs="{'required':[('is_ticket_summary','=',True)]}"/>
-                                <field name="number_tickets" attrs="{'required':[('is_ticket_summary','=',True)]}"/>
-                            </group>
-                        </page>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-        
     </data>
 </openerp>
 \ No newline at end of file
 
=== added file 'l10n_es_aeat_mod340/account_view.xml'
--- l10n_es_aeat_mod340/account_view.xml	1970-01-01 00:00:00 +0000
+++ l10n_es_aeat_mod340/account_view.xml	2014-02-03 11:19:23 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <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"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="sign" position="after">
+                    <field name="mod340"/>
+                </field>
+            </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>
+            <field name="inherit_id" ref="account.view_tax_code_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="sign" position="after">
+                    <field name="mod340"/>
+                </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-01-07 05:30:53 +0000
+++ l10n_es_aeat_mod340/i18n/es.po	2014-02-03 11:19:23 +0000
@@ -1,25 +1,40 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#   * l10n_es_aeat_mod340
+#	* l10n_es_aeat_mod340
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.2\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-01-30 10:57+0000\n"
-"PO-Revision-Date: 2013-12-10 16:44+0000\n"
-"Last-Translator: Ignacio Ibeas (www.acysos.com) <[e-mail]>\n"
+"Project-Id-Version: OpenERP Server 7.0-20130519-231019\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-10-11 14:58+0000\n"
+"PO-Revision-Date: 2013-10-11 14:58+0000\n"
+"Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-07 05:30+0000\n"
-"X-Generator: Launchpad (build 16877)\n"
-
-#. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "Third quarter"
-msgstr "Tercer trimestre"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_es_aeat_mod340
+#: report:report mod340:0
+#: report:report_mod340:0
+#: report:vat book:0
+#: report:vat_book:0
+msgid "FACTURAS DE SALIDA"
+msgstr "FACTURAS DE SALIDA"
+
+#. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340:0
+msgid "Confirmed models"
+msgstr "Modelos confirmados"
+
+#. 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
 #: view:l10n.es.aeat.mod340.issued:0
@@ -27,30 +42,25 @@
 msgstr "Facturas emitidas"
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/mod340.py:178
-#, python-format
-msgid "All real estate records state code field must be filled."
-msgstr ""
-"Los registros de propiedades inmobiliarias deben ser rellenados manualmente."
-
-#. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/mod340.py:65
-#, python-format
-msgid "En desarrollo"
-msgstr "En desarrollo"
-
-#. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340.intracomunitarias,amount_tax:0
-#: field:l10n.es.aeat.mod340.investment,amount_tax:0
-#: field:l10n.es.aeat.mod340.issued,amount_tax:0
-#: field:l10n.es.aeat.mod340.received,amount_tax:0
-msgid "amount of the tax"
-msgstr "cantidad de impuestos"
-
-#. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "March"
-msgstr "Marzo"
+#: 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"
+""
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340,total_taxable:0
+msgid "Total Taxable"
+msgstr "Total"
+
+#. module: l10n_es_aeat_mod340
+#: code:addons/l10n_es_aeat_mod340/account.py:158
+#, python-format
+msgid "Created tax code %s.\n"
+""
+msgstr "Código de impuesto %s creado.\n"
+""
 
 #. module: l10n_es_aeat_mod340
 #: view:l10n.es.aeat.mod340:0
@@ -64,18 +74,20 @@
 msgstr "Compañia"
 
 #. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340,total_sharetax:0
+msgid "Total Share Tax"
+msgstr "Total impuestos"
+
+#. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340,number_records:0
 msgid "Records"
 msgstr "Registros"
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:361
+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:297
 #, 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,type:0
@@ -98,20 +110,39 @@
 msgstr "Base"
 
 #. module: l10n_es_aeat_mod340
+#: model:ir.model,name:l10n_es_aeat_mod340.model_account_tax_code
+msgid "Tax Code"
+msgstr "Código impuesto"
+
+#. 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 Model AEAT 340"
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:92
+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:95
 #, python-format
-msgid "El periodo seleccionado no coincide con los periodos del año fiscal:"
-msgstr "El periodo seleccionado no coincide con los periodos del año fiscal:"
-
-#. module: l10n_es_aeat_mod340
-#: view:l10n.es.aeat.mod340:0
-msgid "In process"
-msgstr "En processo"
+msgid "The period hasn't a valid Mod340 period"
+msgstr "El periodo no es válido para el Módelo 340"
+
+#. 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:"
+
+#. module: l10n_es_aeat_mod340
+#: selection:l10n.es.aeat.mod340,state:0
+msgid "Processed"
+msgstr "Procesado"
+
+#. 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"
 
 #. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340.intracomunitarias,tax_line_ids:0
@@ -122,14 +153,6 @@
 msgstr "Lineas de impuestos"
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/mod340.py:172
-#: code:addons/l10n_es_aeat_mod340/mod340.py:174
-#: code:addons/l10n_es_aeat_mod340/mod340.py:178
-#, python-format
-msgid "Error!"
-msgstr "Error!"
-
-#. module: l10n_es_aeat_mod340
 #: view:l10n.es.aeat.mod340:0
 msgid "Cancelled"
 msgstr "Cancelado"
@@ -140,18 +163,23 @@
 msgstr "6 - Otro documento probatorio"
 
 #. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340,company_vat:0
-msgid "VAT number"
-msgstr "CIF/NIF"
-
-#. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:275
-#, 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"
+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:213
+#, 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"
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340,period_from:0
+msgid "Start period"
+msgstr "Periodo inicial"
+
+#. module: l10n_es_aeat_mod340
+#: code:addons/l10n_es_aeat_mod340/account.py:167
+#, python-format
+msgid "Updated tax code %s.\n"
+""
+msgstr "Código de impuesto %s actualizado.\n"
+""
 
 #. module: l10n_es_aeat_mod340
 #: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_intracomunitarias
@@ -172,16 +200,48 @@
 msgstr "Código electrónico del modelo 340"
 
 #. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340,period_to:0
+msgid "End period"
+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:0
 msgid "Identification"
 msgstr "Identificación"
 
 #. module: l10n_es_aeat_mod340
+#: view:account.invoice:0
+msgid "Payments"
+msgstr "Pagos"
+
+#. 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
 #: model:ir.actions.report.xml,name:l10n_es_aeat_mod340.report_mod340_action
 msgid "mod340 report"
 msgstr "mod340 report"
 
 #. module: l10n_es_aeat_mod340
+#: report:vat book:0
+#: report:vat_book:0
+msgid "LIBRO DE IVA"
+msgstr "LIBRO DE IVA"
+
+#. module: l10n_es_aeat_mod340
 #: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_issued
 msgid "Invoices invoice"
 msgstr "Facturas"
@@ -203,7 +263,12 @@
 msgstr "2 - Se consigna el NIF/IVA (NIF OPERADOR INTRACOMUNITARIO)"
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:406
+#: view:l10n.es.aeat.mod340:0
+msgid "Cancelled models"
+msgstr "Cancelled models"
+
+#. module: l10n_es_aeat_mod340
+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:333
 #, python-format
 msgid "340_report_%s.txt"
 msgstr "340_report_%s.txt"
@@ -214,16 +279,25 @@
 msgstr "Estado"
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "First quarter"
-msgstr "Primer trimestre"
-
-#. module: l10n_es_aeat_mod340
 #: model:ir.ui.menu,name:l10n_es_aeat_mod340.menu_aeat_mod340_report
 msgid "AEAT 340 Model"
 msgstr "Modelo AEAT 340"
 
 #. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.intracomunitarias,amount_tax:0
+#: field:l10n.es.aeat.mod340.investment,amount_tax:0
+#: field:l10n.es.aeat.mod340.issued,amount_tax:0
+#: field:l10n.es.aeat.mod340.received,amount_tax:0
+msgid "Total tax"
+msgstr "Total impuestos"
+
+#. module: l10n_es_aeat_mod340
+#: report:vat book:0
+#: report:vat_book:0
+msgid "Nº de factura"
+msgstr "Nº de factura"
+
+#. module: l10n_es_aeat_mod340
 #: help:l10n.es.aeat.mod340.intracomunitarias,representative_vat:0
 #: help:l10n.es.aeat.mod340.investment,representative_vat:0
 #: help:l10n.es.aeat.mod340.issued,representative_vat:0
@@ -247,7 +321,7 @@
 msgstr "Tipo de soporte"
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:406
+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:333
 #, python-format
 msgid "%Y-%m-%d"
 msgstr "%d-%m-%Y"
@@ -258,9 +332,15 @@
 msgstr "Exportar al BOE"
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "July"
-msgstr "Julio"
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:74
+#, 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
+#: field:l10n.es.aeat.mod340,company_vat:0
+msgid "VAT number"
+msgstr "CIF/NIF"
 
 #. module: l10n_es_aeat_mod340
 #: selection:res.partner,vat_type:0
@@ -273,15 +353,29 @@
 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:170
+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:108
 #, 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
-#: field:l10n.es.aeat.mod340,calculation_date:0
-msgid "Calculation date"
-msgstr "Fecha de calculo"
+#: 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"
+
+#. 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:"
 
 #. module: l10n_es_aeat_mod340
 #: model:ir.model,name:l10n_es_aeat_mod340.model_res_partner
@@ -293,12 +387,12 @@
 msgstr "Empresa"
 
 #. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340.intracomunitarias,base_tax:0
-#: 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
-msgid "base tax bill"
-msgstr "Base imponible"
+#: report:report mod340:0
+#: report:report_mod340:0
+#: report:vat book:0
+#: report:vat_book:0
+msgid "Cuota impuesto"
+msgstr "Cuota impuesto"
 
 #. module: l10n_es_aeat_mod340
 #: view:l10n.es.aeat.mod340.tax_line_received:0
@@ -306,14 +400,24 @@
 msgstr "Líneas de impuestos recibidos"
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "September"
-msgstr "Septiembre"
-
-#. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "December"
-msgstr "Diciembre"
+#: 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"
+""
+
+#. module: l10n_es_aeat_mod340
+#: 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
 #: field:l10n.es.aeat.mod340,number:0
@@ -326,14 +430,26 @@
 msgstr "Cancelado"
 
 #. 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"
-
-#. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340,total_taxable:0
-msgid "Total Taxable"
-msgstr "Total"
+#: 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,calculation_date:0
+msgid "Calculation date"
+msgstr "Fecha de calculo"
+
+#. 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"
+
+#. module: l10n_es_aeat_mod340
+#: field:account.invoice,number_tickets:0
+msgid "Number of tickets"
+msgstr "Número de tiques"
 
 #. module: l10n_es_aeat_mod340
 #: view:l10n.es.aeat.mod340:0
@@ -341,9 +457,12 @@
 msgstr "Calcular"
 
 #. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340,total_sharetax:0
-msgid "Total Share Tax"
-msgstr "Total impuestos"
+#: code:addons/l10n_es_aeat_mod340/account.py:182
+#, 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"
+""
 
 #. module: l10n_es_aeat_mod340
 #: selection:l10n.es.aeat.mod340,support_type:0
@@ -351,16 +470,17 @@
 msgstr "DVD"
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/mod340.py:65
-#, python-format
-msgid "No disponible:"
-msgstr "No disponible:"
+#: report:report mod340:0
+#: report:report_mod340:0
+#: report:vat book:0
+#: report:vat_book:0
+msgid "Fecha"
+msgstr "Fecha"
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/mod340.py:172
-#, python-format
-msgid "All partner state code field must be filled."
-msgstr "Todos las empresas deben tener provincia."
+#: view:l10n.es.aeat.mod340:0
+msgid "In process"
+msgstr "En processo"
 
 #. module: l10n_es_aeat_mod340
 #: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340
@@ -384,23 +504,21 @@
 msgstr "3 - Pasaporte"
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/mod340.py:174
-#, python-format
-msgid "All partner vat number field must be filled."
-msgstr "Todas las empresas deben tener CIF/NIF."
-
-#. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340.intracomunitarias,total:0
-#: field:l10n.es.aeat.mod340.investment,total:0
-#: field:l10n.es.aeat.mod340.issued,total:0
-#: field:l10n.es.aeat.mod340.received,total:0
-msgid "total"
-msgstr "total"
-
-#. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "August"
-msgstr "Agosto"
+#: 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
+#: report:report mod340:0
+#: report:report_mod340:0
+msgid "Número de la declaración anterior:"
+msgstr "Número de la declaración anterior:"
+
+#. module: l10n_es_aeat_mod340
+#: field:account.invoice,first_ticket:0
+msgid "First ticket"
+msgstr "Primer tique"
 
 #. module: l10n_es_aeat_mod340
 #: selection:l10n.es.aeat.mod340,type:0
@@ -408,34 +526,37 @@
 msgstr "Normal"
 
 #. module: l10n_es_aeat_mod340
+#: help:account.invoice,is_ticket_summary:0
+msgid "Check if this invoice is a ticket summary"
+msgstr "Active si esta factura es un resumen de tiques"
+
+#. module: l10n_es_aeat_mod340
 #: selection:l10n.es.aeat.mod340,state:0
 msgid "Processing"
 msgstr "Procesando"
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "June"
-msgstr "Junio"
-
-#. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340,contact_phone:0
 msgid "Phone"
 msgstr "Teléfono"
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "November"
-msgstr "Noviembre"
-
-#. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "October"
-msgstr "Octubre"
-
-#. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "January"
-msgstr "Enero"
+#: field:account.invoice,last_ticket:0
+msgid "Last ticket"
+msgstr "Último tique"
+
+#. module: l10n_es_aeat_mod340
+#: field:account.invoice,is_ticket_summary:0
+msgid "Ticket Summary"
+msgstr "Resumen de tiques"
+
+#. 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:l10n.es.aeat.mod340.intracomunitarias,partner_country_code:0
@@ -456,9 +577,9 @@
 msgstr "Modelo 340 - Calcular registros"
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,state:0
-msgid "Processed"
-msgstr "Procesado"
+#: view:l10n.es.aeat.mod340:0
+msgid "AEAT Modelo 340"
+msgstr "AEAT Modelo 340"
 
 #. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340.tax_line_issued,invoice_record_id:0
@@ -466,6 +587,12 @@
 msgstr "Factudas emitidas"
 
 #. module: l10n_es_aeat_mod340
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:74
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340,representative_vat:0
 #: field:l10n.es.aeat.mod340.intracomunitarias,representative_vat:0
 #: field:l10n.es.aeat.mod340.investment,representative_vat:0
@@ -485,6 +612,14 @@
 msgstr "Facturas emitidas"
 
 #. 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_received,invoice_record_id:0
 msgid "Invoice received"
 msgstr "Factura recibida"
@@ -495,17 +630,17 @@
 msgstr "Tipo de documento"
 
 #. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340,period:0
-msgid "Period"
-msgstr "Periodo"
-
-#. module: l10n_es_aeat_mod340
 #: view:l10n.es.aeat.mod340:0
 msgid "General"
 msgstr "General"
 
 #. module: l10n_es_aeat_mod340
 #: view:l10n.es.aeat.mod340:0
+msgid "In process models"
+msgstr "Modelos en proceso"
+
+#. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340:0
 #: selection:l10n.es.aeat.mod340,state:0
 msgid "Done"
 msgstr "Realizado"
@@ -535,9 +670,10 @@
 msgstr "Recalcular"
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "Fourth quarter"
-msgstr "Cuarto trimestre"
+#: 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
 #: selection:res.partner,vat_type:0
@@ -572,9 +708,10 @@
 msgstr "Modelo AEAT 340"
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "May"
-msgstr "Mayo"
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:178
+#, python-format
+msgid "Invoice  %s, Amount untaxed Lines %.2f do not correspond to AmountUntaxed on Invoice %.2f"
+msgstr "Factura  %s, La cantidad de lineas sin impuesto %.2f no corresponde con la cantidad sin impuestos en la factura %.2f"
 
 #. module: l10n_es_aeat_mod340
 #: help:res.partner,vat_type:0
@@ -586,12 +723,18 @@
 #: help:l10n.es.aeat.mod340,total:0
 #: help:l10n.es.aeat.mod340,total_sharetax:0
 #: help:l10n.es.aeat.mod340,total_taxable:0
-msgid ""
-"The declaration will include partners with the total of operations over this "
-"limit"
+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"
 
 #. 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"
+
+#. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340.intracomunitarias,partner_vat:0
 #: field:l10n.es.aeat.mod340.investment,partner_vat:0
 #: field:l10n.es.aeat.mod340.issued,partner_vat:0
@@ -621,9 +764,10 @@
 msgstr "Nombre y apellido de contacto"
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "February"
-msgstr "Febrero"
+#: report:report mod340:0
+#: report:report_mod340:0
+msgid "Número:"
+msgstr "Número:"
 
 #. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340,name:0
@@ -638,9 +782,20 @@
 msgstr "Facturas recibidas"
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "April"
-msgstr "Abril"
+#: 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,attach_id:0
+msgid "BOE file"
+msgstr "Archivo BOE"
+
+#. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340:0
+msgid "Draft models"
+msgstr "Modelos en borrador"
 
 #. module: l10n_es_aeat_mod340
 #: view:l10n.es.aeat.mod340:0
@@ -649,12 +804,28 @@
 msgstr "Año fiscal"
 
 #. 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_received
 #: field:l10n.es.aeat.mod340,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"
+""
+
+#. module: l10n_es_aeat_mod340
 #: selection:l10n.es.aeat.mod340,support_type:0
 msgid "Telematics"
 msgstr "Telemática"
@@ -665,9 +836,12 @@
 msgstr "Clave tipo de NIF"
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "Second quarter"
-msgstr "Segundo trimestre"
+#: 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
 #: selection:l10n.es.aeat.mod340,type:0
@@ -675,11 +849,25 @@
 msgstr "Complementaria"
 
 #. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340.intracomunitarias,tax_line_ids:0
-#: field:l10n.es.aeat.mod340.investment,tax_line_ids:0
-#: field:l10n.es.aeat.mod340.issued,tax_line_ids:0
-msgid "tax lines"
-msgstr "líneas de impuestos"
+#: model:ir.model,name:l10n_es_aeat_mod340.model_wizard_update_charts_accounts
+msgid "wizard.update.charts.accounts"
+msgstr "wizard.update.charts.accounts"
+
+#. 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"
+
+#. 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
 #: field:l10n.es.aeat.mod340,total:0
@@ -693,36 +881,20 @@
 msgstr "Total"
 
 #. module: l10n_es_aeat_mod340
-#: field:account.invoice,number_tickets:0
-msgid "Number of tickets"
-msgstr "Número de tiques"
-
-#. module: l10n_es_aeat_mod340
-#: field:account.invoice,first_ticket:0
-msgid "First ticket"
-msgstr "Primer tique"
-
-#. module: l10n_es_aeat_mod340
-#: help:account.invoice,is_ticket_summary:0
-msgid "Check if this invoice is a ticket summary"
-msgstr "Active si esta factura es un resumen de tiques"
-
-#. module: l10n_es_aeat_mod340
-#: field:account.invoice,last_ticket:0
-msgid "Last ticket"
-msgstr "Último tique"
-
-#. module: l10n_es_aeat_mod340
-#: field:account.invoice,is_ticket_summary:0
-msgid "Ticket Summary"
-msgstr "Resumen de tiques"
-
-#. module: account
-#: view:account.invoice:0
-msgid "Tickets"
-msgstr "Tiques"
-
+#: 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:109
 #, python-format
-#~ msgid "All real state records state code field must be filled."
-#~ msgstr ""
-#~ "Los registros de propiedades inmobiliarias deben ser rellenados manualmente."
+msgid "La siguiente empresa no tiene asignado nif:"
+msgstr "La siguiente empresa no tiene asignado nif:"
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.intracomunitarias,date_invoice:0
+#: field:l10n.es.aeat.mod340.investment,date_invoice:0
+#: field:l10n.es.aeat.mod340.issued,date_invoice:0
+#: field:l10n.es.aeat.mod340.received,date_invoice:0
+msgid "Date Invoice"
+msgstr "Fecha Factura"
 
=== modified file 'l10n_es_aeat_mod340/i18n/l10n_es_aeat_mod340.pot'
--- l10n_es_aeat_mod340/i18n/l10n_es_aeat_mod340.pot	2013-11-22 23:44:11 +0000
+++ l10n_es_aeat_mod340/i18n/l10n_es_aeat_mod340.pot	2014-02-03 11:19:23 +0000
@@ -1,22 +1,37 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#   * l10n_es_aeat_mod340
+#	* l10n_es_aeat_mod340
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.2\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-01-30 10:57+0000\n"
-"PO-Revision-Date: 2012-01-30 10:57+0000\n"
+"Project-Id-Version: OpenERP Server 7.0-20130519-231019\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-10-11 14:52+0000\n"
+"PO-Revision-Date: 2013-10-11 14:52+0000\n"
+"Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "Third quarter"
+#: report:report mod340:0
+#: report:report_mod340:0
+#: report:vat book:0
+#: report:vat_book:0
+msgid "FACTURAS DE SALIDA"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340:0
+msgid "Confirmed models"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: report:report mod340:0
+#: report:vat_book:0
+msgid "Compañía:"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -25,28 +40,22 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/mod340.py:162
-#, python-format
-msgid "All real estate records state code field must be filled."
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/mod340.py:65
-#, python-format
-msgid "En desarrollo"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340.intracomunitarias,amount_tax:0
-#: field:l10n.es.aeat.mod340.investment,amount_tax:0
-#: field:l10n.es.aeat.mod340.issued,amount_tax:0
-#: field:l10n.es.aeat.mod340.received,amount_tax:0
-msgid "amount of the tax"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "March"
+#: code:addons/l10n_es_aeat_mod340/account.py:89
+#, python-format
+msgid "The code field is different.\n"
+""
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340,total_taxable:0
+msgid "Total Taxable"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: code:addons/l10n_es_aeat_mod340/account.py:158
+#, python-format
+msgid "Created tax code %s.\n"
+""
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -61,12 +70,17 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340,total_sharetax:0
+msgid "Total Share Tax"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340,number_records:0
 msgid "Records"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:270
+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:297
 #, python-format
 msgid "The type 2 received record must be 500 characters long for each Vat registry"
 msgstr ""
@@ -82,41 +96,57 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.intracomunitarias,base_tax:0
+#: 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_issued,base_amount:0
 #: field:l10n.es.aeat.mod340.tax_line_received,base_amount:0
 msgid "Base tax bill"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: model:ir.model,name:l10n_es_aeat_mod340.model_account_tax_code
+msgid "Tax Code"
+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
-#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:92
+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:95
 #, python-format
-msgid "El periodo seleccionado no coincide con los periodos del año fiscal:"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: view:l10n.es.aeat.mod340:0
-msgid "In process"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
+msgid "The period hasn't a valid Mod340 period"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: report:report_mod340:0
+#: report:vat_book:0
+msgid "Apellidos y nombre de contacto:"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: selection:l10n.es.aeat.mod340,state:0
+msgid "Processed"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: field:account.tax.code,mod340:0
+#: field:account.tax.code.template,mod340:0
+msgid "Include in mod340"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.intracomunitarias,tax_line_ids:0
+#: field:l10n.es.aeat.mod340.investment,tax_line_ids:0
+#: field:l10n.es.aeat.mod340.issued,tax_line_ids:0
 #: field:l10n.es.aeat.mod340.received,tax_line_ids:0
 msgid "Tax lines"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/mod340.py:156
-#: code:addons/l10n_es_aeat_mod340/mod340.py:158
-#: code:addons/l10n_es_aeat_mod340/mod340.py:162
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
 #: view:l10n.es.aeat.mod340:0
 msgid "Cancelled"
 msgstr ""
@@ -127,17 +157,24 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340,company_vat:0
-msgid "VAT number"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:184
+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:213
 #, python-format
 msgid "The type 2 issued record must be 500 characters long for each Vat registry"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340,period_from:0
+msgid "Start period"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: code:addons/l10n_es_aeat_mod340/account.py:167
+#, python-format
+msgid "Updated tax code %s.\n"
+""
+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,intracomunitarias:0
 msgid "Operations Intracomunitarias"
@@ -156,22 +193,50 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340,period_to:0
+msgid "End period"
+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:0
 msgid "Identification"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: view:account.invoice:0
+msgid "Payments"
+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
 #: 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
+msgid "LIBRO DE IVA"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
 #: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_issued
 msgid "Invoices invoice"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:65
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:64
 #, python-format
 msgid "This company dont have NIF"
 msgstr ""
@@ -187,7 +252,12 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:306
+#: view:l10n.es.aeat.mod340:0
+msgid "Cancelled models"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:333
 #, python-format
 msgid "340_report_%s.txt"
 msgstr ""
@@ -198,16 +268,24 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "First quarter"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
 #: model:ir.ui.menu,name:l10n_es_aeat_mod340.menu_aeat_mod340_report
 msgid "AEAT 340 Model"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.intracomunitarias,amount_tax:0
+#: field:l10n.es.aeat.mod340.investment,amount_tax:0
+#: field:l10n.es.aeat.mod340.issued,amount_tax:0
+#: field:l10n.es.aeat.mod340.received,amount_tax:0
+msgid "Total tax"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: report:vat book:0
+msgid "Nº de factura"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
 #: help:l10n.es.aeat.mod340.intracomunitarias,representative_vat:0
 #: help:l10n.es.aeat.mod340.investment,representative_vat:0
 #: help:l10n.es.aeat.mod340.issued,representative_vat:0
@@ -231,7 +309,7 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:306
+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:333
 #, python-format
 msgid "%Y-%m-%d"
 msgstr ""
@@ -242,8 +320,14 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "July"
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:74
+#, python-format
+msgid "The periods selected don't belong to the fiscal year  %s"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340,company_vat:0
+msgid "VAT number"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -257,14 +341,27 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:92
+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:108
 #, python-format
 msgid "The type 1 record must be 500 characters long"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340,calculation_date:0
-msgid "Calculation date"
+#: report:report mod340:0
+#: report:report_mod340: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"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: report:report mod340:0
+#: report:report_mod340:0
+msgid "CIF/NIF del representante legal:"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -277,11 +374,9 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340.intracomunitarias,base_tax:0
-#: 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
-msgid "base tax bill"
+#: report:report mod340:0
+#: report:vat_book:0
+msgid "Cuota impuesto"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -290,13 +385,22 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "September"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "December"
+#: 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"
+""
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340.issued:0
+#: view:l10n.es.aeat.mod340.received:0
+msgid "Total Tax"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -310,13 +414,25 @@
 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"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340,total_taxable:0
-msgid "Total Taxable"
+#: report:report mod340:0
+#: report:report_mod340:0
+msgid "Tipo de declaración"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340,calculation_date:0
+msgid "Calculation date"
+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 ""
+
+#. module: l10n_es_aeat_mod340
+#: field:account.invoice,number_tickets:0
+msgid "Number of tickets"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -325,8 +441,10 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340,total_sharetax:0
-msgid "Total Share Tax"
+#: code:addons/l10n_es_aeat_mod340/account.py:182
+#, python-format
+msgid "Tax code %s: The parent tax code %s can not be set.\n"
+""
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -335,19 +453,17 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/mod340.py:65
-#, python-format
-msgid "No disponible:"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/mod340.py:156
-#, python-format
-msgid "All partner state code field must be filled."
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: model:ir.actions.act_window,name:l10n_es_aeat_mod340.action_account_mod340
+#: report:report mod340:0
+#: report:vat_book:0
+msgid "Fecha"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340:0
+msgid "In process"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
 #: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340
 #: view:l10n.es.aeat.mod340:0
 #: field:l10n.es.aeat.mod340.intracomunitarias,mod340_id:0
@@ -369,22 +485,20 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: code:addons/l10n_es_aeat_mod340/mod340.py:158
-#, python-format
-msgid "All partner vat number field must be filled."
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340.intracomunitarias,total:0
-#: field:l10n.es.aeat.mod340.investment,total:0
-#: field:l10n.es.aeat.mod340.issued,total:0
-#: field:l10n.es.aeat.mod340.received,total:0
-msgid "total"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "August"
+#: view:l10n.es.aeat.mod340.issued:0
+#: view:l10n.es.aeat.mod340.received:0
+msgid "Total Base"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: report:report mod340:0
+#: report:report_mod340:0
+msgid "Número de la declaración anterior:"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: field:account.invoice,first_ticket:0
+msgid "First ticket"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -393,33 +507,34 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: help:account.invoice,is_ticket_summary:0
+msgid "Check if this invoice is a ticket summary"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
 #: selection:l10n.es.aeat.mod340,state:0
 msgid "Processing"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "June"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340,contact_phone:0
 msgid "Phone"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "November"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "October"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "January"
+#: field:account.invoice,last_ticket:0
+msgid "Last ticket"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: field:account.invoice,is_ticket_summary:0
+msgid "Ticket Summary"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: report:report mod340:0
+#: report:vat_book:0
+msgid "Ejercicio fiscal:"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -441,8 +556,8 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,state:0
-msgid "Processed"
+#: view:l10n.es.aeat.mod340:0
+msgid "AEAT Modelo 340"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -451,6 +566,12 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:74
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340,representative_vat:0
 #: field:l10n.es.aeat.mod340.intracomunitarias,representative_vat:0
 #: field:l10n.es.aeat.mod340.investment,representative_vat:0
@@ -470,6 +591,12 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: report:report mod340:0
+#: report:vat_book:0
+msgid "Base imponible"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340.tax_line_received,invoice_record_id:0
 msgid "Invoice received"
 msgstr ""
@@ -480,17 +607,17 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340,period:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
 #: view:l10n.es.aeat.mod340:0
 msgid "General"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
 #: view:l10n.es.aeat.mod340:0
+msgid "In process models"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340:0
 #: selection:l10n.es.aeat.mod340,state:0
 msgid "Done"
 msgstr ""
@@ -501,6 +628,7 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: model:ir.model,name:l10n_es_aeat_mod340.model_account_invoice
 #: field:l10n.es.aeat.mod340.intracomunitarias,invoice_id:0
 #: field:l10n.es.aeat.mod340.investment,invoice_id:0
 #: field:l10n.es.aeat.mod340.issued,invoice_id:0
@@ -519,8 +647,9 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "Fourth quarter"
+#: report:report mod340:0
+#: report:report_mod340:0
+msgid "Código electrónico autoliquidación IVA:"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -529,6 +658,7 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: view:account.invoice:0
 #: view:l10n.es.aeat.mod340:0
 msgid "AEAT 340"
 msgstr ""
@@ -555,8 +685,9 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "May"
+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:178
+#, python-format
+msgid "Invoice  %s, Amount untaxed Lines %.2f do not correspond to AmountUntaxed on Invoice %.2f"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -573,6 +704,12 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: report:report mod340:0
+#: report:vat_book:0
+msgid "Número de factura"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340.intracomunitarias,partner_vat:0
 #: field:l10n.es.aeat.mod340.investment,partner_vat:0
 #: field:l10n.es.aeat.mod340.issued,partner_vat:0
@@ -602,8 +739,9 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "February"
+#: report:report mod340:0
+#: report:report_mod340:0
+msgid "Número:"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -619,8 +757,19 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "April"
+#: report:report mod340:0
+#: report:report_mod340:0
+msgid "Tipo de soporte:"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340,attach_id:0
+msgid "BOE file"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: view:l10n.es.aeat.mod340:0
+msgid "Draft models"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -630,12 +779,25 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
+#: report:report mod340: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_received
 #: field:l10n.es.aeat.mod340,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"
+""
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
 #: selection:l10n.es.aeat.mod340,support_type:0
 msgid "Telematics"
 msgstr ""
@@ -646,8 +808,9 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: selection:l10n.es.aeat.mod340,period:0
-msgid "Second quarter"
+#: report:report mod340:0
+#: report:vat_book:0
+msgid "Empresa"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
@@ -656,43 +819,48 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: field:l10n.es.aeat.mod340.intracomunitarias,tax_line_ids:0
-#: field:l10n.es.aeat.mod340.investment,tax_line_ids:0
-#: field:l10n.es.aeat.mod340.issued,tax_line_ids:0
-msgid "tax lines"
+#: model:ir.model,name:l10n_es_aeat_mod340.model_wizard_update_charts_accounts
+msgid "wizard.update.charts.accounts"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: report:report mod340:0
+#: report:vat_book:0
+msgid "Total factura"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: report:report mod340:0
+#: report:vat_book:0
+msgid "FACTURAS DE ENTRADA"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
 #: field:l10n.es.aeat.mod340,total:0
+#: field:l10n.es.aeat.mod340.intracomunitarias,total:0
+#: field:l10n.es.aeat.mod340.investment,total:0
+#: view:l10n.es.aeat.mod340.issued:0
+#: field:l10n.es.aeat.mod340.issued,total:0
+#: view:l10n.es.aeat.mod340.received:0
+#: field:l10n.es.aeat.mod340.received,total:0
 msgid "Total"
 msgstr ""
 
 #. module: l10n_es_aeat_mod340
-#: field:account.invoice,number_tickets:0
-msgid "Number of tickets"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: field:account.invoice,first_ticket:0
-msgid "First ticket"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: help:account.invoice,is_ticket_summary:0
-msgid "Check if this invoice is a ticket summary"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: field:account.invoice,last_ticket:0
-msgid "Last ticket"
-msgstr ""
-
-#. module: l10n_es_aeat_mod340
-#: field:account.invoice,is_ticket_summary:0
-msgid "Ticket Summary"
-msgstr ""
-
-#. module: account
-#: view:account.invoice:0
-msgid "Tickets"
+#: 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:109
+#, python-format
+msgid "La siguiente empresa no tiene asignado nif:"
+msgstr ""
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340.intracomunitarias,date_invoice:0
+#: field:l10n.es.aeat.mod340.investment,date_invoice:0
+#: field:l10n.es.aeat.mod340.issued,date_invoice:0
+#: field:l10n.es.aeat.mod340.received,date_invoice:0
+msgid "Date Invoice"
 msgstr ""
 \ No newline at end of file
 
=== modified file 'l10n_es_aeat_mod340/mod340.py'
--- l10n_es_aeat_mod340/mod340.py	2013-11-15 03:13:35 +0000
+++ l10n_es_aeat_mod340/mod340.py	2014-02-03 11:19:23 +0000
@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (c) 2011 Ting (http://www.ting.es) All Rights Reserved.
-#    Copyright (c) 2011 Acysos S.L. (http://acysos.com) All Rights Reserved
+#    Copyright (c) 2011-2013 Acysos S.L.(http://acysos.com) All Rights Reserved
 #                       Ignacio Ibeas Izquierdo <[e-mail]>
 #    Copyright (c) 2011 NaN Projectes de Programari Lliure, S.L.
 #                       http://www.NaN-tic.com
@@ -11,8 +11,8 @@
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
+#    it under the terms of the GNU Affero General Public License as published
+#    by the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
@@ -34,9 +34,6 @@
 from tools.translate import _
 import pooler
 
-
-
-
 class l10n_es_aeat_mod340(osv.osv):
    
     def button_calculate(self, cr, uid, ids,  args, context=None):
@@ -47,7 +44,6 @@
         calculate_obj = self.pool.get('l10n.es.aeat.mod340.calculate_records')
         calculate_obj._wkf_calculate_records(cr, uid, ids, context)   
         
-        
         return True
     
     def button_recalculate(self, cr, uid, ids, context=None):
@@ -60,15 +56,13 @@
         return True
 
     def button_export(self, cr, uid, ids, context=None):
-        #FUNCION CALCADA DEL MODELO 347, inoperativa de momento
-        
-        #raise osv.except_osv(_('No disponible:'), _('En desarrollo'))
         
         if context is None:
             context = {}
 
         export_obj = self.pool.get("l10n.es.aeat.mod340.export_to_boe")
-        export_obj._export_boe_file(cr, uid, ids, self.browse(cr, uid, ids and ids[0]))
+        report = self.browse(cr, uid, ids and ids[0])
+        export_obj._export_boe_file(cr, uid, ids, report)
 
         return True
         
@@ -85,91 +79,83 @@
         
         result = {} 
         for id in ids:
-            result[id] = {}.fromkeys(['number_records','total_taxable','total_sharetax','total'], 0.0)
+            result[id] = {}.fromkeys(
+               ['number_records','total_taxable','total_sharetax','total'],
+               0.0)
     
         for model in self.browse(cr, uid, ids,context):
 
             for issue in model.issued:
-                    result[model.id]['number_records'] += len( issue.tax_line_ids )
-                    result[model.id]['total_taxable'] +=issue.base_tax
-                    result[model.id]['total_sharetax'] +=issue.amount_tax
-                    result[model.id]['total'] +=issue.base_tax + issue.amount_tax
+                result[model.id]['number_records'] += len( issue.tax_line_ids )
+                result[model.id]['total_taxable'] +=issue.base_tax
+                result[model.id]['total_sharetax'] +=issue.amount_tax
+                result[model.id]['total'] +=issue.base_tax + issue.amount_tax
 
             for issue in model.received:
-                    result[model.id]['number_records'] += len( issue.tax_line_ids )
-                    result[model.id]['total_taxable'] +=issue.base_tax
-                    result[model.id]['total_sharetax'] +=issue.amount_tax
-                    result[model.id]['total'] +=issue.base_tax + issue.amount_tax
+                result[model.id]['number_records'] += len( issue.tax_line_ids )
+                result[model.id]['total_taxable'] +=issue.base_tax
+                result[model.id]['total_sharetax'] +=issue.amount_tax
+                result[model.id]['total'] +=issue.base_tax + issue.amount_tax
 
         return result
 
-
-
     _inherit = "l10n.es.aeat.report"
     _name = 'l10n.es.aeat.mod340'
     _description = 'Model 340'
     _columns = {
-        'name': fields.function(_name_get, method=True, type="char", size="64", string="Name"),
+        'name': fields.function(_name_get, method=True, type="char", 
+                                size="64", string="Name"),
         'contact_phone': fields.char("Phone", size=9),
         'phone_contact' : fields.char('Phone Contact',size=9),
         'name_contact' : fields.char('Name And Surname Contact',size=40),
-        'period': fields.selection([
-            ('1T','First quarter'),('2T','Second quarter'),('3T','Third quarter'),
-            ('4T','Fourth quarter'),('01','January'),('02','February'),('03','March'),('04','April'),
-            ('05','May'),('06','June'),('07','July'),('08','August'),('09','September'),('10','October'),
-            ('11','November'),('12','December')
-            ], 'Period'),
-        'issued': fields.one2many('l10n.es.aeat.mod340.issued','mod340_id','Invoices Issued'),
-        'received': fields.one2many('l10n.es.aeat.mod340.received','mod340_id','Invoices Received'),
-        'investment': fields.one2many(
-                                      'l10n.es.aeat.mod340.investment','mod340_id','Property Investment'),
-        'intracomunitarias': fields.one2many('l10n.es.aeat.mod340.intracomunitarias','mod340_id','Operations Intracomunitarias'),
+        'period_from': fields.many2one('account.period', 'Start period',
+                                       states={'done': [('readonly', True)]}),
+        'period_to': fields.many2one('account.period', 'End period',
+                                     states={'done': [('readonly', True)]}),
+        'issued': fields.one2many('l10n.es.aeat.mod340.issued','mod340_id',
+                                  'Invoices Issued',
+                                  states={'done': [('readonly', True)]}),
+        'received': fields.one2many('l10n.es.aeat.mod340.received',
+                                    'mod340_id','Invoices Received',
+                                    states={'done': [('readonly', True)]}),
+        'investment': fields.one2many('l10n.es.aeat.mod340.investment',
+                                      'mod340_id','Property Investment'),
+        'intracomunitarias': fields.one2many(
+                             'l10n.es.aeat.mod340.intracomunitarias',
+                             'mod340_id','Operations Intracomunitarias'),
         
         'ean13': fields.char('Electronic Code VAT reverse charge', size=16),
 
-        'total_taxable':  fields.function( _get_number_records, method=True, type='float',   string='Total Taxable',    multi='recalc', help="The declaration will include partners with the total of operations over this limit"),
-        'total_sharetax': fields.function( _get_number_records, method=True, type='float',   string='Total Share Tax',  multi='recalc', help="The declaration will include partners with the total of operations over this limit"),
-        'number_records': fields.function( _get_number_records, method=True, type='integer', string='Records',          multi='recalc', help="The declaration will include partners with the total of operations over this limit"),
-        'total':          fields.function( _get_number_records, method=True, type='float',   string="Total" ,           multi='recalc', help="The declaration will include partners with the total of operations over this limit"),
+        'total_taxable':  fields.function(_get_number_records, method=True,
+            type='float', string='Total Taxable', multi='recalc',
+            help="""The declaration will include partners with the total 
+                of operations over this limit"""),
+        'total_sharetax': fields.function(_get_number_records, method=True,
+            type='float', string='Total Share Tax', multi='recalc',
+            help="""The declaration will include partners with the total 
+                of operations over this limit"""),
+        'number_records': fields.function(_get_number_records, method=True,
+            type='integer', string='Records', multi='recalc',
+            help="""The declaration will include partners with the total 
+                of operations over this limit"""),
+        'total': fields.function(_get_number_records, method=True,
+            type='float', string="Total", multi='recalc',
+            help="""The declaration will include partners with the total 
+                of operations over this limit"""),
         'calculation_date': fields.date('Calculation date', readonly=True),
+        'attach_id':fields.many2one('ir.attachment', 
+                                    'BOE file', readonly=True),
     }
     _defaults = {
-        'support_type' : lambda *a: 'Telemático',
         'number' : lambda *a: '340',
-        'type': lambda *a: 'Normal'
                }
 
     def set_done(self, cr, uid, id, *args):
-        self.write(cr,uid,id,{'calculation_date': time.strftime('%Y-%m-%d'),'state': 'done',})
+        self.write(cr,uid,id,{'calculation_date': time.strftime('%Y-%m-%d'),
+                              'state': 'done',})
         wf_service = netsvc.LocalService("workflow")
         wf_service.trg_validate(uid, 'l10n.es.aeat.mod340', id, 'done', cr)
         return True
-    
-    def _check_report_lines(self, cr, uid, ids, context=None):
-        """checks report lines"""
-#                if context is None: context = {}
-
-#        for item in self.browse(cr, uid, ids, context):
-#            ## Browse partner record lines to check if all are correct (all fields filled)
-#            for partner_record in item.partner_record_ids:
-#                if not partner_record.partner_state_code:
-#                    raise osv.except_osv(_('Error!'), _("All partner state code field must be filled."))
-#                if not partner_record.partner_vat:
-#                    raise osv.except_osv(_('Error!'), _("All partner vat number field must be filled."))
-#
-#            for real_state_record in item.real_state_record_ids:
-#                if not real_state_record.state_code:
-#                    raise osv.except_osv(_('Error!'), _("All real estate records state code field must be filled."))
-
-        return True
-    
-    def check_report(self, cr, uid, ids, context=None):
-        """Different check out in report"""
-        if context is None: context = {}
-
-        self._check_report_lines(cr, uid, ids, context)
-
-        return True
 
     def action_confirm(self, cr, uid, ids, context=None):
         """set to done the report and check its records"""
@@ -200,17 +186,25 @@
     _name = 'l10n.es.aeat.mod340.issued'
     _description = 'Invoices invoice'
     _columns = {                        
-        'mod340_id': fields.many2one('l10n.es.aeat.mod340','Model 340',ondelete="cascade"),
-        'partner_id':fields.many2one('res.partner','Partner',ondelete="cascade"),
+        'mod340_id': fields.many2one('l10n.es.aeat.mod340','Model 340',
+                                     ondelete="cascade"),
+        'partner_id':fields.many2one('res.partner','Partner',
+                                     ondelete="cascade"),
         'partner_vat':fields.char('Company CIF/NIF',size=12),
-        'representative_vat': fields.char('L.R. VAT number', size=9, help="Legal Representative VAT number"),
+        '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('amount of the 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', states = {'done': [('readonly', True)]}),
+        'invoice_id':fields.many2one('account.invoice','Invoice',
+                                     ondelete="cascade"),
+        'base_tax':fields.float('Base tax bill',digits=(13,2)),
+        'amount_tax':fields.float('Total tax',digits=(13,2)),
+        'total':fields.float('Total',digits=(13,2)),
+        'tax_line_ids': fields.one2many('l10n.es.aeat.mod340.tax_line_issued',
+                                        'invoice_record_id', 'Tax lines'),
+        'date_invoice': fields.date('Date Invoice', readonly=True),
     }
+    
+    _order = 'date_invoice asc, invoice_id asc'
 l10n_es_aeat_mod340_issued()
 
 class l10n_es_aeat_mod340_received(osv.osv):
@@ -218,7 +212,8 @@
     _description = 'Invoices Received'
     _inherit = 'l10n.es.aeat.mod340.issued'
     _columns = {
-        'tax_line_ids': fields.one2many('l10n.es.aeat.mod340.tax_line_received', 'invoice_record_id', 'Tax lines', states = {'done': [('readonly', True)]}),
+        'tax_line_ids':fields.one2many('l10n.es.aeat.mod340.tax_line_received',
+                                       'invoice_record_id', 'Tax lines'),
     }
 l10n_es_aeat_mod340_received()
 
@@ -242,7 +237,8 @@
         'tax_percentage': fields.float('Tax percentage',digits=(0,2)),
         'tax_amount': fields.float('Tax amount',digits=(13,2)),
         'base_amount': fields.float('Base tax bill',digits=(13,2)),
-        'invoice_record_id': fields.many2one('l10n.es.aeat.mod340.issued', 'Invoice issued', required=True, ondelete="cascade", select=1),
+        'invoice_record_id': fields.many2one('l10n.es.aeat.mod340.issued',
+             'Invoice issued', required=True, ondelete="cascade", select=1),
     }
 l10n_es_aeat_mod340_tax_line_issued()
 
@@ -251,6 +247,7 @@
     _description = 'Mod340 vat lines received'
     _inherit = 'l10n.es.aeat.mod340.tax_line_issued'
     _columns = {
-        'invoice_record_id': fields.many2one('l10n.es.aeat.mod340.received', 'Invoice received', required=True, ondelete="cascade", select=1),
+        'invoice_record_id': fields.many2one('l10n.es.aeat.mod340.received',
+             'Invoice received', required=True, ondelete="cascade", select=1),
     }
 l10n_es_aeat_mod340_tax_line_received()
 
=== modified file 'l10n_es_aeat_mod340/mod340_view.xml'
--- l10n_es_aeat_mod340/mod340_view.xml	2011-09-20 06:58:23 +0000
+++ l10n_es_aeat_mod340/mod340_view.xml	2014-02-03 11:19:23 +0000
@@ -1,217 +1,195 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-	<!-- Modelo 340 -->
-	<record model="ir.ui.view" id="view_account_mod340_tree">
-		<field name="name">l10n.es.aeat.mod340.tree</field>
-		<field name="model">l10n.es.aeat.mod340</field>
-		<field name="type">tree</field>
-		<!--<field name="priority" eval="5"/>-->
-		<field name="arch" type="xml">
-			<tree string="Model 340">
-                <field name="period"/>
-			    <field name="fiscalyear_id"/>
-                <field name="number"/>
-			    <field name="type"/>
-			</tree>
-		</field>
-	</record>
-
-	<record model="ir.ui.view" id="view_account_mod340_form">
-		<field name="name">l10n.es.aeat.mod340.form</field>
-		<field name="model">l10n.es.aeat.mod340</field>
-		<field name="type">form</field>
-		<field name="priority" eval="5"/>
-		<field name="arch" type="xml">
-		    <form string="Model 340">
-                        <group col="6" colspan="4">
-                        	<field name="company_id" on_change="on_change_company_id(company_id)" required="1" select="1" readonly="1"/>
-                        	<newline/>
-                        	<field name="fiscalyear_id" select="1"/>
-                        	<field name="period" select="1" required="1"/>
-                        	<newline />
-                        	<field name="number"/>
-                        	<field name="support_type"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="General">
-                            <group string="Identification" colspan="4">
-                                <field name="company_vat" required="1" />
-                                <field name="contact_phone"/>
-                                <field name="name_contact" colspan="4"/>
-                                <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" select ="2" readonly="1"/>
-                        			<newline/>
-                        			<field name="total_taxable" select ="2" readonly="1"/>
-                        			<field name="total_sharetax" select ="2" readonly="1"/>
-                        			<field name="total" select="2" readonly="1"/>
-                        			<newline/>
-                        			<field name="calculation_date" select ="2" readonly="1"/>
-                        		</group>
-                        		<group colspan="4" col="10">                                
-                                <field name="state" select="2" readonly="1"/>
-                            </group>
-                            <group colspan="4" col="10">
-                                <button name="button_calculate"
-                                        type="object"
-                                        string="Calculate"
-                                        states="draft"	
-                                        icon="terp-stock_format-scientific"
-                                        />                                        
-                                <button name="button_recalculate"
-                                        type="object"
-                                        string="Recalculate"
-                                        states="calculating,calculated"
-                                        icon="gtk-execute"/>
-                                <button name="button_export"
-                                        type="object"
-                                        string="Export to BOE"
-                                        states="done"
-                                        icon="gtk-execute"/>
-                                <button name="confirm" string="Confirm" type="object" states="calculated" icon="gtk-ok"/>
-                                <button name="cancel" string="Cancel" type="object" states="calculated,done" icon="gtk-cancel"/>
-                                <button name="action_recover" string="Draft" type="object" states="canceled" icon="gtk-undo"/>
-                            
-                            </group>
-                                </page>
-                                <page string="Issued invoice" >
-                               	 <field name="issued" nolabel="1" />
-                                </page>
-                                <page string="Received invoice" >
-                               	 <field name="received" nolabel="1" /> 
-                                </page>
-                                
-                        </notebook>
-		    </form>
-		</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="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Issued invoices">
-                <field name="partner_id"/>
-                <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="type">form</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"/>
-                <newline />
-                <field name="tax_line_ids" />
-            </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="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Received invoices">
-                <field name="partner_id"/>
-                <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="type">form</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"/>
-                <newline />
-                <field name="tax_line_ids" />
-            </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="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Tax line issued">
-                <field name="name"/>
-                <field name="tax_percentage"/>
-                <field name="tax_amount"/>
-                <field name="base_amount"/>
-            </form>
-        </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="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Tax line received">
-                <field name="name"/>
-                <field name="tax_percentage"/>
-                <field name="tax_amount"/>
-                <field name="base_amount"/>
-            </form>
-        </field>
-    </record>
-	
-	<record id="view_l10n_es_aeat_mod340_report_search" model="ir.ui.view">
+		<!-- 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</field>
+			<field name="type">tree</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>
+	
+        <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</field>
+            <field name="inherit_id" ref="l10n_es_aeat.view_l10n_es_aeat_report_form"/>
+            <field name="arch" type="xml">
+		        <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" select="1" required="1" domain="[('fiscalyear_id','=',fiscalyear_id)]"/>
+					<field name="period_to" select="1" required="1" domain="[('fiscalyear_id','=',fiscalyear_id)]"/>
+	            </field>
+	            <field name="calculation_date" position="after">
+	              	<field name="number"/>
+	               	<field name="support_type"/>
+	            </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" select ="2" readonly="1"/>
+	                    			<newline/>
+	                    			<field name="total_taxable" select ="2" readonly="1"/>
+	                    			<field name="total_sharetax" select ="2" readonly="1"/>
+	                    			<field name="total" select="2" readonly="1"/>
+	                    			<newline/>
+	                    			<field name="calculation_date" select ="2" readonly="1"/>
+	                    		</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>
+	                </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="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Issued invoices">
+	            	<field name="date_invoice"/>
+	                <field name="partner_id"/>
+	                <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="type">form</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"/>
+	                <newline />
+	                <field name="tax_line_ids" />
+	            </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="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Received invoices">
+	                <field name="partner_id"/>
+	                <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="type">form</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"/>
+	                <newline />
+	                <field name="tax_line_ids" />
+	            </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="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Tax line issued">
+	                <field name="name"/>
+	                <field name="tax_percentage"/>
+	                <field name="tax_amount"/>
+	                <field name="base_amount"/>
+	            </form>
+	        </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="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Tax line received">
+	                <field name="name"/>
+	                <field name="tax_percentage"/>
+	                <field name="tax_amount"/>
+	                <field name="base_amount"/>
+	            </form>
+	        </field>
+	    </record>
+	
+		<record id="view_l10n_es_aeat_mod340_report_search" model="ir.ui.view">
             <field name="name">AEAT Model 340 (search)</field>
             <field name="model">l10n.es.aeat.mod340</field>
             <field name="type">search</field>
@@ -228,7 +206,8 @@
                         <filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}"/>
                     </group>
                     <newline/>
-                    <field name="period"/>
+                    <field name="period_from"/>
+                    <field name="period_to" />
                     <field name="fiscalyear_id"/>
                     <field name="number"/>
                     <field name="type"/>
@@ -238,14 +217,24 @@
 
         <!-- Window action -->
         <record id="action_l10n_es_aeat_mod340_report" model="ir.actions.act_window">
-            <field name="name">AEAT Model 340</field>
+            <field name="name">AEAT model 340</field>
             <field name="res_model">l10n.es.aeat.mod340</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="help">Create and query AEAT Model 340 Reports</field>
-        </record>
-        
-
+            <field name="help">Create and query AEAT Model 340 reports</field>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_l10n_es_aeat_mod340_report_tree">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_l10n_es_aeat_mod340_tree"/>
+            <field name="act_window_id" ref="action_l10n_es_aeat_mod340_report"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_l10n_es_aeat_mod340_report_form">
+            <field name="sequence" eval="3"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_l10n_es_aeat_mod340_form"/>
+            <field name="act_window_id" ref="action_l10n_es_aeat_mod340_report"/>
+        </record>
 
         <!--
         ### MENU ACCESS ###
 
=== modified file 'l10n_es_aeat_mod340/report/mod340_report.rml'
--- l10n_es_aeat_mod340/report/mod340_report.rml	2011-05-20 19:05:27 +0000
+++ l10n_es_aeat_mod340/report/mod340_report.rml	2014-02-03 11:19:23 +0000
@@ -44,15 +44,18 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#000000" start="5,0" stop="5,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
       <blockBackground colorName="#cccccc" start="0,0" stop="0,-1"/>
       <blockBackground colorName="#cccccc" start="1,0" stop="1,-1"/>
       <blockBackground colorName="#cccccc" start="2,0" stop="2,-1"/>
       <blockBackground colorName="#cccccc" start="3,0" stop="3,-1"/>
       <blockBackground colorName="#cccccc" start="4,0" stop="4,-1"/>
       <blockBackground colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <blockBackground colorName="#cccccc" start="6,0" stop="6,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Taula4">
       <blockAlignment value="LEFT"/>
@@ -63,6 +66,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Taula5">
       <blockAlignment value="LEFT"/>
@@ -78,15 +82,18 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#000000" start="5,0" stop="5,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
       <blockBackground colorName="#cccccc" start="0,0" stop="0,-1"/>
       <blockBackground colorName="#cccccc" start="1,0" stop="1,-1"/>
       <blockBackground colorName="#cccccc" start="2,0" stop="2,-1"/>
       <blockBackground colorName="#cccccc" start="3,0" stop="3,-1"/>
       <blockBackground colorName="#cccccc" start="4,0" stop="4,-1"/>
       <blockBackground colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <blockBackground colorName="#cccccc" start="6,0" stop="6,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Taula6">
       <blockAlignment value="LEFT"/>
@@ -97,6 +104,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -112,6 +120,7 @@
     <paraStyle name="P9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
     <paraStyle name="P10" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
     <paraStyle name="P11" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -121,10 +130,13 @@
     <paraStyle name="Table Contents" fontName="Helvetica"/>
     <paraStyle name="Table Heading" fontName="Helvetica-BoldOblique" alignment="CENTER"/>
     <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <images/>
   </stylesheet>
   <story>
     <para style="Standard">[[repeatIn(objects, 'o')]]</para>
+    <para style="terp_default_8">[[ setLang(o.company_id.partner_id.lang) ]]</para>
     <para style="P4">MODELO AEAT 340</para>
     <blockTable colWidths="117.0,219.0" style="Taula2">
       <tr>
@@ -135,7 +147,7 @@
           <para style="P3">Tipo de soporte: </para>
         </td>
         <td>
-          <para style="P2">[[o.company_id.partner_id.name or '']] </para>
+          <para style="P2">[[ o.company_id.name or '']] </para>
           <para style="P2">[[o.fiscalyear_id.name or '']] </para>
           <para style="P2">[[o.number or '']] </para>
           <para style="P2">[[o.support_type]]</para>
@@ -177,9 +189,12 @@
     <para style="P7">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="108.0,73.0,76.0,75.0,73.0,78.0" repeatRows="1" style="Taula3">
+    <blockTable colWidths="75.0,101.0,60.0,62.0,61.0,59.0,64.0" repeatRows="1" style="Taula3">
       <tr>
         <td>
+          <para style="Table Heading">Fecha</para>
+        </td>
+        <td>
           <para style="Table Heading">Empresa</para>
         </td>
         <td>
@@ -204,9 +219,12 @@
     </para>
     <section>
       <para style="P6">[[repeatIn(o.issued,'r')]]</para>
-      <blockTable colWidths="108.0,73.0,76.0,75.0,73.0,78.0" repeatRows="1" style="Taula4">
+      <blockTable colWidths="75.0,101.0,60.0,62.0,61.0,59.0,64.0" repeatRows="1" style="Taula4">
         <tr>
           <td>
+            <para style="P11">[[ formatLang(r.invoice_id.date_invoice,date=True) ]]</para>
+          </td>
+          <td>
             <para style="P9">[[r.partner_id.name]]</para>
           </td>
           <td>
@@ -237,9 +255,12 @@
     <para style="P7">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="108.0,73.0,76.0,75.0,73.0,78.0" repeatRows="1" style="Taula5">
+    <blockTable colWidths="74.0,102.0,60.0,62.0,61.0,59.0,64.0" repeatRows="1" style="Taula5">
       <tr>
         <td>
+          <para style="Table Heading">Fecha</para>
+        </td>
+        <td>
           <para style="Table Heading">Empresa</para>
         </td>
         <td>
@@ -264,16 +285,19 @@
     </para>
     <section>
       <para style="P6">[[repeatIn(o.received,'r')]]</para>
-      <blockTable colWidths="108.0,73.0,76.0,75.0,73.0,78.0" repeatRows="1" style="Taula6">
+      <blockTable colWidths="75.0,101.0,60.0,62.0,61.0,59.0,64.0" repeatRows="1" style="Taula6">
         <tr>
           <td>
+            <para style="P11">[[ formatLang(r.invoice_id.date_invoice,date=True) ]]</para>
+          </td>
+          <td>
             <para style="P9">[[r.partner_id.name]]</para>
           </td>
           <td>
             <para style="P11">[[r.partner_vat]]</para>
           </td>
           <td>
-            <para style="P11">[[r.invoice_id.number or '0']]</para>
+            <para style="P11">[[r.invoice_id.reference or '0']]</para>
           </td>
           <td>
             <para style="P10">[[r.base_tax]]</para>
@@ -295,4 +319,3 @@
     </para>
   </story>
 </document>
-
 
=== modified file 'l10n_es_aeat_mod340/report/mod340_report.sxw'
 Binary files l10n_es_aeat_mod340/report/mod340_report.sxw	2011-05-20 19:05:27 +0000 and l10n_es_aeat_mod340/report/mod340_report.sxw	2014-02-03 11:19:23 +0000 differ
=== modified file 'l10n_es_aeat_mod340/report/report_view.xml'
--- l10n_es_aeat_mod340/report/report_view.xml	2011-05-07 11:33:47 +0000
+++ l10n_es_aeat_mod340/report/report_view.xml	2014-02-03 11:19:23 +0000
@@ -21,6 +21,26 @@
             rml="l10n_es_aeat_mod340/report/mod340_report.rml"
             auto="True"
             header="False" />
+            
+        <record id="report_vat_book_action" model="ir.actions.report.xml">
+            <field name="name">Vat Book</field>
+            <field name="type">ir.actions.report.xml</field>
+            <field name="model">l10n.es.aeat.mod340</field>
+            <field name="report_name">vat_book</field>
+            <field name="report_type">pdf</field>
+            <field name="report_rml">l10n_es_aeat_mod340/report/vat_book.rml</field>
+            <field name="auto" eval="True"/>
+            <field name="header" eval="False"/>
+        </record>
+
+        <report
+            id="vat_book"
+            string="Vat Book"
+            model="l10n.es.aeat.mod340"
+            name="vat book"
+            rml="l10n_es_aeat_mod340/report/vat_book.rml"
+            auto="True"
+            header="False" />
     </data>
 </openerp>
 
 
=== added file 'l10n_es_aeat_mod340/report/vat_book.rml'
--- l10n_es_aeat_mod340/report/vat_book.rml	1970-01-01 00:00:00 +0000
+++ l10n_es_aeat_mod340/report/vat_book.rml	2014-02-03 11:19:23 +0000
@@ -0,0 +1,310 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Taula2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Taula1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Taula3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <blockBackground colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <blockBackground colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <blockBackground colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <blockBackground colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <blockBackground colorName="#cccccc" start="6,0" stop="6,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Taula4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Taula5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <blockBackground colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <blockBackground colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <blockBackground colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <blockBackground colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <blockBackground colorName="#cccccc" start="6,0" stop="6,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Taula6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="P2" fontName="Helvetica"/>
+    <paraStyle name="P3" fontName="Helvetica" alignment="RIGHT"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="20.0" leading="25" alignment="CENTER"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="6.0" leading="8"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="6.0" leading="8"/>
+    <paraStyle name="P7" fontName="Helvetica" alignment="LEFT"/>
+    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="LEFT"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="P10" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="P11" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="P12" fontName="Helvetica"/>
+    <paraStyle name="P13" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica-BoldOblique" alignment="CENTER"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="Standard">[[repeatIn(objects, 'o')]]</para>
+    <para style="terp_default_8">[[ setLang(o.company_id.partner_id.lang) ]]</para>
+    <para style="P4">LIBRO DE IVA</para>
+    <blockTable colWidths="117.0,219.0" style="Taula2">
+      <tr>
+        <td>
+          <para style="P3">Compañía: </para>
+          <para style="P3">Ejercicio fiscal: </para>
+        </td>
+        <td>
+          <para style="P2">[[o.company_id.name or '']] </para>
+          <para style="P2">[[o.fiscalyear_id.name or '']] </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="237.0,244.0" style="Taula1">
+      <tr>
+        <td>
+          <para style="P3">CIF/NIF: </para>
+          <para style="P3">Teléfono de contacto: </para>
+          <para style="P3">Apellidos y nombre de contacto: </para>
+        </td>
+        <td>
+          <para style="P2">[[o.company_vat or '']] </para>
+          <para style="P2">[[o.contact_phone or '']] </para>
+          <para style="P2">[[o.name_contact or '']] </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P8">FACTURAS DE SALIDA</para>
+    <para style="P7">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="73.0,103.0,60.0,62.0,61.0,59.0,64.0" repeatRows="1" style="Taula3">
+      <tr>
+        <td>
+          <para style="Table Heading">Fecha</para>
+        </td>
+        <td>
+          <para style="Table Heading">Empresa</para>
+        </td>
+        <td>
+          <para style="Table Heading">CIF/NIF</para>
+        </td>
+        <td>
+          <para style="Table Heading">Número de factura</para>
+        </td>
+        <td>
+          <para style="Table Heading">Base imponible</para>
+        </td>
+        <td>
+          <para style="Table Heading">Cuota impuesto</para>
+        </td>
+        <td>
+          <para style="Table Heading">Total factura</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P6">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="P6">[[repeatIn(o.issued,'r')]]</para>
+      <blockTable colWidths="74.0,102.0,60.0,62.0,61.0,59.0,64.0" repeatRows="1" style="Taula4">
+        <tr>
+          <td>
+            <para style="P11">[[ formatLang(r.invoice_id.date_invoice,date=True) ]]</para>
+          </td>
+          <td>
+            <para style="P9">[[r.partner_id.name]]</para>
+          </td>
+          <td>
+            <para style="P11">[[r.partner_vat]]</para>
+          </td>
+          <td>
+            <para style="P11">[[r.invoice_id.number]]</para>
+          </td>
+          <td>
+            <para style="P10">[[r.base_tax]]</para>
+          </td>
+          <td>
+            <para style="P10">[[r.amount_tax or '0']]</para>
+          </td>
+          <td>
+            <para style="P10">[[r.total or '0']]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="P5">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P8">FACTURAS DE ENTRADA</para>
+    <para style="P7">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="74.0,102.0,60.0,62.0,61.0,59.0,64.0" repeatRows="1" style="Taula5">
+      <tr>
+        <td>
+          <para style="Table Heading">Fecha</para>
+        </td>
+        <td>
+          <para style="Table Heading">Empresa</para>
+        </td>
+        <td>
+          <para style="Table Heading">CIF/NIF</para>
+        </td>
+        <td>
+          <para style="Table Heading">Nº de factura</para>
+        </td>
+        <td>
+          <para style="Table Heading">Base imponible</para>
+        </td>
+        <td>
+          <para style="Table Heading">Cuota impuesto</para>
+        </td>
+        <td>
+          <para style="Table Heading">Total factura</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P6">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="P6">[[repeatIn(o.received,'r')]]</para>
+      <blockTable colWidths="74.0,102.0,60.0,62.0,61.0,59.0,64.0" repeatRows="1" style="Taula6">
+        <tr>
+          <td>
+            <para style="P11">[[ formatLang(r.invoice_id.date_invoice,date=True) ]]</para>
+          </td>
+          <td>
+            <para style="P9">[[r.partner_id.name]]</para>
+          </td>
+          <td>
+            <para style="P11">[[r.partner_vat]]</para>
+          </td>
+          <td>
+            <para style="P11">[[r.invoice_id.reference or '0']]</para>
+          </td>
+          <td>
+            <para style="P10">[[r.base_tax]]</para>
+          </td>
+          <td>
+            <para style="P10">[[r.amount_tax or '0']]</para>
+          </td>
+          <td>
+            <para style="P10">[[r.total or '0']]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="P5">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="P5">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
 
=== added file 'l10n_es_aeat_mod340/report/vat_book.sxw'
 Binary files l10n_es_aeat_mod340/report/vat_book.sxw	1970-01-01 00:00:00 +0000 and l10n_es_aeat_mod340/report/vat_book.sxw	2014-02-03 11:19:23 +0000 differ
=== modified file 'l10n_es_aeat_mod340/security/ir.model.access.csv'
--- l10n_es_aeat_mod340/security/ir.model.access.csv	2012-09-08 15:32:47 +0000
+++ l10n_es_aeat_mod340/security/ir.model.access.csv	2014-02-03 11:19:23 +0000
@@ -1,15 +1,13 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_l10n_es_aeat_mod340","l10n_es_aeat_mod340","model_l10n_es_aeat_mod340","account.group_account_user",1,0,0,0
-"access_l10n_es_aeat_mod340_manager","l10n_es_aeat_mod340 manager","model_l10n_es_aeat_mod340","account.group_account_manager",1,1,1,1
-"access_l10n_es_aeat_mod340_issued","l10n_es_aeat_mod340_issued","model_l10n_es_aeat_mod340_issued","account.group_account_user",1,0,0,0
-"access_l10n_es_aeat_mod340_issued_manager","l10n_es_aeat_mod340_issued manager","model_l10n_es_aeat_mod340_issued","account.group_account_manager",1,1,1,1
-"access_l10n_es_aeat_mod340_received","l10n_es_aeat_mod340_received","model_l10n_es_aeat_mod340_received","account.group_account_user",1,0,0,0
-"access_l10n_es_aeat_mod340_received_manager","l10n_es_aeat_mod340_received manager","model_l10n_es_aeat_mod340_received","account.group_account_manager",1,1,1,1
-"access_l10n_es_aeat_mod340_investment","l10n_es_aeat_mod340_investment","model_l10n_es_aeat_mod340_investment","account.group_account_user",1,0,0,0
-"access_l10n_es_aeat_mod340_investment_manager","l10n_es_aeat_mod340_investment manager","model_l10n_es_aeat_mod340_investment","account.group_account_manager",1,1,1,1
-"access_l10n_es_aeat_mod340_intracomunitarias","l10n_es_aeat_mod340_intracomunitarias","model_l10n_es_aeat_mod340_intracomunitarias","account.group_account_user",1,0,0,0
-"access_l10n_es_aeat_mod340_intracomunitarias_manager","l10n_es_aeat_mod340_intracomunitarias manager","model_l10n_es_aeat_mod340_intracomunitarias","account.group_account_manager",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","account.group_account_manager",1,1,1,1
-
-
-
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_l10n_es_aeat_mod340,l10n_es_aeat_mod340,model_l10n_es_aeat_mod340,account.group_account_user,1,0,0,0
+access_l10n_es_aeat_mod340_manager,l10n_es_aeat_mod340 manager,model_l10n_es_aeat_mod340,account.group_account_manager,1,1,1,1
+access_l10n_es_aeat_mod340_issued,l10n_es_aeat_mod340_issued,model_l10n_es_aeat_mod340_issued,account.group_account_user,1,0,0,0
+access_l10n_es_aeat_mod340_issued_manager,l10n_es_aeat_mod340_issued manager,model_l10n_es_aeat_mod340_issued,account.group_account_manager,1,1,1,1
+access_l10n_es_aeat_mod340_received,l10n_es_aeat_mod340_received,model_l10n_es_aeat_mod340_received,account.group_account_user,1,0,0,0
+access_l10n_es_aeat_mod340_received_manager,l10n_es_aeat_mod340_received manager,model_l10n_es_aeat_mod340_received,account.group_account_manager,1,1,1,1
+access_l10n_es_aeat_mod340_investment,l10n_es_aeat_mod340_investment,model_l10n_es_aeat_mod340_investment,account.group_account_user,1,0,0,0
+access_l10n_es_aeat_mod340_investment_manager,l10n_es_aeat_mod340_investment manager,model_l10n_es_aeat_mod340_investment,account.group_account_manager,1,1,1,1
+access_l10n_es_aeat_mod340_intracomunitarias,l10n_es_aeat_mod340_intracomunitarias,model_l10n_es_aeat_mod340_intracomunitarias,account.group_account_user,1,0,0,0
+access_l10n_es_aeat_mod340_intracomunitarias_manager,l10n_es_aeat_mod340_intracomunitarias manager,model_l10n_es_aeat_mod340_intracomunitarias,account.group_account_manager,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,account.group_account_manager,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,account.group_account_manager,1,1,1,1
 
=== added directory 'l10n_es_aeat_mod340/static'
=== added directory 'l10n_es_aeat_mod340/static/src'
=== added directory 'l10n_es_aeat_mod340/static/src/img'
=== added file 'l10n_es_aeat_mod340/static/src/img/icon.png'
 Binary files l10n_es_aeat_mod340/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and l10n_es_aeat_mod340/static/src/img/icon.png	2014-02-03 11:19:23 +0000 differ
=== added file 'l10n_es_aeat_mod340/static/src/img/icon_source.svg'
--- l10n_es_aeat_mod340/static/src/img/icon_source.svg	1970-01-01 00:00:00 +0000
+++ l10n_es_aeat_mod340/static/src/img/icon_source.svg	2014-02-03 11:19:23 +0000
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   width="128"
+   height="128"
+   sodipodi:docname="icon_source.svg"
+   inkscape:export-filename="/home/ignacio/Proyectos/erp/Demo/openerp-7.0-20131224-002412/openerp/addons/l10n_es_aeat_mod340/static/src/img/icon.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="9.2903224"
+     inkscape:cx="65.663825"
+     inkscape:cy="38.86526"
+     inkscape:window-x="1437"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <g
+     id="g3003"
+     transform="translate(-0.07356158,0)">
+    <g
+       transform="translate(0,-3.31149)"
+       id="g2998">
+      <rect
+         style="color:#000000;fill:#0060b2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.51812077;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect2998"
+         width="51.523285"
+         height="118.80513"
+         x="13.910543"
+         y="3.8516259"
+         ry="0"
+         transform="matrix(1,0,0.51069126,0.85976417,0,0)" />
+      <path
+         style="fill:#ffd715;fill-opacity:1;stroke:none"
+         d="M 8.3819299,96.350865 C 15.28056,97.754835 21.012791,96.867186 27.616708,95.369146 62.09419,84.971119 95.837094,59.943837 111.39019,30.987651 c 3.18661,-6.108384 5.44624,-13.663422 7.03447,-20.85088 l 6.46605,10.776762 C 125.69568,40.01481 102.39016,63.273776 86.603152,76.12262 73.967981,86.300307 59.506348,95.700246 46.777865,100.17543 c -9.415431,3.18415 -23.576115,5.76306 -32.88781,5.87454 z"
+         id="path3000"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="fill:#db2f34;fill-opacity:1;stroke:none"
+         d="m 24.427332,35.162809 6.945024,10.297799 C 12.399362,62.416498 10.934918,76.019681 6.2265773,90.24404 L 0,79.467276 C 3.2831165,59.062301 13.253472,46.414525 24.427332,35.162809 z"
+         id="path3021"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+    </g>
+  </g>
+  <text
+     sodipodi:linespacing="125%"
+     id="text2988"
+     y="127.48399"
+     x="-1.5893271"
+     style="font-size:42.27203751px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial Bold"
+     xml:space="preserve"><tspan
+       y="127.48399"
+       x="-1.5893271"
+       id="tspan2990"
+       sodipodi:role="line">340</tspan></text>
+</svg>
 
=== added file 'l10n_es_aeat_mod340/taxes_data.xml'
--- l10n_es_aeat_mod340/taxes_data.xml	1970-01-01 00:00:00 +0000
+++ l10n_es_aeat_mod340/taxes_data.xml	2014-02-03 11:19:23 +0000
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+        <!-- Bases incluidas en el Modelo 340
+             Ignacio Ibeas (Acysos) - [e-mail] (2013-05-13)
+        -->
+        <!--IVA Devengado Base imponible-->
+        <record id="l10n_es.iva_dev_base" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!-- Exentas IVA -->
+        <record id="l10n_es.base_sop_ex" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.base_rep_ex" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!--Regimen general-->
+        <record id="l10n_es.iva_dev_01" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_dev_04" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_dev_04_8" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_dev_04_10" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_dev_07" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_dev_07_18" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_dev_07_21" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!-- ADQUISICIONES INTRACOMUNITARIAS -->
+        <record id="l10n_es.iva_dev_19" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!--IVA DEDUCIBLE -->
+        <record id="l10n_es.iva_ded_base_total" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!-- Base en OPERACIONES INTERIORES CORRIENTES-->
+        <record id="l10n_es.iva_ded_22" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_22_4" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_22_7" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_22_8" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_22_10" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_22_16" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_22_18" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_22_21" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!-- Base en OPERACIONES INTERIORES CON BIENES DE INVERSIÓN-->
+        <record id="l10n_es.iva_ded_24" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_24_4" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_24_7" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_24_8" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_24_10" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_24_16" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_24_18" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_24_21" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES CORRIENTES-->
+        <record id="l10n_es.iva_ded_30" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_30_4" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_30_7" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_30_8" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_30_10" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_30_16" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_30_18" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_30_21" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES DE INVERSIÓN-->
+        <record id="l10n_es.iva_ded_32" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_32_4" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_32_7" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_32_8" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_32_10" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_32_16" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_32_18" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_ded_32_21" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!--Otros Códigos de Impuestos-->
+        <record id="l10n_es.base_intra_42" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.base_extra_44" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+    </data>
+</openerp>
 \ No newline at end of file
 
=== added file 'l10n_es_aeat_mod340/taxes_data_assoc.xml'
--- l10n_es_aeat_mod340/taxes_data_assoc.xml	1970-01-01 00:00:00 +0000
+++ l10n_es_aeat_mod340/taxes_data_assoc.xml	2014-02-03 11:19:23 +0000
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+        <!-- Bases incluidas en el Modelo 340
+             Ignacio Ibeas (Acysos) - [e-mail] (2013-05-13)
+        -->
+        <!--IVA Devengado Base imponible-->
+        <record id="l10n_es.iva_assoc_dev_base" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!-- Exentas IVA -->
+        <record id="l10n_es.base_assoc_sop_ex" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.base_assoc_rep_ex" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!--Regimen general-->
+        <record id="l10n_es.iva_assoc_dev_01" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_dev_04" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_dev_04_8" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_dev_04_10" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_dev_07" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_dev_07_18" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_dev_07_21" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!-- ADQUISICIONES INTRACOMUNITARIAS -->
+        <record id="l10n_es.iva_assoc_dev_19" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!--IVA DEDUCIBLE -->
+        <record id="l10n_es.iva_assoc_ded_base_total" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!-- Base en OPERACIONES INTERIORES CORRIENTES-->
+        <record id="l10n_es.iva_assoc_ded_22" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_22_4" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_22_7" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_22_8" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_22_10" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_22_16" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_22_18" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_22_21" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!-- Base en OPERACIONES INTERIORES CON BIENES DE INVERSIÓN-->
+        <record id="l10n_es.iva_assoc_ded_24" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_24_4" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_24_7" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_24_8" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_24_10" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_24_16" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_24_18" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_24_21" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES CORRIENTES-->
+        <record id="l10n_es.iva_assoc_ded_30" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_30_4" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_30_7" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_30_8" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_30_10" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_30_16" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_30_18" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_30_21" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES DE INVERSIÓN-->
+        <record id="l10n_es.iva_assoc_ded_32" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_32_4" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_32_7" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_32_8" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_32_10" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_32_16" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_32_18" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_assoc_ded_32_21" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!--Otros Códigos de Impuestos-->
+        <record id="l10n_es.base_intra_42" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.base_extra_44" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+    </data>
+</openerp>
 \ No newline at end of file
 
=== added file 'l10n_es_aeat_mod340/taxes_data_pymes.xml'
--- l10n_es_aeat_mod340/taxes_data_pymes.xml	1970-01-01 00:00:00 +0000
+++ l10n_es_aeat_mod340/taxes_data_pymes.xml	2014-02-03 11:19:23 +0000
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+        <!-- Bases incluidas en el Modelo 340
+             Ignacio Ibeas (Acysos) - [e-mail] (2013-05-13)
+        -->
+        <!--IVA Devengado Base imponible-->
+        <record id="l10n_es.iva_pymes_dev_base" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!-- Exentas IVA -->
+        <record id="l10n_es.base_pymes_sop_ex" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.base_pymes_rep_ex" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!--Regimen general-->
+        <record id="l10n_es.iva_pymes_dev_01" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_dev_04" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_dev_04_8" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_dev_04_10" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_dev_07" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_dev_07_18" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_dev_07_21" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!-- ADQUISICIONES INTRACOMUNITARIAS -->
+        <record id="l10n_es.iva_pymes_dev_19" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!--IVA DEDUCIBLE -->
+        <record id="l10n_es.iva_pymes_ded_base_total" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!-- Base en OPERACIONES INTERIORES CORRIENTES-->
+        <record id="l10n_es.iva_pymes_ded_22" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_22_4" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_22_7" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_22_8" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_22_10" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_22_16" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_22_18" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_22_21" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!-- Base en OPERACIONES INTERIORES CON BIENES DE INVERSIÓN-->
+        <record id="l10n_es.iva_pymes_ded_24" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_24_4" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_24_7" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_24_8" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_24_10" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_24_16" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_24_18" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_24_21" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES CORRIENTES-->
+        <record id="l10n_es.iva_pymes_ded_30" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_30_4" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_30_7" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_30_8" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_30_10" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_30_16" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_30_18" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_30_21" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES DE INVERSIÓN-->
+        <record id="l10n_es.iva_pymes_ded_32" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_32_4" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_32_7" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_32_8" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_32_10" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_32_16" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_32_18" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.iva_pymes_ded_32_21" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        <!--Otros Códigos de Impuestos-->
+        <record id="l10n_es.base_intra_42" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+        
+        <record id="l10n_es.base_extra_44" model="account.tax.code.template">
+            <field name="mod340" eval="True"/>
+        </record>
+    </data>
+</openerp>
 \ No newline at end of file
 
=== modified file 'l10n_es_aeat_mod340/wizard/calculate_mod340_records.py'
--- l10n_es_aeat_mod340/wizard/calculate_mod340_records.py	2012-09-26 18:05:45 +0000
+++ l10n_es_aeat_mod340/wizard/calculate_mod340_records.py	2014-02-03 11:19:23 +0000
@@ -2,12 +2,12 @@
 ##############################################################################
 #
 #    Copyright (C) 2011 Ting. All Rights Reserved
-#    Copyright (c) 2011 Acysos S.L. (http://acysos.com) All Rights Reserved
+#    Copyright (c) 2011-2013 Acysos S.L.(http://acysos.com) All Rights Reserved
 #                       Ignacio Ibeas Izquierdo <[e-mail]>
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
+#    it under the terms of the GNU Affero General Public License as published
+#    by the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
@@ -39,7 +39,8 @@
 
         self._calculate_records(cr, uid, ids, context, recalculate=False)
         wf_service = netsvc.LocalService("workflow")
-        wf_service.trg_validate(uid, 'l10n.es.aeat.mod340', ids and ids[0], 'calculate', cr)
+        wf_service.trg_validate(uid, 'l10n.es.aeat.mod340', ids and ids[0],
+                                'calculate', cr)
 
         
 
@@ -53,6 +54,7 @@
             
             invoices340 = self.pool.get('l10n.es.aeat.mod340.issued')
             invoices340_rec = self.pool.get('l10n.es.aeat.mod340.received')
+            period_obj = self.pool.get('account.period')
             
             mod340.write({
                 'state' : 'calculated',
@@ -60,35 +62,23 @@
             })
         
             if not mod340.company_id.partner_id.vat:
-                raise osv.except_osv(mod340.company_id.partner_id.name, _('This company dont have NIF'))
+                raise osv.except_osv(mod340.company_id.partner_id.name,
+                                     _('This company dont have NIF'))
         
             wf_service = netsvc.LocalService("workflow")
-            wf_service.trg_validate(uid, 'l10n.es.aeat.mod347.report', ids and ids[0], 'calculate', cr)
-            
-            fecha_ini = False
-            fecha_fin = False
-            
-            dec_year =mod340.fiscalyear_id.date_start.split('-')[0]
-            
-            mod = mod340.period
-
-            if mod >= '01' and mod <= '12':
-                fecha_ini = datetime.strptime('%s-%s-01' % (dec_year, mod), '%Y-%m-%d')
-                fecha_fin = fecha_ini + relativedelta(months=+1, days=-1)
-
-            if mod in ('1T', '2T', '3T', '4T'):
-                month = ( ( int(mod[0])-1 ) * 3 ) + 1
-                fecha_ini = datetime.strptime('%s-%s-01' % (dec_year, month), '%Y-%m-%d')
-                fecha_fin = fecha_ini + relativedelta(months=+3, days=-1)
-                mod = '%02d' % month
-
-            code = '340'+dec_year+''+mod+'0001'
-            
-            account_period_id = self.pool.get('account.period').search(cr,uid,[('date_start','=',fecha_ini),('date_stop','=',fecha_fin)])
-            
-            if not account_period_id:
-                raise osv.except_osv(_('El periodo seleccionado no coincide con los periodos del año fiscal:'), dec_year)
-            
+            wf_service.trg_validate(uid, 'l10n.es.aeat.mod347.report',
+                                    ids and ids[0], 'calculate', cr)
+
+            code = '340'+mod340.fiscalyear_id.code+''
+            code += mod340.period_to.date_stop[5:7]+'0001'
+            
+            account_period_ids = period_obj.build_ctx_periods(cr, uid,
+                                  mod340.period_from.id, mod340.period_to.id)
+
+            if len(account_period_ids) == 0:
+                raise osv.except_osv(_('Error'),
+                   _("The periods selected don't belong to the fiscal year %s") 
+                   % (mod340.fiscalyear_id.name))
             
             tot_base = 0
             tot_amount = 0
@@ -110,89 +100,103 @@
             if del_ids:
                 invoices340_rec.unlink(cr, uid, del_ids, context=context)
             
-            domain = [('period_id', '=',account_period_id[0]), 
+            domain = [('period_id', 'in',account_period_ids), 
                 ('state', 'in', ('open', 'paid'))]
-
-            invoice_ids = self.pool.get('account.invoice').search(cr, uid, domain, context=context)
-            for invoice in self.pool.get('account.invoice').browse(cr, uid, invoice_ids, context):
-                if invoice.partner_id.vat_type == 1:
-                    if not invoice.partner_id.vat:
-                        raise osv.except_osv(_('La siguiente empresa no tiene asignado nif:'), invoice.partner_id.name)
-                
-                nif = invoice.partner_id.vat and re.match(r"([A-Z]{0,2})(.*)", invoice.partner_id.vat).groups()[1]
-                country_code = invoice.address_invoice_id.country_id.code
-                
-                values = {
-                    'mod340_id': mod340.id,
-                    'partner_id':invoice.partner_id.id,
-                    'partner_vat':nif,
-                    'representative_vat': '',
-                    'partner_country_code' : country_code,
-                    'invoice_id':invoice.id,
-                    'base_tax':invoice.amount_untaxed,
-                    'amount_tax':invoice.amount_tax,
-                    'total':invoice.amount_total
-                }
-                if invoice.type in ( 'out_refund','in_refund'):
-                    values['base_tax'] *=-1
-                    values['amount_tax'] *=-1
-                    values['total'] *=-1
-
-
-                if invoice.type=="out_invoice" or invoice.type=="out_refund":
-                    invoice_created = invoices340.create(cr,uid,values)
-                    
-                if invoice.type=="in_invoice" or invoice.type=="in_refund":
-                    invoice_created = invoices340_rec.create(cr,uid,values)
-                
-                tot_tax_invoice = 0
-                check_tax=0
-                check_base=0
-                
-                # Add the invoices detail to the partner record
+            
+            invoice_obj=self.pool.get('account.invoice')
+            invoice_ids = invoice_obj.search(cr, uid,domain, context=context)
+            for invoice in invoice_obj.browse(cr, uid, invoice_ids, context):
+                include = False
                 for tax_line in invoice.tax_line:
-                    if tax_line.name.find('IRPF') == -1: # Remove IRPF from Mod340
-                        tax_description = tax_line.name.split(' - ')
-                        if len(tax_description) == 2: name = tax_description[1]
-                        if len(tax_description) == 1: name = tax_description[0]
-                        account_tax = self.pool.get('account.tax').browse(cr, uid, self.pool.get('account.tax').search(cr, uid, [('name','=',name)], context=context))
-                        if  account_tax[0].amount < 0:
-                            continue
-
-                        values = {
-                            'name': name,
-                            'tax_percentage': account_tax[0].amount,
-                            'tax_amount': tax_line.tax_amount,
-                            'base_amount': tax_line.base_amount,
-                            'invoice_record_id': invoice_created,
-                        }
-                        if invoice.type=="out_invoice" or invoice.type=="out_refund":
-                            self.pool.get('l10n.es.aeat.mod340.tax_line_issued').create(cr, uid, values)
-                        if invoice.type=="in_invoice" or invoice.type=="in_refund":
-                            self.pool.get('l10n.es.aeat.mod340.tax_line_received').create(cr, uid, values)
-                        tot_tax_invoice += tax_line.tax_amount
-                        tot_rec += 1
-                        check_tax += tax_line.tax_amount
-                        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):
-                    print "id:", invoice.id, "base: %.5f"%invoice.amount_untaxed , "taxlibe base: %.5f"%check_base, "number:",invoice.number
-                    raise osv.except_osv( "REVIEW INVOICE", _('Invoice  %s, Amount untaxed Lines %.2f do not correspond to AmountUntaxed on Invoice %.2f' )%(invoice.number, check_base,  invoice.amount_untaxed*sign)  )
-                
-            mod340.write({'total_taxable':tot_base,'total_sharetax':tot_amount,'number_records':tot_rec,'total':tot_tot,'number':code})
+                    if tax_line.base_code_id:
+                        if tax_line.base_code_id.mod340 == True:
+                            include = True
+                if include == True:
+                    if invoice.partner_id.vat_type == 1:
+                        if not invoice.partner_id.vat:
+                            raise osv.except_osv(
+                              _('La siguiente empresa no tiene asignado nif:'),
+                              invoice.partner_id.name)
+                    
+                    nif = invoice.partner_id.vat and re.match(r"([A-Z]{0,2})(.*)",
+                                          invoice.partner_id.vat).groups()[1]
+                    country_code = invoice.partner_id.country_id.code
+                    
+                    values = {
+                        'mod340_id': mod340.id,
+                        'partner_id':invoice.partner_id.id,
+                        'partner_vat':nif,
+                        'representative_vat': '',
+                        'partner_country_code' : country_code,
+                        'invoice_id':invoice.id,
+                        'base_tax':invoice.amount_untaxed,
+                        'amount_tax':invoice.amount_tax,
+                        'total':invoice.amount_total,
+                        'date_invoice':invoice.date_invoice,
+                    }
+                    if invoice.type in ( 'out_refund','in_refund'):
+                        values['base_tax'] *=-1
+                        values['amount_tax'] *=-1
+                        values['total'] *=-1
+    
+                    
+                    if invoice.type=="out_invoice" or invoice.type=="out_refund":
+                        invoice_created = invoices340.create(cr,uid,values)
+                        
+                    if invoice.type=="in_invoice" or invoice.type=="in_refund":
+                        invoice_created = invoices340_rec.create(cr,uid,values)
+                    
+                    tot_tax_invoice = 0
+                    check_tax=0
+                    check_base=0
+                    
+                    # Add the invoices detail to the partner record
+                    for tax_line in invoice.tax_line:
+                        if tax_line.base_code_id:
+                            if tax_line.base_code_id.mod340 == True:
+                                tax_percentage = tax_line.amount/tax_line.base
+        
+                                values = {
+                                    'name': tax_line.name,
+                                    'tax_percentage': tax_percentage,
+                                    'tax_amount': tax_line.tax_amount,
+                                    'base_amount': tax_line.base_amount,
+                                    '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):
+                        raise osv.except_osv( "REVIEW INVOICE",
+                          _('Invoice  %s, Amount untaxed Lines %.2f do not correspond to AmountUntaxed on Invoice %.2f' )
+                          %(invoice.number, check_base,  invoice.amount_untaxed*sign)  )
+                
+            mod340.write({'total_taxable':tot_base,'total_sharetax':tot_amount,
+                      'number_records':tot_rec,'total':tot_tot,'number':code})
             
             if recalculate:
                 mod340.write({
@@ -212,10 +216,10 @@
         if context is None:
             context = {}
 
-        threaded_calculation = threading.Thread(target=self._calculate_records, args=(cr, uid, ids, context))
+        threaded_calculation = threading.Thread(target=self._calculate_records,
+                                                args=(cr, uid, ids, context))
         threaded_calculation.start()
 
         return {}
 
 l10n_es_aeat_mod340_calculate_records()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py' (properties changed: -x to +x)
--- l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py	2013-11-22 23:44:11 +0000
+++ l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py	2014-02-03 11:19:23 +0000
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Copyright (c) 2011 Acysos S.L. (http://acysos.com) All Rights Reserved.
+#    Copyright (c) 2011-2013 Acysos S.L. (http://acysos.com) All Rights Reserved.
 #                       Ignacio Ibeas <[e-mail]>
 #    Copyright (c) 2011 NaN Projectes de Programari Lliure, S.L.
 #                       http://www.NaN-tic.com
@@ -21,15 +21,14 @@
 #
 ##############################################################################
 
+from datetime import datetime
+from openerp.tools.translate import _
+from openerp.osv import orm
 import base64
 import time
 
-from osv import osv
-from tools.translate import _
-
-
-class l10n_es_aeat_mod340_export_to_boe(osv.osv_memory):
-
+
+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"
     _description = "Export AEAT Model 340 to BOE format"
@@ -63,33 +62,71 @@
             416-500 	Blancos
         """
         text = ''
-
-        text += '1'                                           # Tipo de Registro
-        text += '340'                                         # Modelo Declaración
-        text += self._formatString(report.fiscalyear_id.code, 4)   # Ejercicio
-        text += self._formatString(report.company_vat, 9)          # NIF del declarante
-        text += self._formatString(report.company_id.name, 40)     # Apellidos y nombre o razón social del declarante
-        text += self._formatString(report.support_type, 1)         # Tipo de soporte
-        text += self._formatString(report.contact_phone, 9)       # Persona de contacto (Teléfono)
-        text += self._formatString(report.name_contact, 40)        # Persona de contacto (Apellidos y nombre)
-        text += self._formatNumber(report.number, 13)              # Número identificativo de la declaración
-        if (report.type == 'C'): text += 'C'                       # Declaración complementaria
-        else: text += ' '
-        if (report.type == 'S'): text += 'S'                       # Declaración substitutiva
-        else: text += ' '
-        text += self._formatNumber(report.previous_number, 13)     # Número identificativo de la declaración anterior
-        text += self._formatString(report.period,2)     # Periodo
-        text += self._formatNumber(report.number_records, 9)          # Número total de registros
-        text += self._formatNumber(report.total_taxable, 15, 2,True)       # Importe total de la base imponible
-        text += self._formatNumber(report.total_sharetax, 15, 2,True)      # Importe Total de la cuota del impuesto
-        text += self._formatNumber(report.total, 15, 2,True)      # Importe total de las facturas
-        text += 190*' '                                       # Blancos
-        text += self._formatString(report.representative_vat, 9)   # NIF del representante legal
-        text += self._formatString(report.ean13, 17)   # Sello electrónico
-        text += 84*' '                                        # Blancos
+        # Tipo de Registro
+        text += '1'
+        # Modelo Declaración                                           
+        text += '340'
+        # Ejercicio                                         
+        text += self._formatString(report.fiscalyear_id.code, 4)
+        # NIF del declarante  
+        text += self._formatString(report.company_vat, 9)
+        # Apellidos y nombre o razón social del declarante         
+        text += self._formatString(report.company_id.name, 40)
+        # Tipo de soporte 
+        text += self._formatString(report.support_type, 1)
+        # Persona de contacto (Teléfono)        
+        text += self._formatString(report.contact_phone, 9)
+        # Persona de contacto (Apellidos y nombre)      
+        text += self._formatString(report.name_contact, 40)
+        # Número identificativo de la declaración        
+        text += self._formatNumber(report.number, 13)
+        # Declaración complementaria
+        if (report.type == 'C'): text += 'C'                       
+        else: text += ' '
+        # Declaración substitutiva
+        if (report.type == 'S'): text += 'S'
+        else: text += ' '
+        # Número identificativo de la declaración anterior
+        text += self._formatNumber(report.previous_number, 13)
+        period_stop = report.period_to.date_stop[5:7]
+        period_start = report.period_to.date_start[5:7]
+        if period_start == period_stop:
+            period = period_stop
+        else:
+            if period_stop == '03':
+                period = '1T'
+            elif period_stop == '06':
+                period = '2T'
+            elif period_stop == '09':
+                period = '3T'
+            elif period_stop == '12':
+                period = '4T'
+            else:
+                raise orm.except_orm( "ERROR",
+                              _("The period hasn't a valid Mod340 period" ))
+        # Periodo
+        text += self._formatString(period,2)
+        # Número total de registros 
+        text += self._formatNumber(report.number_records, 9)
+        # Importe total de la base imponible     
+        text += self._formatNumber(report.total_taxable, 15, 2,True)
+        # Importe Total de la cuota del impuesto
+        text += self._formatNumber(report.total_sharetax, 15, 2,True)
+        # Importe total de las facturas
+        text += self._formatNumber(report.total, 15, 2,True)
+        # Blancos   
+        text += 190*' '
+        # NIF del representante legal
+        text += self._formatString(report.representative_vat, 9)
+        # Sello electrónico
+        text += self._formatString(report.ean13, 17)
+        # Blancos
+        text += 84*' '                                        
         text += '\r\n'
 
-        assert len(text) == 502, _("The type 1 record must be 500 characters long")
+        assert len(text)==502,_("The type 1 record must be 500 characters long")
+        print 'Declaration'
+        print text
         return text
     
     def _get_formated_invoice_issued(self, cr, uid, report, invoice_issued):
@@ -105,15 +142,20 @@
             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
+            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.
+            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.
+            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.
             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.
+            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
@@ -121,42 +163,60 @@
             164-177     Base imponible a coste. TODO de momento 0.
             178-217     Identificación de la factura
             218-235     Número de registro TODO No se exactamente que es
-            236-243     Número de facturas. Siempre 1. TODO Resumenes de facturas o tickets. Clave A o B.
-            244-245     Número de registro. Siempre 1. TODO Facturas con varios asientos. Clave C.
-            246-325     Intervalo de acumulación. Vacio. TODO Intervalo de resumenes de facturas o tickets.
+            236-243     Número de facturas. Siempre 1. TODO Resumenes de
+                        facturas o tickets. Clave A o B.
+            244-245     Número de registro. Siempre 1. TODO Facturas con varios
+                        asientos. Clave C.
+            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.
-            385         Situación del Inmueble #TODO  2012
-            386-410     Referencia Catastral #TODO 2012
-            411-425     Importe Percibido en Metálico #TODO 2012
-            426-429     Ejercicio ( cifras del ejercicio en el que se hubieran declarado las operaciones que dan origen al cobro ) #TODO 2012
-            430-444     Importe percibido por transmisiones de Inmuebles sujetas a IVA. #TODO 2012
+            385         Situación del Inmueble #TODO
+            386-410     Referencia Catastral #TODO
+            411-425     Importe Percibido en Metálico #TODO
+            426-429     Ejercicio (cifras del ejercicio en el que se hubieran
+                        declarado las operaciones que dan origen al cobro)
+                        #TODO
+            430-444     Importe percibido por transmisiones de Inmuebles
+                        sujetas a IVA. #TODO
             445-500     BLANCOS            
             
 
         """
         text = ''
         for tax_line in invoice_issued.tax_line_ids:
-    
-            text += '2'                                                     # Tipo de Registro
-            text += '340'                                                   # Modelo Declaración
-            text += self._formatString(report.fiscalyear_id.code, 4)             # Ejercicio
-            text += self._formatString(report.company_vat, 9)                    # NIF del declarante
-            if invoice_issued.partner_country_code == 'ES': text += self._formatString(invoice_issued.partner_vat, 9)            # NIF del declarado
-            else: text += self._formatString(' ', 9) 
-            text += self._formatString(invoice_issued.representative_vat, 9)     # NIF del representante legal
-            text += self._formatString(invoice_issued.partner_id.name, 40)       # Apellidos y nombre, razón social o denominación del declarado
-            text += self._formatString(invoice_issued.partner_country_code, 2)     # Código país
-            text += self._formatNumber(invoice_issued.partner_id.vat_type, 1)   # Clave de identificación en el país de residencia
-            if invoice_issued.partner_country_code != 'ES':                     # Número de identificación fiscal en el país de residencia.
-                text += self._formatString(invoice_issued.partner_country_code, 2)
-                text += self._formatString(invoice_issued.partner_vat, 15)
+            # 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_issued.partner_country_code == 'ES': 
+                text += self._formatString(invoice_issued.partner_vat, 9)
+            else: text += self._formatString(' ', 9)
+            # NIF del representante legal
+            text += self._formatString(invoice_issued.representative_vat, 9)
+            # Apellidos y nombre, razón social o denominación del declarado
+            text += self._formatString(invoice_issued.partner_id.name, 40)
+            # Código país
+            text += self._formatString(invoice_issued.partner_country_code, 2)
+            # Clave de identificación en el país de residencia
+            text += self._formatNumber(invoice_issued.partner_id.vat_type, 1)
+            # Número de identificación fiscal en el país de residencia.   
+            if invoice_issued.partner_country_code != 'ES':
+                text+=self._formatString(invoice_issued.partner_country_code,2)
+                text+=self._formatString(invoice_issued.partner_vat, 15)
             else: text += 17*' '
-            text += 3*' '                                                     # Blancos
-            text += 'E'                                                         # Clave tipo de libro. Constante 'E'.
-            
-            if invoice_issued.invoice_id.origin_invoices_ids:               # Clave de operación
+            # Blancos
+            text += 3*' '
+            # Clave tipo de libro. Constante 'E'.                                           
+            text += 'E'                                                         
+            # Clave de operación
+            if invoice_issued.invoice_id.origin_invoices_ids:               
                 text +='D'
             elif len(invoice_issued.tax_line_ids) > 1: text += 'C'
             elif invoice_issued.invoice_id.is_ticket_summary == 1: text += 'B'
@@ -164,27 +224,38 @@
             
             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)    # Fecha de expedición
+            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)    # Fecha de operación
-            
-            text += self._formatNumber(tax_line.tax_percentage*100,3,2)                        #Tipo impositivo
-            text += self._formatNumber(tax_line.base_amount, 11,2,True)         # Base imponible
-            text += self._formatNumber(tax_line.tax_amount, 11,2,True)         # Cuota del impuesto
-            text += self._formatNumber(tax_line.tax_amount+tax_line.base_amount, 11,2,True)         # Importe total de la factura
-            text += ' '+self._formatNumber(0, 11,2)                             # Base imponible a coste.
-            text += self._formatString(invoice_issued.invoice_id.number, 40)  # Identificación de la factura
-            text += self._formatString(self.pool.get('ir.sequence').get(cr, uid, 'mod340'),18)  # Número de registro
-            if invoice_issued.invoice_id.is_ticket_summary == 1:           # Número de facturas
+            text += self._formatNumber(invoice_issued.invoice_id.date_invoice.split('-')[2],2)    
+            #Tipo impositivo
+            text += self._formatNumber(tax_line.tax_percentage*100,3,2)
+            # Base imponible
+            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_issued.invoice_id.number, 40)
+            # Número de registro
+            text += self._formatString(self.pool.get('ir.sequence').get(cr, uid, 'mod340'),18)
+            # Número de facturas
+            if invoice_issued.invoice_id.is_ticket_summary == 1:           
                 text += self._formatNumber(invoice_issued.invoice_id.number_tickets, 8)
             else: text += self._formatNumber(1, 8)
-            text += self._formatNumber(len(invoice_issued.tax_line_ids), 2)  # Número de registros (Desglose)
-            if invoice_issued.invoice_id.is_ticket_summary == 1:      # Intervalo de identificación de la acumulación
+            # Número de registros (Desglose)
+            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)
                 text += self._formatString(invoice_issued.invoice_id.last_ticket, 40)
             else: text += 80*' '
-            text +=  self._formatString( ",".join( [x.number for x in  invoice_issued.invoice_id.origin_invoices_ids]) , 40 )   # Identificación factura rectificativa
+            # Identificación factura rectificativa
+            text +=  self._formatString( ",".join( [x.number for x in  invoice_issued.invoice_id.origin_invoices_ids]) , 40 )
             text += self._formatNumber(0, 5)  # Tipo Recargo de equivalencia
             text += ' '+self._formatNumber(0, 11,2)  # Couta del recargo de equivalencia
             text += '0'  #Situación del Inmueble #TODO  2012
@@ -254,9 +325,7 @@
             text += 3*' '                                                     # Blancos
             text += 'R'                                                         # Clave tipo de libro. Constante 'E'.
             
-            if invoice_received.invoice_id.operation_key == 'I':
-                text +='I'
-            elif len(invoice_received.tax_line_ids) > 1: text += 'C'              # Clave de operación
+            if len(invoice_received.tax_line_ids) > 1: text += 'C'              # Clave de operación
             else: text += ' '
             
             text += self._formatNumber(invoice_received.invoice_id.date_invoice.split('-')[0],4)
@@ -291,38 +360,7 @@
 
         for invoice_received in report.received:
             file_contents += self._get_formated_invoice_received(cr,uid,report, invoice_received)
-
+        print 'Other'
+        print file_contents
         return file_contents
-    
-
-    def _export_boe_file(self, cr, uid, ids, report, model=None, context=None):
-        """
-        Action that exports the data into a BOE formated text file
-        """
-        if context is None:
-            context = {}
-        
-        file_contents = ''
-
-        ##
-        ## Add header record
-        file_contents += self._get_formated_declaration_record(report)
-
-        ##
-        ## Adds other fields
-        file_contents += self._get_formated_other_records(cr,uid,report)
-
-        ##
-        ## Generate the file and save as attachment
-        file = base64.encodestring(file_contents)
-
-        file_name = _("340_report_%s.txt") % (time.strftime(_("%Y-%m-%d")))
-        self.pool.get("ir.attachment").create(cr, uid, {
-            "name" : file_name,
-            "datas" : file,
-            "datas_fname" : file_name,
-            "res_model" : "l10n.es.aeat.mod340",
-            "res_id" : ids and ids[0]
-        }, context=context)
-
-l10n_es_aeat_mod340_export_to_boe()
+
 
=== added file 'l10n_es_aeat_mod340/wizard/export_mod340_to_boe.xml'
--- l10n_es_aeat_mod340/wizard/export_mod340_to_boe.xml	1970-01-01 00:00:00 +0000
+++ l10n_es_aeat_mod340/wizard/export_mod340_to_boe.xml	2014-02-03 11:19:23 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.actions.act_window" id="action_wizard_aeat_mod340_export">
+            <field name="name">Export AEAT 340 BOE file</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">l10n.es.aeat.mod340.export_to_boe</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_wizard_aeat_mod340_export_form">
+            <field name="act_window_id" ref="action_wizard_aeat_mod340_export"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="l10n_es_aeat.wizard_aeat_export"/>
+        </record>
+    </data>
+</openerp>
 
=== added directory 'l10n_es_aeat_mod340_type0'
=== added file 'l10n_es_aeat_mod340_type0/__init__.py'
--- l10n_es_aeat_mod340_type0/__init__.py	1970-01-01 00:00:00 +0000
+++ l10n_es_aeat_mod340_type0/__init__.py	2014-02-03 11:19:23 +0000
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2013 Acysos S.L. (http://acysos.com) All Rights Reserved
+#                       Ignacio Ibeas Izquierdo <[e-mail]>
+#                      
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard
+import mod340
+
 
=== added file 'l10n_es_aeat_mod340_type0/__openerp__.py'
--- l10n_es_aeat_mod340_type0/__openerp__.py	1970-01-01 00:00:00 +0000
+++ l10n_es_aeat_mod340_type0/__openerp__.py	2014-02-03 11:19:23 +0000
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2011 Ting (http://www.ting.es) All Rights Reserved.
+#    Copyright (c) 2011-2013 Acysos S.L. (http://acysos.com) All Rights Reserved
+#                       Ignacio Ibeas Izquierdo <[e-mail]>
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name' : 'Generación de fichero modelo 340. Registro tipo 0',
+    'version' : '1.0',
+    'author' : 'Acysos S.L.',
+    'website' : 'www.acysos.com',
+    'category' : 'Localisation/Accounting',
+    'description' : '''
+        Exporta el registro de tipo 0 del Modelo 340. 
+        Actualmente solo obligatorio para la Comunidad Foral de Navarra.
+        ''',
+    'license' : 'AGPL-3',
+    'depends' : ['l10n_es_aeat_mod340',
+                 'city',
+                 ],
+    'init_xml' : [],
+    'demo_xml' : [],
+    'update_xml' : [
+        'mod340_view.xml'],
+    'installable' : True,
+    'active' : False,
+}
 
=== added directory 'l10n_es_aeat_mod340_type0/i18n'
=== added file 'l10n_es_aeat_mod340_type0/i18n/es.po'
--- l10n_es_aeat_mod340_type0/i18n/es.po	1970-01-01 00:00:00 +0000
+++ l10n_es_aeat_mod340_type0/i18n/es.po	2014-02-03 11:19:23 +0000
@@ -0,0 +1,124 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_es_aeat_mod340_type0
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.3\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2013-05-17 16:32+0000\n"
+"PO-Revision-Date: 2013-05-17 16:32+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_es_aeat_mod340_type0
+#: view:l10n.es.aeat.mod340:0
+msgid "Presenter"
+msgstr "Presentador"
+
+#. module: l10n_es_aeat_mod340_type0
+#: model:ir.model,name:l10n_es_aeat_mod340_type0.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_type0
+#: code:addons/l10n_es_aeat_mod340_type0/wizard/export_mod340_to_boe.py:121
+#, python-format
+msgid "340_report_%s.txt"
+msgstr "340_report_%s.txt"
+
+#. module: l10n_es_aeat_mod340_type0
+#: model:ir.model,name:l10n_es_aeat_mod340_type0.model_l10n_es_aeat_mod340
+msgid "Model 340"
+msgstr "Modelo 340"
+
+#. module: l10n_es_aeat_mod340_type0
+#: code:addons/l10n_es_aeat_mod340_type0/wizard/export_mod340_to_boe.py:121
+#, python-format
+msgid "%Y-%m-%d"
+msgstr "%Y-%m-%d"
+
+#. module: l10n_es_aeat_mod340_type0
+#: code:addons/l10n_es_aeat_mod340_type0/wizard/export_mod340_to_boe.py:92
+#, python-format
+msgid "The type 0 record must be 500 characters long"
+msgstr "El registro de tipo 0 debe tener 500 caracteres"
+
+#. module: l10n_es_aeat_mod340_type0
+#: view:l10n.es.aeat.mod340:0
+msgid "Address"
+msgstr "Dirección"
+
+#. module: l10n_es_aeat_mod340_type0
+#: view:l10n.es.aeat.mod340:0
+msgid "This information is only for the company that have to present registry type 0. For the moment, only in Comunidad Foral de Navarra"
+msgstr "Esta información es solo para las compañías que deben presentar el registro de tipo 0. Actualmente, solo en la Comunidad Foral de Navarra."
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340,presenter_address_stair:0
+msgid "Stair"
+msgstr "Escalera"
+
+#. module: l10n_es_aeat_mod340
+#: help:l10n.es.aeat.mod340,presenter_city_id:0
+msgid "Use the name or the zip to search the location"
+msgstr "Utilice el nombre o el código postal para buscar la localización"
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340,presenter_phone_contact:0
+msgid "Phone Contact"
+msgstr "Teléfono de contacto"
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340,presenter_address_acronym:0
+msgid "Address Acronym"
+msgstr "Siglas"
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340,presenter_city_id:0
+msgid "Location"
+msgstr "Localización"
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340,presenter_address_door:0
+msgid "Door"
+msgstr "Puerta"
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340,presenter_vat:0
+msgid "VAT number"
+msgstr "CIF/NIF"
+
+#. module: l10n_es_aeat_mod340
+#: help:l10n.es.aeat.mod340,presenter_address_acronym:0
+msgid "Acronyms of the type of public roadway, example St."
+msgstr "Siglas de la vía pública, por ejemplo CL."
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340,presenter_address_number:0
+msgid "Number"
+msgstr "Nº"
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340,presenter_address_floor:0
+msgid "Floor"
+msgstr "Piso"
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340,presenter_name_contact:0
+msgid "Name And Surname Contact"
+msgstr "Nombre y apellido de contacto"
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340,presenter_name:0
+msgid "Name And Surname"
+msgstr "Nombre y apellido"
+
+#. module: l10n_es_aeat_mod340
+#: field:l10n.es.aeat.mod340,presenter_address_name:0
+msgid "Street Name"
+msgstr "Calle"
 
=== added file 'l10n_es_aeat_mod340_type0/i18n/l10n_es_aeat_mod340_type0.pot'
--- l10n_es_aeat_mod340_type0/i18n/l10n_es_aeat_mod340_type0.pot	1970-01-01 00:00:00 +0000
+++ l10n_es_aeat_mod340_type0/i18n/l10n_es_aeat_mod340_type0.pot	2014-02-03 11:19:23 +0000
@@ -0,0 +1,124 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_es_aeat_mod340_type0
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.3\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2013-05-17 16:31+0000\n"
+"PO-Revision-Date: 2013-05-17 16:31+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"