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

Proposed by Ignacio Ibeas (www.acysos.com) on 2014-02-03
Status: Merged
Merged at revision: 422
Proposed branch: lp:~acysos-team/openerp-spain/openerp-spain-7.0-mod340
Merge into: lp:~openerp-spain-team/openerp-spain/7.0
Diff against target: 5492 lines (+3306/-998)
29 files modified
l10n_es_aeat_mod340/__init__.py (+2/-1)
l10n_es_aeat_mod340/__openerp__.py (+42/-31)
l10n_es_aeat_mod340/account.py (+190/-0)
l10n_es_aeat_mod340/account_invoice_view.xml (+18/-20)
l10n_es_aeat_mod340/account_view.xml (+28/-0)
l10n_es_aeat_mod340/i18n/es.po (+389/-217)
l10n_es_aeat_mod340/i18n/l10n_es_aeat_mod340.pot (+351/-183)
l10n_es_aeat_mod340/mod340.py (+75/-78)
l10n_es_aeat_mod340/mod340_view.xml (+206/-217)
l10n_es_aeat_mod340/report/mod340_report.rml (+32/-9)
l10n_es_aeat_mod340/report/report_view.xml (+20/-0)
l10n_es_aeat_mod340/report/vat_book.rml (+310/-0)
l10n_es_aeat_mod340/security/ir.model.access.csv (+13/-15)
l10n_es_aeat_mod340/static/src/img/icon_source.svg (+99/-0)
l10n_es_aeat_mod340/taxes_data.xml (+192/-0)
l10n_es_aeat_mod340/taxes_data_assoc.xml (+192/-0)
l10n_es_aeat_mod340/taxes_data_pymes.xml (+192/-0)
l10n_es_aeat_mod340/wizard/calculate_mod340_records.py (+118/-114)
l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py (+151/-113)
l10n_es_aeat_mod340/wizard/export_mod340_to_boe.xml (+18/-0)
l10n_es_aeat_mod340_type0/__init__.py (+27/-0)
l10n_es_aeat_mod340_type0/__openerp__.py (+45/-0)
l10n_es_aeat_mod340_type0/i18n/es.po (+124/-0)
l10n_es_aeat_mod340_type0/i18n/l10n_es_aeat_mod340_type0.pot (+124/-0)
l10n_es_aeat_mod340_type0/mod340.py (+55/-0)
l10n_es_aeat_mod340_type0/mod340_view.xml (+41/-0)
l10n_es_aeat_mod340_type0/static/src/img/icon_source.svg (+99/-0)
l10n_es_aeat_mod340_type0/wizard/__init__.py (+23/-0)
l10n_es_aeat_mod340_type0/wizard/export_mod340_to_boe.py (+130/-0)
To merge this branch: bzr merge lp:~acysos-team/openerp-spain/openerp-spain-7.0-mod340
Reviewer Review Type Date Requested Status
Pedro Manuel Baeza 2014-02-03 Approve on 2014-02-04
Review via email: mp+204456@code.launchpad.net

Description of the change

Hola,

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

Saludos

To post a comment you must log in.
Pedro Manuel Baeza (pedro.baeza) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_es_aeat_mod340/__init__.py'
2--- l10n_es_aeat_mod340/__init__.py 2012-09-08 15:32:47 +0000
3+++ l10n_es_aeat_mod340/__init__.py 2014-02-03 11:19:23 +0000
4@@ -3,7 +3,7 @@
5 #
6 # OpenERP, Open Source Management Solution
7 # Copyright (c) 20011 Ting (http://www.ting.es) All Rights Reserved.
8-# Copyright (c) 2011 Acysos S.L. (http://acysos.com) All Rights Reserved
9+# Copyright (c) 2011-2013 Acysos S.L. (http://acysos.com) All Rights Reserved
10 # Ignacio Ibeas Izquierdo <ignacio@acysos.com>
11 #
12 # $Id$
13@@ -27,4 +27,5 @@
14 import mod340
15 import res_partner
16 import account_invoice
17+import account
18
19
20=== modified file 'l10n_es_aeat_mod340/__openerp__.py'
21--- l10n_es_aeat_mod340/__openerp__.py 2013-01-28 10:29:06 +0000
22+++ l10n_es_aeat_mod340/__openerp__.py 2014-02-03 11:19:23 +0000
23@@ -3,9 +3,8 @@
24 #
25 # OpenERP, Open Source Management Solution
26 # Copyright (c) 2011 Ting (http://www.ting.es) All Rights Reserved.
27-# Copyright (c) 2011 Acysos S.L. (http://acysos.com) All Rights Reserved
28+# Copyright (c) 2011-2013 Acysos S.L. (http://acysos.com) All Rights Reserved
29 # Ignacio Ibeas Izquierdo <ignacio@acysos.com>
30-#
31 # $Id$
32 #
33 # This program is free software: you can redistribute it and/or modify
34@@ -24,22 +23,24 @@
35 ##############################################################################
36
37 {
38- "name" : "Generación de fichero modelo 340",
39- "version" : "1.0",
40- "author" : "Acysos S.L., Francisco Pascual (Ting), Nan-tic",
41- "website" : "http://www.acysos.com, www.ting.es, www.nan-tic.com",
42- "category" : "Localisation/Accounting",
43- "description" : """
44-Módulo para la presentación del modelo 340. Exportación a formato AEAT.
45-
46---- ESTADO ACTUAL -------------------------------------------------------------
47-
48-Búsqueda de facturas emitidas y recibidas. Excluidas lineas de impuestos con IRPF.
49+ 'name' : 'Generación de fichero modelo 340 y libro de IVA',
50+ 'version' : '2.0',
51+ 'author' : 'Acysos S.L., Francisco Pascual (Ting), Nan-tic',
52+ 'website' : 'www.acysos.com, www.ting.es, www.nan-tic.com',
53+ 'category' : 'Localisation/Accounting',
54+ 'description' : '''
55+Módulo para la presentación del modelo 340. Exportación a formato AEAT. Libro de IVA
56+
57+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.
58+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
59+
60+Búsqueda de facturas emitidas y recibidas.
61 Exportación a formato de AEAT de facturas emitidas y recibidas.
62-Exportación de facturas con varios tipos impositivos. Clave de operación C
63-Facturas intracomunitarias excepto las operaciones a las que hace referencia el artículo 66 del RIVA que tienen un tratamiento especial
64-Facturas rectificativas
65-Facturas resumen de tiques
66+Exportación de facturas con varios tipos impositivos. Clave de operación C.
67+Facturas intracomunitarias excepto las operaciones a las que hace referencia el artículo 66 del RIVA que tienen un tratamiento especial.
68+Facturas rectificativas.
69+Facturas resumen de tiques.
70+Permite imprimir el libro de IVA, basado en la misma legislación.
71
72 --- COSAS PENDIENTES (TODO LIST) ----------------------------------------------
73
74@@ -47,19 +48,29 @@
75 Facturas intracomunitarias. Operaciones a las que hace referencia el artículo 66 del RIVA.
76 Asientos contables de resumen de tiques
77 Exportación de asientos resumen de facturas
78-
79-ADVERTENCIA: Los periodos de la empresas deben coincidir con los peridos de presentación de IVA.
80-""",
81- "website" : "www.acysos.com, www.ting.es",
82- "license" : "AGPL-3",
83- "depends" : ["account",
84- "base_vat",
85- "l10n_es_aeat",
86- "account_refund_original",
87+''',
88+ 'license' : 'AGPL-3',
89+ 'depends' : ['account',
90+ 'base_vat',
91+ 'l10n_es_aeat',
92+ 'account_refund_original',
93+ 'account_chart_update',
94 ],
95- "init_xml" : [],
96- "demo_xml" : [],
97- "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"],
98- "installable" : False,
99- "active" : False,
100+ 'init_xml' : [],
101+ 'demo_xml' : [],
102+ 'update_xml' : [
103+ 'report/report_view.xml',
104+ 'wizard/export_mod340_to_boe.xml',
105+ 'mod340_view.xml',
106+ 'mod340_workflow.xml',
107+ 'security/ir.model.access.csv',
108+ 'res_partner_view.xml',
109+ 'mod340_sequence.xml',
110+ 'account_invoice_view.xml',
111+ 'account_view.xml',
112+ 'taxes_data.xml',
113+ 'taxes_data_pymes.xml',
114+ 'taxes_data_assoc.xml'],
115+ 'installable' : True,
116+ 'active' : False,
117 }
118
119=== added file 'l10n_es_aeat_mod340/account.py'
120--- l10n_es_aeat_mod340/account.py 1970-01-01 00:00:00 +0000
121+++ l10n_es_aeat_mod340/account.py 2014-02-03 11:19:23 +0000
122@@ -0,0 +1,190 @@
123+# -*- coding: utf-8 -*-
124+##############################################################################
125+#
126+# Copyright (c) 2013 Acysos S.L. (http://acysos.com) All Rights Reserved
127+# Ignacio Ibeas Izquierdo <ignacio@acysos.com>
128+#
129+# This program is free software: you can redistribute it and/or modify
130+# it under the terms of the GNU Affero General Public License as published by
131+# the Free Software Foundation, either version 3 of the License, or
132+# (at your option) any later version.
133+#
134+# This program is distributed in the hope that it will be useful,
135+# but WITHOUT ANY WARRANTY; without even the implied warranty of
136+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
137+# GNU Affero General Public License for more details.
138+#
139+# You should have received a copy of the GNU Affero General Public License
140+# along with this program. If not, see <http://www.gnu.org/licenses/>.
141+#
142+##############################################################################
143+
144+from osv import osv, fields
145+from tools.translate import _
146+
147+class account_tax_code_template(osv.osv):
148+
149+ _inherit = 'account.tax.code.template'
150+
151+ _columns = {
152+ 'mod340':fields.boolean("Include in mod340"),
153+ }
154+
155+account_tax_code_template()
156+
157+class account_tax_code(osv.osv):
158+
159+ _inherit = 'account.tax.code'
160+
161+ _columns = {
162+ 'mod340':fields.boolean("Include in mod340"),
163+ }
164+
165+account_tax_code()
166+
167+class wizard_update_charts_accounts(osv.osv_memory):
168+ _inherit = 'wizard.update.charts.accounts'
169+
170+ def _find_tax_codes(self, cr, uid, wizard, context=None):
171+ """
172+ Search for, and load, tax code templates to create/update.
173+ """
174+ new_tax_codes = 0
175+ updated_tax_codes = 0
176+ tax_code_template_mapping = {}
177+
178+ tax_code_templ_obj = self.pool.get('account.tax.code.template')
179+ tax_code_obj = self.pool.get('account.tax.code')
180+ wiz_tax_code_obj = self.pool.get('wizard.update.charts.accounts.tax.code')
181+
182+ # Remove previous tax codes
183+ wiz_tax_code_obj.unlink(cr, uid, wiz_tax_code_obj.search(cr, uid, []))
184+
185+ #
186+ # Search for new / updated tax codes
187+ #
188+ root_tax_code_id = wizard.chart_template_id.tax_code_root_id.id
189+ children_tax_code_template = tax_code_templ_obj.search(cr, uid, [('parent_id', 'child_of', [root_tax_code_id])], order='id')
190+ for tax_code_template in tax_code_templ_obj.browse(cr, uid, children_tax_code_template):
191+ # Ensure the tax code template is on the map (search for the mapped tax code id).
192+ self._map_tax_code_template(cr, uid, wizard, tax_code_template_mapping, tax_code_template, context)
193+
194+ tax_code_id = tax_code_template_mapping.get(tax_code_template.id)
195+ if not tax_code_id:
196+ new_tax_codes += 1
197+ wiz_tax_code_obj.create(cr, uid, {
198+ 'tax_code_id': tax_code_template.id,
199+ 'update_chart_wizard_id': wizard.id,
200+ 'type': 'new',
201+ }, context)
202+ elif wizard.update_tax_code:
203+ #
204+ # Check the tax code for changes.
205+ #
206+ modified = False
207+ notes = ""
208+ tax_code = tax_code_obj.browse(cr, uid, tax_code_id, context=context)
209+
210+ if tax_code.code != tax_code_template.code:
211+ notes += _("The code field is different.\n")
212+ modified = True
213+ if tax_code.info != tax_code_template.info:
214+ notes += _("The info field is different.\n")
215+ modified = True
216+ if tax_code.sign != tax_code_template.sign:
217+ notes += _("The sign field is different.\n")
218+ modified = True
219+ if tax_code.mod340 != tax_code_template.mod340:
220+ notes += _("The Mod 340 field is different.\n")
221+ modified = True
222+
223+ # TODO: We could check other account fields for changes...
224+
225+ if modified:
226+ #
227+ # Tax code to update.
228+ #
229+ updated_tax_codes += 1
230+ wiz_tax_code_obj.create(cr, uid, {
231+ 'tax_code_id': tax_code_template.id,
232+ 'update_chart_wizard_id': wizard.id,
233+ 'type': 'updated',
234+ 'update_tax_code_id': tax_code_id,
235+ 'notes': notes,
236+ }, context)
237+
238+ return { 'new': new_tax_codes, 'updated': updated_tax_codes, 'mapping': tax_code_template_mapping }
239+
240+ def _update_tax_codes(self, cr, uid, wizard, log, context=None):
241+ """
242+ Search for, and load, tax code templates to create/update.
243+ """
244+ tax_code_obj = self.pool.get('account.tax.code')
245+
246+ root_tax_code_id = wizard.chart_template_id.tax_code_root_id.id
247+
248+ new_tax_codes = 0
249+ updated_tax_codes = 0
250+ tax_code_template_mapping = {}
251+
252+ for wiz_tax_code in wizard.tax_code_ids:
253+ tax_code_template = wiz_tax_code.tax_code_id
254+ tax_code_name = (root_tax_code_id == tax_code_template.id) and wizard.company_id.name or tax_code_template.name
255+
256+ # Ensure the parent tax code template is on the map.
257+ self._map_tax_code_template(cr, uid, wizard, tax_code_template_mapping, tax_code_template.parent_id, context)
258+
259+ #
260+ # Values
261+ #
262+ vals = {
263+ 'name': tax_code_name,
264+ 'code': tax_code_template.code,
265+ 'info': tax_code_template.info,
266+ 'parent_id': tax_code_template.parent_id and tax_code_template_mapping.get(tax_code_template.parent_id.id),
267+ 'company_id': wizard.company_id.id,
268+ 'sign': tax_code_template.sign,
269+ 'mod340': tax_code_template.mod340
270+ }
271+
272+ tax_code_id = None
273+ modified = False
274+
275+ if wiz_tax_code.type == 'new':
276+ #
277+ # Create the tax code
278+ #
279+ tax_code_id = tax_code_obj.create(cr, uid, vals)
280+ log.add(_("Created tax code %s.\n") % tax_code_name)
281+ new_tax_codes += 1
282+ modified = True
283+ elif wizard.update_tax_code and wiz_tax_code.update_tax_code_id:
284+ #
285+ # Update the tax code
286+ #
287+ tax_code_id = wiz_tax_code.update_tax_code_id.id
288+ tax_code_obj.write(cr, uid, [tax_code_id], vals)
289+ log.add(_("Updated tax code %s.\n") % tax_code_name)
290+ updated_tax_codes += 1
291+ modified = True
292+ else:
293+ tax_code_id = wiz_tax_code.update_tax_code_id and wiz_tax_code.update_tax_code_id.id
294+ modified = False
295+
296+ # Store the tax codes on the map
297+ tax_code_template_mapping[tax_code_template.id] = tax_code_id
298+
299+ if modified:
300+ #
301+ # Detect errors
302+ #
303+ if tax_code_template.parent_id and not tax_code_template_mapping.get(tax_code_template.parent_id.id):
304+ 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)
305+
306+ return {
307+ 'new': new_tax_codes,
308+ 'updated': updated_tax_codes,
309+ 'mapping': tax_code_template_mapping
310+ }
311+
312+wizard_update_charts_accounts()
313\ No newline at end of file
314
315=== modified file 'l10n_es_aeat_mod340/account_invoice_view.xml'
316--- l10n_es_aeat_mod340/account_invoice_view.xml 2012-09-08 15:32:47 +0000
317+++ l10n_es_aeat_mod340/account_invoice_view.xml 2014-02-03 11:19:23 +0000
318@@ -2,6 +2,24 @@
319 <openerp>
320 <data>
321
322+ <record id="view_customer_account_invoice_ticket_form" model="ir.ui.view">
323+ <field name="name">Account invoice - Ticket summary</field>
324+ <field name="model">account.invoice</field>
325+ <field name="inherit_id" ref="account.invoice_form"/>
326+ <field name="arch" type="xml">
327+ <page string="Payments" position="after">
328+ <page string="AEAT 340">
329+ <field name="is_ticket_summary"/>
330+ <group colspan="4" col="4" attrs="{'invisible': [('is_ticket_summary','=',False)]}">
331+ <field name="first_ticket" attrs="{'required':[('is_ticket_summary','=',True)]}"/>
332+ <field name="last_ticket" attrs="{'required':[('is_ticket_summary','=',True)]}"/>
333+ <field name="number_tickets" attrs="{'required':[('is_ticket_summary','=',True)]}"/>
334+ </group>
335+ </page>
336+ </page>
337+ </field>
338+ </record>
339+
340 <!-- Supplier Invoice -->
341
342 <record id="invoice_supplier_mod340_form" model="ir.ui.view">
343@@ -15,25 +33,5 @@
344 </field>
345 </record>
346
347- <record id="view_customer_account_invoice_ticket_form" model="ir.ui.view">
348- <field name="name">Account invoice - Ticket summary</field>
349- <field name="model">account.invoice</field>
350- <field name="inherit_id" ref="account.invoice_form"/>
351- <field name="arch" type="xml">
352- <data>
353- <xpath expr="/form/notebook" position="inside">
354- <page string="AEAT 340">
355- <field name="is_ticket_summary"/>
356- <group colspan="4" col="4" attrs="{'invisible': [('is_ticket_summary','=',False)]}">
357- <field name="first_ticket" attrs="{'required':[('is_ticket_summary','=',True)]}"/>
358- <field name="last_ticket" attrs="{'required':[('is_ticket_summary','=',True)]}"/>
359- <field name="number_tickets" attrs="{'required':[('is_ticket_summary','=',True)]}"/>
360- </group>
361- </page>
362- </xpath>
363- </data>
364- </field>
365- </record>
366-
367 </data>
368 </openerp>
369\ No newline at end of file
370
371=== added file 'l10n_es_aeat_mod340/account_view.xml'
372--- l10n_es_aeat_mod340/account_view.xml 1970-01-01 00:00:00 +0000
373+++ l10n_es_aeat_mod340/account_view.xml 2014-02-03 11:19:23 +0000
374@@ -0,0 +1,28 @@
375+<?xml version="1.0" encoding="utf-8"?>
376+<openerp>
377+ <data>
378+ <record id="view_tax_code_template_form_mod340" model="ir.ui.view">
379+ <field name="name">account.tax.code.template.form.mod340</field>
380+ <field name="model">account.tax.code.template</field>
381+ <field name="inherit_id" ref="account.view_tax_code_template_form"/>
382+ <field name="type">form</field>
383+ <field name="arch" type="xml">
384+ <field name="sign" position="after">
385+ <field name="mod340"/>
386+ </field>
387+ </field>
388+ </record>
389+
390+ <record id="view_tax_code_form_mod340" model="ir.ui.view">
391+ <field name="name">account.tax.code.form.mod340</field>
392+ <field name="model">account.tax.code</field>
393+ <field name="inherit_id" ref="account.view_tax_code_form"/>
394+ <field name="type">form</field>
395+ <field name="arch" type="xml">
396+ <field name="sign" position="after">
397+ <field name="mod340"/>
398+ </field>
399+ </field>
400+ </record>
401+ </data>
402+</openerp>
403\ No newline at end of file
404
405=== modified file 'l10n_es_aeat_mod340/i18n/es.po'
406--- l10n_es_aeat_mod340/i18n/es.po 2014-01-07 05:30:53 +0000
407+++ l10n_es_aeat_mod340/i18n/es.po 2014-02-03 11:19:23 +0000
408@@ -1,25 +1,40 @@
409 # Translation of OpenERP Server.
410 # This file contains the translation of the following modules:
411-# * l10n_es_aeat_mod340
412+# * l10n_es_aeat_mod340
413 #
414 msgid ""
415 msgstr ""
416-"Project-Id-Version: OpenERP Server 6.0.2\n"
417-"Report-Msgid-Bugs-To: support@openerp.com\n"
418-"POT-Creation-Date: 2012-01-30 10:57+0000\n"
419-"PO-Revision-Date: 2013-12-10 16:44+0000\n"
420-"Last-Translator: Ignacio Ibeas (www.acysos.com) <ignacio@acysos.com>\n"
421+"Project-Id-Version: OpenERP Server 7.0-20130519-231019\n"
422+"Report-Msgid-Bugs-To: \n"
423+"POT-Creation-Date: 2013-10-11 14:58+0000\n"
424+"PO-Revision-Date: 2013-10-11 14:58+0000\n"
425+"Last-Translator: <>\n"
426 "Language-Team: \n"
427 "MIME-Version: 1.0\n"
428 "Content-Type: text/plain; charset=UTF-8\n"
429-"Content-Transfer-Encoding: 8bit\n"
430-"X-Launchpad-Export-Date: 2014-01-07 05:30+0000\n"
431-"X-Generator: Launchpad (build 16877)\n"
432-
433-#. module: l10n_es_aeat_mod340
434-#: selection:l10n.es.aeat.mod340,period:0
435-msgid "Third quarter"
436-msgstr "Tercer trimestre"
437+"Content-Transfer-Encoding: \n"
438+"Plural-Forms: \n"
439+
440+#. module: l10n_es_aeat_mod340
441+#: report:report mod340:0
442+#: report:report_mod340:0
443+#: report:vat book:0
444+#: report:vat_book:0
445+msgid "FACTURAS DE SALIDA"
446+msgstr "FACTURAS DE SALIDA"
447+
448+#. module: l10n_es_aeat_mod340
449+#: view:l10n.es.aeat.mod340:0
450+msgid "Confirmed models"
451+msgstr "Modelos confirmados"
452+
453+#. module: l10n_es_aeat_mod340
454+#: report:report mod340:0
455+#: report:report_mod340:0
456+#: report:vat book:0
457+#: report:vat_book:0
458+msgid "Compañía:"
459+msgstr "Compañía:"
460
461 #. module: l10n_es_aeat_mod340
462 #: view:l10n.es.aeat.mod340.issued:0
463@@ -27,30 +42,25 @@
464 msgstr "Facturas emitidas"
465
466 #. module: l10n_es_aeat_mod340
467-#: code:addons/l10n_es_aeat_mod340/mod340.py:178
468-#, python-format
469-msgid "All real estate records state code field must be filled."
470-msgstr ""
471-"Los registros de propiedades inmobiliarias deben ser rellenados manualmente."
472-
473-#. module: l10n_es_aeat_mod340
474-#: code:addons/l10n_es_aeat_mod340/mod340.py:65
475-#, python-format
476-msgid "En desarrollo"
477-msgstr "En desarrollo"
478-
479-#. module: l10n_es_aeat_mod340
480-#: field:l10n.es.aeat.mod340.intracomunitarias,amount_tax:0
481-#: field:l10n.es.aeat.mod340.investment,amount_tax:0
482-#: field:l10n.es.aeat.mod340.issued,amount_tax:0
483-#: field:l10n.es.aeat.mod340.received,amount_tax:0
484-msgid "amount of the tax"
485-msgstr "cantidad de impuestos"
486-
487-#. module: l10n_es_aeat_mod340
488-#: selection:l10n.es.aeat.mod340,period:0
489-msgid "March"
490-msgstr "Marzo"
491+#: code:addons/l10n_es_aeat_mod340/account.py:89
492+#, python-format
493+msgid "The code field is different.\n"
494+""
495+msgstr "El campo código es diferente.\n"
496+""
497+
498+#. module: l10n_es_aeat_mod340
499+#: field:l10n.es.aeat.mod340,total_taxable:0
500+msgid "Total Taxable"
501+msgstr "Total"
502+
503+#. module: l10n_es_aeat_mod340
504+#: code:addons/l10n_es_aeat_mod340/account.py:158
505+#, python-format
506+msgid "Created tax code %s.\n"
507+""
508+msgstr "Código de impuesto %s creado.\n"
509+""
510
511 #. module: l10n_es_aeat_mod340
512 #: view:l10n.es.aeat.mod340:0
513@@ -64,18 +74,20 @@
514 msgstr "Compañia"
515
516 #. module: l10n_es_aeat_mod340
517+#: field:l10n.es.aeat.mod340,total_sharetax:0
518+msgid "Total Share Tax"
519+msgstr "Total impuestos"
520+
521+#. module: l10n_es_aeat_mod340
522 #: field:l10n.es.aeat.mod340,number_records:0
523 msgid "Records"
524 msgstr "Registros"
525
526 #. module: l10n_es_aeat_mod340
527-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:361
528+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:297
529 #, python-format
530-msgid ""
531-"The type 2 received record must be 500 characters long for each Vat registry"
532-msgstr ""
533-"El registro de tipo 2 debe tener una longitud de 500 caracteres por cada "
534-"registro de IVA"
535+msgid "The type 2 received record must be 500 characters long for each Vat registry"
536+msgstr "El registro de tipo 2 debe tener una longitud de 500 caracteres por cada registro de IVA"
537
538 #. module: l10n_es_aeat_mod340
539 #: selection:l10n.es.aeat.mod340,type:0
540@@ -98,20 +110,39 @@
541 msgstr "Base"
542
543 #. module: l10n_es_aeat_mod340
544+#: model:ir.model,name:l10n_es_aeat_mod340.model_account_tax_code
545+msgid "Tax Code"
546+msgstr "Código impuesto"
547+
548+#. module: l10n_es_aeat_mod340
549 #: model:ir.actions.act_window,help:l10n_es_aeat_mod340.action_l10n_es_aeat_mod340_report
550 msgid "Create and query AEAT Model 340 Reports"
551 msgstr "Crear informe del Model AEAT 340"
552
553 #. module: l10n_es_aeat_mod340
554-#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:92
555+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:95
556 #, python-format
557-msgid "El periodo seleccionado no coincide con los periodos del año fiscal:"
558-msgstr "El periodo seleccionado no coincide con los periodos del año fiscal:"
559-
560-#. module: l10n_es_aeat_mod340
561-#: view:l10n.es.aeat.mod340:0
562-msgid "In process"
563-msgstr "En processo"
564+msgid "The period hasn't a valid Mod340 period"
565+msgstr "El periodo no es válido para el Módelo 340"
566+
567+#. module: l10n_es_aeat_mod340
568+#: report:report mod340:0
569+#: report:report_mod340:0
570+#: report:vat book:0
571+#: report:vat_book:0
572+msgid "Apellidos y nombre de contacto:"
573+msgstr "Apellidos y nombre de contacto:"
574+
575+#. module: l10n_es_aeat_mod340
576+#: selection:l10n.es.aeat.mod340,state:0
577+msgid "Processed"
578+msgstr "Procesado"
579+
580+#. module: l10n_es_aeat_mod340
581+#: field:account.tax.code,mod340:0
582+#: field:account.tax.code.template,mod340:0
583+msgid "Include in mod340"
584+msgstr "Incluir en el modelo 340"
585
586 #. module: l10n_es_aeat_mod340
587 #: field:l10n.es.aeat.mod340.intracomunitarias,tax_line_ids:0
588@@ -122,14 +153,6 @@
589 msgstr "Lineas de impuestos"
590
591 #. module: l10n_es_aeat_mod340
592-#: code:addons/l10n_es_aeat_mod340/mod340.py:172
593-#: code:addons/l10n_es_aeat_mod340/mod340.py:174
594-#: code:addons/l10n_es_aeat_mod340/mod340.py:178
595-#, python-format
596-msgid "Error!"
597-msgstr "Error!"
598-
599-#. module: l10n_es_aeat_mod340
600 #: view:l10n.es.aeat.mod340:0
601 msgid "Cancelled"
602 msgstr "Cancelado"
603@@ -140,18 +163,23 @@
604 msgstr "6 - Otro documento probatorio"
605
606 #. module: l10n_es_aeat_mod340
607-#: field:l10n.es.aeat.mod340,company_vat:0
608-msgid "VAT number"
609-msgstr "CIF/NIF"
610-
611-#. module: l10n_es_aeat_mod340
612-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:275
613-#, python-format
614-msgid ""
615-"The type 2 issued record must be 500 characters long for each Vat registry"
616-msgstr ""
617-"El registro de tipo 2 debe tener una longitud de 500 caracteres por cada "
618-"registro de IVA"
619+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:213
620+#, python-format
621+msgid "The type 2 issued record must be 500 characters long for each Vat registry"
622+msgstr "El registro de tipo 2 debe tener una longitud de 500 caracteres por cada registro de IVA"
623+
624+#. module: l10n_es_aeat_mod340
625+#: field:l10n.es.aeat.mod340,period_from:0
626+msgid "Start period"
627+msgstr "Periodo inicial"
628+
629+#. module: l10n_es_aeat_mod340
630+#: code:addons/l10n_es_aeat_mod340/account.py:167
631+#, python-format
632+msgid "Updated tax code %s.\n"
633+""
634+msgstr "Código de impuesto %s actualizado.\n"
635+""
636
637 #. module: l10n_es_aeat_mod340
638 #: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_intracomunitarias
639@@ -172,16 +200,48 @@
640 msgstr "Código electrónico del modelo 340"
641
642 #. module: l10n_es_aeat_mod340
643+#: field:l10n.es.aeat.mod340,period_to:0
644+msgid "End period"
645+msgstr "Periodo final"
646+
647+#. module: l10n_es_aeat_mod340
648+#: code:addons/l10n_es_aeat_mod340/account.py:98
649+#, python-format
650+msgid "The Mod 340 field is different.\n"
651+""
652+msgstr "El campo Mod 340 es diferente.\n"
653+""
654+
655+#. module: l10n_es_aeat_mod340
656 #: view:l10n.es.aeat.mod340:0
657 msgid "Identification"
658 msgstr "Identificación"
659
660 #. module: l10n_es_aeat_mod340
661+#: view:account.invoice:0
662+msgid "Payments"
663+msgstr "Pagos"
664+
665+#. module: l10n_es_aeat_mod340
666+#: report:report mod340:0
667+#: report:report_mod340:0
668+#: report:vat book:0
669+#: report:vat_book:0
670+msgid "Teléfono de contacto:"
671+msgstr "Teléfono de contacto:"
672+
673+#. module: l10n_es_aeat_mod340
674 #: model:ir.actions.report.xml,name:l10n_es_aeat_mod340.report_mod340_action
675 msgid "mod340 report"
676 msgstr "mod340 report"
677
678 #. module: l10n_es_aeat_mod340
679+#: report:vat book:0
680+#: report:vat_book:0
681+msgid "LIBRO DE IVA"
682+msgstr "LIBRO DE IVA"
683+
684+#. module: l10n_es_aeat_mod340
685 #: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_issued
686 msgid "Invoices invoice"
687 msgstr "Facturas"
688@@ -203,7 +263,12 @@
689 msgstr "2 - Se consigna el NIF/IVA (NIF OPERADOR INTRACOMUNITARIO)"
690
691 #. module: l10n_es_aeat_mod340
692-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:406
693+#: view:l10n.es.aeat.mod340:0
694+msgid "Cancelled models"
695+msgstr "Cancelled models"
696+
697+#. module: l10n_es_aeat_mod340
698+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:333
699 #, python-format
700 msgid "340_report_%s.txt"
701 msgstr "340_report_%s.txt"
702@@ -214,16 +279,25 @@
703 msgstr "Estado"
704
705 #. module: l10n_es_aeat_mod340
706-#: selection:l10n.es.aeat.mod340,period:0
707-msgid "First quarter"
708-msgstr "Primer trimestre"
709-
710-#. module: l10n_es_aeat_mod340
711 #: model:ir.ui.menu,name:l10n_es_aeat_mod340.menu_aeat_mod340_report
712 msgid "AEAT 340 Model"
713 msgstr "Modelo AEAT 340"
714
715 #. module: l10n_es_aeat_mod340
716+#: field:l10n.es.aeat.mod340.intracomunitarias,amount_tax:0
717+#: field:l10n.es.aeat.mod340.investment,amount_tax:0
718+#: field:l10n.es.aeat.mod340.issued,amount_tax:0
719+#: field:l10n.es.aeat.mod340.received,amount_tax:0
720+msgid "Total tax"
721+msgstr "Total impuestos"
722+
723+#. module: l10n_es_aeat_mod340
724+#: report:vat book:0
725+#: report:vat_book:0
726+msgid "Nº de factura"
727+msgstr "Nº de factura"
728+
729+#. module: l10n_es_aeat_mod340
730 #: help:l10n.es.aeat.mod340.intracomunitarias,representative_vat:0
731 #: help:l10n.es.aeat.mod340.investment,representative_vat:0
732 #: help:l10n.es.aeat.mod340.issued,representative_vat:0
733@@ -247,7 +321,7 @@
734 msgstr "Tipo de soporte"
735
736 #. module: l10n_es_aeat_mod340
737-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:406
738+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:333
739 #, python-format
740 msgid "%Y-%m-%d"
741 msgstr "%d-%m-%Y"
742@@ -258,9 +332,15 @@
743 msgstr "Exportar al BOE"
744
745 #. module: l10n_es_aeat_mod340
746-#: selection:l10n.es.aeat.mod340,period:0
747-msgid "July"
748-msgstr "Julio"
749+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:74
750+#, python-format
751+msgid "The periods selected don't belong to the fiscal year %s"
752+msgstr "Los periodos seleccionados no pertenecen al año fiscal %s"
753+
754+#. module: l10n_es_aeat_mod340
755+#: field:l10n.es.aeat.mod340,company_vat:0
756+msgid "VAT number"
757+msgstr "CIF/NIF"
758
759 #. module: l10n_es_aeat_mod340
760 #: selection:res.partner,vat_type:0
761@@ -273,15 +353,29 @@
762 msgstr "Exportar Modelo AEAT 340 al formato del BOE"
763
764 #. module: l10n_es_aeat_mod340
765-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:170
766+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:108
767 #, python-format
768 msgid "The type 1 record must be 500 characters long"
769 msgstr "El registro de tipo 1 tiene que tener 500 caracteres de longitud"
770
771 #. module: l10n_es_aeat_mod340
772-#: field:l10n.es.aeat.mod340,calculation_date:0
773-msgid "Calculation date"
774-msgstr "Fecha de calculo"
775+#: report:report mod340:0
776+#: report:report_mod340:0
777+#: report:vat book:0
778+#: report:vat_book:0
779+msgid "CIF/NIF:"
780+msgstr "CIF/NIF:"
781+
782+#. module: l10n_es_aeat_mod340
783+#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_tax_line_issued
784+msgid "Mod340 vat lines issued"
785+msgstr "Líneas de impuestos emitidos"
786+
787+#. module: l10n_es_aeat_mod340
788+#: report:report mod340:0
789+#: report:report_mod340:0
790+msgid "CIF/NIF del representante legal:"
791+msgstr "CIF/NIF del representante legal:"
792
793 #. module: l10n_es_aeat_mod340
794 #: model:ir.model,name:l10n_es_aeat_mod340.model_res_partner
795@@ -293,12 +387,12 @@
796 msgstr "Empresa"
797
798 #. module: l10n_es_aeat_mod340
799-#: field:l10n.es.aeat.mod340.intracomunitarias,base_tax:0
800-#: field:l10n.es.aeat.mod340.investment,base_tax:0
801-#: field:l10n.es.aeat.mod340.issued,base_tax:0
802-#: field:l10n.es.aeat.mod340.received,base_tax:0
803-msgid "base tax bill"
804-msgstr "Base imponible"
805+#: report:report mod340:0
806+#: report:report_mod340:0
807+#: report:vat book:0
808+#: report:vat_book:0
809+msgid "Cuota impuesto"
810+msgstr "Cuota impuesto"
811
812 #. module: l10n_es_aeat_mod340
813 #: view:l10n.es.aeat.mod340.tax_line_received:0
814@@ -306,14 +400,24 @@
815 msgstr "Líneas de impuestos recibidos"
816
817 #. module: l10n_es_aeat_mod340
818-#: selection:l10n.es.aeat.mod340,period:0
819-msgid "September"
820-msgstr "Septiembre"
821-
822-#. module: l10n_es_aeat_mod340
823-#: selection:l10n.es.aeat.mod340,period:0
824-msgid "December"
825-msgstr "Diciembre"
826+#: report:report mod340:0
827+#: report:report_mod340:0
828+msgid "MODELO AEAT 340"
829+msgstr "MODELO AEAT 340"
830+
831+#. module: l10n_es_aeat_mod340
832+#: code:addons/l10n_es_aeat_mod340/account.py:95
833+#, python-format
834+msgid "The sign field is different.\n"
835+""
836+msgstr "El campo signo es diferente.\n"
837+""
838+
839+#. module: l10n_es_aeat_mod340
840+#: view:l10n.es.aeat.mod340.issued:0
841+#: view:l10n.es.aeat.mod340.received:0
842+msgid "Total Tax"
843+msgstr "Total Impuestos"
844
845 #. module: l10n_es_aeat_mod340
846 #: field:l10n.es.aeat.mod340,number:0
847@@ -326,14 +430,26 @@
848 msgstr "Cancelado"
849
850 #. module: l10n_es_aeat_mod340
851-#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_tax_line_issued
852-msgid "Mod340 vat lines issued"
853-msgstr "Líneas de impuestos emitidos"
854-
855-#. module: l10n_es_aeat_mod340
856-#: field:l10n.es.aeat.mod340,total_taxable:0
857-msgid "Total Taxable"
858-msgstr "Total"
859+#: report:report mod340:0
860+#: report:report_mod340:0
861+msgid "Tipo de declaración"
862+msgstr "Tipo de declaración"
863+
864+#. module: l10n_es_aeat_mod340
865+#: field:l10n.es.aeat.mod340,calculation_date:0
866+msgid "Calculation date"
867+msgstr "Fecha de calculo"
868+
869+#. module: l10n_es_aeat_mod340
870+#: model:ir.actions.report.xml,name:l10n_es_aeat_mod340.report_vat_book_action
871+#: model:ir.actions.report.xml,name:l10n_es_aeat_mod340.vat_book
872+msgid "Vat Book"
873+msgstr "Libro de IVA"
874+
875+#. module: l10n_es_aeat_mod340
876+#: field:account.invoice,number_tickets:0
877+msgid "Number of tickets"
878+msgstr "Número de tiques"
879
880 #. module: l10n_es_aeat_mod340
881 #: view:l10n.es.aeat.mod340:0
882@@ -341,9 +457,12 @@
883 msgstr "Calcular"
884
885 #. module: l10n_es_aeat_mod340
886-#: field:l10n.es.aeat.mod340,total_sharetax:0
887-msgid "Total Share Tax"
888-msgstr "Total impuestos"
889+#: code:addons/l10n_es_aeat_mod340/account.py:182
890+#, python-format
891+msgid "Tax code %s: The parent tax code %s can not be set.\n"
892+""
893+msgstr "Código de impuesto %s: el padre de %s no puede ser guardado.\n"
894+""
895
896 #. module: l10n_es_aeat_mod340
897 #: selection:l10n.es.aeat.mod340,support_type:0
898@@ -351,16 +470,17 @@
899 msgstr "DVD"
900
901 #. module: l10n_es_aeat_mod340
902-#: code:addons/l10n_es_aeat_mod340/mod340.py:65
903-#, python-format
904-msgid "No disponible:"
905-msgstr "No disponible:"
906+#: report:report mod340:0
907+#: report:report_mod340:0
908+#: report:vat book:0
909+#: report:vat_book:0
910+msgid "Fecha"
911+msgstr "Fecha"
912
913 #. module: l10n_es_aeat_mod340
914-#: code:addons/l10n_es_aeat_mod340/mod340.py:172
915-#, python-format
916-msgid "All partner state code field must be filled."
917-msgstr "Todos las empresas deben tener provincia."
918+#: view:l10n.es.aeat.mod340:0
919+msgid "In process"
920+msgstr "En processo"
921
922 #. module: l10n_es_aeat_mod340
923 #: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340
924@@ -384,23 +504,21 @@
925 msgstr "3 - Pasaporte"
926
927 #. module: l10n_es_aeat_mod340
928-#: code:addons/l10n_es_aeat_mod340/mod340.py:174
929-#, python-format
930-msgid "All partner vat number field must be filled."
931-msgstr "Todas las empresas deben tener CIF/NIF."
932-
933-#. module: l10n_es_aeat_mod340
934-#: field:l10n.es.aeat.mod340.intracomunitarias,total:0
935-#: field:l10n.es.aeat.mod340.investment,total:0
936-#: field:l10n.es.aeat.mod340.issued,total:0
937-#: field:l10n.es.aeat.mod340.received,total:0
938-msgid "total"
939-msgstr "total"
940-
941-#. module: l10n_es_aeat_mod340
942-#: selection:l10n.es.aeat.mod340,period:0
943-msgid "August"
944-msgstr "Agosto"
945+#: view:l10n.es.aeat.mod340.issued:0
946+#: view:l10n.es.aeat.mod340.received:0
947+msgid "Total Base"
948+msgstr "Total Base"
949+
950+#. module: l10n_es_aeat_mod340
951+#: report:report mod340:0
952+#: report:report_mod340:0
953+msgid "Número de la declaración anterior:"
954+msgstr "Número de la declaración anterior:"
955+
956+#. module: l10n_es_aeat_mod340
957+#: field:account.invoice,first_ticket:0
958+msgid "First ticket"
959+msgstr "Primer tique"
960
961 #. module: l10n_es_aeat_mod340
962 #: selection:l10n.es.aeat.mod340,type:0
963@@ -408,34 +526,37 @@
964 msgstr "Normal"
965
966 #. module: l10n_es_aeat_mod340
967+#: help:account.invoice,is_ticket_summary:0
968+msgid "Check if this invoice is a ticket summary"
969+msgstr "Active si esta factura es un resumen de tiques"
970+
971+#. module: l10n_es_aeat_mod340
972 #: selection:l10n.es.aeat.mod340,state:0
973 msgid "Processing"
974 msgstr "Procesando"
975
976 #. module: l10n_es_aeat_mod340
977-#: selection:l10n.es.aeat.mod340,period:0
978-msgid "June"
979-msgstr "Junio"
980-
981-#. module: l10n_es_aeat_mod340
982 #: field:l10n.es.aeat.mod340,contact_phone:0
983 msgid "Phone"
984 msgstr "Teléfono"
985
986 #. module: l10n_es_aeat_mod340
987-#: selection:l10n.es.aeat.mod340,period:0
988-msgid "November"
989-msgstr "Noviembre"
990-
991-#. module: l10n_es_aeat_mod340
992-#: selection:l10n.es.aeat.mod340,period:0
993-msgid "October"
994-msgstr "Octubre"
995-
996-#. module: l10n_es_aeat_mod340
997-#: selection:l10n.es.aeat.mod340,period:0
998-msgid "January"
999-msgstr "Enero"
1000+#: field:account.invoice,last_ticket:0
1001+msgid "Last ticket"
1002+msgstr "Último tique"
1003+
1004+#. module: l10n_es_aeat_mod340
1005+#: field:account.invoice,is_ticket_summary:0
1006+msgid "Ticket Summary"
1007+msgstr "Resumen de tiques"
1008+
1009+#. module: l10n_es_aeat_mod340
1010+#: report:report mod340:0
1011+#: report:report_mod340:0
1012+#: report:vat book:0
1013+#: report:vat_book:0
1014+msgid "Ejercicio fiscal:"
1015+msgstr "Ejercicio fiscal:"
1016
1017 #. module: l10n_es_aeat_mod340
1018 #: field:l10n.es.aeat.mod340.intracomunitarias,partner_country_code:0
1019@@ -456,9 +577,9 @@
1020 msgstr "Modelo 340 - Calcular registros"
1021
1022 #. module: l10n_es_aeat_mod340
1023-#: selection:l10n.es.aeat.mod340,state:0
1024-msgid "Processed"
1025-msgstr "Procesado"
1026+#: view:l10n.es.aeat.mod340:0
1027+msgid "AEAT Modelo 340"
1028+msgstr "AEAT Modelo 340"
1029
1030 #. module: l10n_es_aeat_mod340
1031 #: field:l10n.es.aeat.mod340.tax_line_issued,invoice_record_id:0
1032@@ -466,6 +587,12 @@
1033 msgstr "Factudas emitidas"
1034
1035 #. module: l10n_es_aeat_mod340
1036+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:74
1037+#, python-format
1038+msgid "Error"
1039+msgstr "Error"
1040+
1041+#. module: l10n_es_aeat_mod340
1042 #: field:l10n.es.aeat.mod340,representative_vat:0
1043 #: field:l10n.es.aeat.mod340.intracomunitarias,representative_vat:0
1044 #: field:l10n.es.aeat.mod340.investment,representative_vat:0
1045@@ -485,6 +612,14 @@
1046 msgstr "Facturas emitidas"
1047
1048 #. module: l10n_es_aeat_mod340
1049+#: report:report mod340:0
1050+#: report:report_mod340:0
1051+#: report:vat book:0
1052+#: report:vat_book:0
1053+msgid "Base imponible"
1054+msgstr "Base imponible"
1055+
1056+#. module: l10n_es_aeat_mod340
1057 #: field:l10n.es.aeat.mod340.tax_line_received,invoice_record_id:0
1058 msgid "Invoice received"
1059 msgstr "Factura recibida"
1060@@ -495,17 +630,17 @@
1061 msgstr "Tipo de documento"
1062
1063 #. module: l10n_es_aeat_mod340
1064-#: field:l10n.es.aeat.mod340,period:0
1065-msgid "Period"
1066-msgstr "Periodo"
1067-
1068-#. module: l10n_es_aeat_mod340
1069 #: view:l10n.es.aeat.mod340:0
1070 msgid "General"
1071 msgstr "General"
1072
1073 #. module: l10n_es_aeat_mod340
1074 #: view:l10n.es.aeat.mod340:0
1075+msgid "In process models"
1076+msgstr "Modelos en proceso"
1077+
1078+#. module: l10n_es_aeat_mod340
1079+#: view:l10n.es.aeat.mod340:0
1080 #: selection:l10n.es.aeat.mod340,state:0
1081 msgid "Done"
1082 msgstr "Realizado"
1083@@ -535,9 +670,10 @@
1084 msgstr "Recalcular"
1085
1086 #. module: l10n_es_aeat_mod340
1087-#: selection:l10n.es.aeat.mod340,period:0
1088-msgid "Fourth quarter"
1089-msgstr "Cuarto trimestre"
1090+#: report:report mod340:0
1091+#: report:report_mod340:0
1092+msgid "Código electrónico autoliquidación IVA:"
1093+msgstr "Código electrónico autoliquidación IVA:"
1094
1095 #. module: l10n_es_aeat_mod340
1096 #: selection:res.partner,vat_type:0
1097@@ -572,9 +708,10 @@
1098 msgstr "Modelo AEAT 340"
1099
1100 #. module: l10n_es_aeat_mod340
1101-#: selection:l10n.es.aeat.mod340,period:0
1102-msgid "May"
1103-msgstr "Mayo"
1104+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:178
1105+#, python-format
1106+msgid "Invoice %s, Amount untaxed Lines %.2f do not correspond to AmountUntaxed on Invoice %.2f"
1107+msgstr "Factura %s, La cantidad de lineas sin impuesto %.2f no corresponde con la cantidad sin impuestos en la factura %.2f"
1108
1109 #. module: l10n_es_aeat_mod340
1110 #: help:res.partner,vat_type:0
1111@@ -586,12 +723,18 @@
1112 #: help:l10n.es.aeat.mod340,total:0
1113 #: help:l10n.es.aeat.mod340,total_sharetax:0
1114 #: help:l10n.es.aeat.mod340,total_taxable:0
1115-msgid ""
1116-"The declaration will include partners with the total of operations over this "
1117-"limit"
1118+msgid "The declaration will include partners with the total of operations over this limit"
1119 msgstr "La declaración incluye las empresas que no superen este limite"
1120
1121 #. module: l10n_es_aeat_mod340
1122+#: report:report mod340:0
1123+#: report:report_mod340:0
1124+#: report:vat book:0
1125+#: report:vat_book:0
1126+msgid "Número de factura"
1127+msgstr "Número de factura"
1128+
1129+#. module: l10n_es_aeat_mod340
1130 #: field:l10n.es.aeat.mod340.intracomunitarias,partner_vat:0
1131 #: field:l10n.es.aeat.mod340.investment,partner_vat:0
1132 #: field:l10n.es.aeat.mod340.issued,partner_vat:0
1133@@ -621,9 +764,10 @@
1134 msgstr "Nombre y apellido de contacto"
1135
1136 #. module: l10n_es_aeat_mod340
1137-#: selection:l10n.es.aeat.mod340,period:0
1138-msgid "February"
1139-msgstr "Febrero"
1140+#: report:report mod340:0
1141+#: report:report_mod340:0
1142+msgid "Número:"
1143+msgstr "Número:"
1144
1145 #. module: l10n_es_aeat_mod340
1146 #: field:l10n.es.aeat.mod340,name:0
1147@@ -638,9 +782,20 @@
1148 msgstr "Facturas recibidas"
1149
1150 #. module: l10n_es_aeat_mod340
1151-#: selection:l10n.es.aeat.mod340,period:0
1152-msgid "April"
1153-msgstr "Abril"
1154+#: report:report mod340:0
1155+#: report:report_mod340:0
1156+msgid "Tipo de soporte:"
1157+msgstr "Tipo de soporte:"
1158+
1159+#. module: l10n_es_aeat_mod340
1160+#: field:l10n.es.aeat.mod340,attach_id:0
1161+msgid "BOE file"
1162+msgstr "Archivo BOE"
1163+
1164+#. module: l10n_es_aeat_mod340
1165+#: view:l10n.es.aeat.mod340:0
1166+msgid "Draft models"
1167+msgstr "Modelos en borrador"
1168
1169 #. module: l10n_es_aeat_mod340
1170 #: view:l10n.es.aeat.mod340:0
1171@@ -649,12 +804,28 @@
1172 msgstr "Año fiscal"
1173
1174 #. module: l10n_es_aeat_mod340
1175+#: report:report mod340:0
1176+#: report:report_mod340:0
1177+#: report:vat book:0
1178+#: report:vat_book:0
1179+msgid "CIF/NIF"
1180+msgstr "CIF/NIF"
1181+
1182+#. module: l10n_es_aeat_mod340
1183 #: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_received
1184 #: field:l10n.es.aeat.mod340,received:0
1185 msgid "Invoices Received"
1186 msgstr "Facturas recibidas"
1187
1188 #. module: l10n_es_aeat_mod340
1189+#: code:addons/l10n_es_aeat_mod340/account.py:92
1190+#, python-format
1191+msgid "The info field is different.\n"
1192+""
1193+msgstr "El campo descripción es diferente.\n"
1194+""
1195+
1196+#. module: l10n_es_aeat_mod340
1197 #: selection:l10n.es.aeat.mod340,support_type:0
1198 msgid "Telematics"
1199 msgstr "Telemática"
1200@@ -665,9 +836,12 @@
1201 msgstr "Clave tipo de NIF"
1202
1203 #. module: l10n_es_aeat_mod340
1204-#: selection:l10n.es.aeat.mod340,period:0
1205-msgid "Second quarter"
1206-msgstr "Segundo trimestre"
1207+#: report:report mod340:0
1208+#: report:report_mod340:0
1209+#: report:vat book:0
1210+#: report:vat_book:0
1211+msgid "Empresa"
1212+msgstr "Empresa"
1213
1214 #. module: l10n_es_aeat_mod340
1215 #: selection:l10n.es.aeat.mod340,type:0
1216@@ -675,11 +849,25 @@
1217 msgstr "Complementaria"
1218
1219 #. module: l10n_es_aeat_mod340
1220-#: field:l10n.es.aeat.mod340.intracomunitarias,tax_line_ids:0
1221-#: field:l10n.es.aeat.mod340.investment,tax_line_ids:0
1222-#: field:l10n.es.aeat.mod340.issued,tax_line_ids:0
1223-msgid "tax lines"
1224-msgstr "líneas de impuestos"
1225+#: model:ir.model,name:l10n_es_aeat_mod340.model_wizard_update_charts_accounts
1226+msgid "wizard.update.charts.accounts"
1227+msgstr "wizard.update.charts.accounts"
1228+
1229+#. module: l10n_es_aeat_mod340
1230+#: report:report mod340:0
1231+#: report:report_mod340:0
1232+#: report:vat book:0
1233+#: report:vat_book:0
1234+msgid "Total factura"
1235+msgstr "Total factura"
1236+
1237+#. module: l10n_es_aeat_mod340
1238+#: report:report mod340:0
1239+#: report:report_mod340:0
1240+#: report:vat book:0
1241+#: report:vat_book:0
1242+msgid "FACTURAS DE ENTRADA"
1243+msgstr "FACTURAS DE ENTRADA"
1244
1245 #. module: l10n_es_aeat_mod340
1246 #: field:l10n.es.aeat.mod340,total:0
1247@@ -693,36 +881,20 @@
1248 msgstr "Total"
1249
1250 #. module: l10n_es_aeat_mod340
1251-#: field:account.invoice,number_tickets:0
1252-msgid "Number of tickets"
1253-msgstr "Número de tiques"
1254-
1255-#. module: l10n_es_aeat_mod340
1256-#: field:account.invoice,first_ticket:0
1257-msgid "First ticket"
1258-msgstr "Primer tique"
1259-
1260-#. module: l10n_es_aeat_mod340
1261-#: help:account.invoice,is_ticket_summary:0
1262-msgid "Check if this invoice is a ticket summary"
1263-msgstr "Active si esta factura es un resumen de tiques"
1264-
1265-#. module: l10n_es_aeat_mod340
1266-#: field:account.invoice,last_ticket:0
1267-msgid "Last ticket"
1268-msgstr "Último tique"
1269-
1270-#. module: l10n_es_aeat_mod340
1271-#: field:account.invoice,is_ticket_summary:0
1272-msgid "Ticket Summary"
1273-msgstr "Resumen de tiques"
1274-
1275-#. module: account
1276-#: view:account.invoice:0
1277-msgid "Tickets"
1278-msgstr "Tiques"
1279-
1280+#: model:ir.model,name:l10n_es_aeat_mod340.model_account_tax_code_template
1281+msgid "Tax Code Template"
1282+msgstr "Plantilla códigos de impuestos"
1283+
1284+#. module: l10n_es_aeat_mod340
1285+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:109
1286 #, python-format
1287-#~ msgid "All real state records state code field must be filled."
1288-#~ msgstr ""
1289-#~ "Los registros de propiedades inmobiliarias deben ser rellenados manualmente."
1290+msgid "La siguiente empresa no tiene asignado nif:"
1291+msgstr "La siguiente empresa no tiene asignado nif:"
1292+
1293+#. module: l10n_es_aeat_mod340
1294+#: field:l10n.es.aeat.mod340.intracomunitarias,date_invoice:0
1295+#: field:l10n.es.aeat.mod340.investment,date_invoice:0
1296+#: field:l10n.es.aeat.mod340.issued,date_invoice:0
1297+#: field:l10n.es.aeat.mod340.received,date_invoice:0
1298+msgid "Date Invoice"
1299+msgstr "Fecha Factura"
1300
1301=== modified file 'l10n_es_aeat_mod340/i18n/l10n_es_aeat_mod340.pot'
1302--- l10n_es_aeat_mod340/i18n/l10n_es_aeat_mod340.pot 2013-11-22 23:44:11 +0000
1303+++ l10n_es_aeat_mod340/i18n/l10n_es_aeat_mod340.pot 2014-02-03 11:19:23 +0000
1304@@ -1,22 +1,37 @@
1305 # Translation of OpenERP Server.
1306 # This file contains the translation of the following modules:
1307-# * l10n_es_aeat_mod340
1308+# * l10n_es_aeat_mod340
1309 #
1310 msgid ""
1311 msgstr ""
1312-"Project-Id-Version: OpenERP Server 6.0.2\n"
1313-"Report-Msgid-Bugs-To: support@openerp.com\n"
1314-"POT-Creation-Date: 2012-01-30 10:57+0000\n"
1315-"PO-Revision-Date: 2012-01-30 10:57+0000\n"
1316+"Project-Id-Version: OpenERP Server 7.0-20130519-231019\n"
1317+"Report-Msgid-Bugs-To: \n"
1318+"POT-Creation-Date: 2013-10-11 14:52+0000\n"
1319+"PO-Revision-Date: 2013-10-11 14:52+0000\n"
1320+"Last-Translator: <>\n"
1321 "Language-Team: \n"
1322 "MIME-Version: 1.0\n"
1323 "Content-Type: text/plain; charset=UTF-8\n"
1324-"Content-Transfer-Encoding: 8bit\n"
1325+"Content-Transfer-Encoding: \n"
1326 "Plural-Forms: \n"
1327
1328 #. module: l10n_es_aeat_mod340
1329-#: selection:l10n.es.aeat.mod340,period:0
1330-msgid "Third quarter"
1331+#: report:report mod340:0
1332+#: report:report_mod340:0
1333+#: report:vat book:0
1334+#: report:vat_book:0
1335+msgid "FACTURAS DE SALIDA"
1336+msgstr ""
1337+
1338+#. module: l10n_es_aeat_mod340
1339+#: view:l10n.es.aeat.mod340:0
1340+msgid "Confirmed models"
1341+msgstr ""
1342+
1343+#. module: l10n_es_aeat_mod340
1344+#: report:report mod340:0
1345+#: report:vat_book:0
1346+msgid "Compañía:"
1347 msgstr ""
1348
1349 #. module: l10n_es_aeat_mod340
1350@@ -25,28 +40,22 @@
1351 msgstr ""
1352
1353 #. module: l10n_es_aeat_mod340
1354-#: code:addons/l10n_es_aeat_mod340/mod340.py:162
1355-#, python-format
1356-msgid "All real estate records state code field must be filled."
1357-msgstr ""
1358-
1359-#. module: l10n_es_aeat_mod340
1360-#: code:addons/l10n_es_aeat_mod340/mod340.py:65
1361-#, python-format
1362-msgid "En desarrollo"
1363-msgstr ""
1364-
1365-#. module: l10n_es_aeat_mod340
1366-#: field:l10n.es.aeat.mod340.intracomunitarias,amount_tax:0
1367-#: field:l10n.es.aeat.mod340.investment,amount_tax:0
1368-#: field:l10n.es.aeat.mod340.issued,amount_tax:0
1369-#: field:l10n.es.aeat.mod340.received,amount_tax:0
1370-msgid "amount of the tax"
1371-msgstr ""
1372-
1373-#. module: l10n_es_aeat_mod340
1374-#: selection:l10n.es.aeat.mod340,period:0
1375-msgid "March"
1376+#: code:addons/l10n_es_aeat_mod340/account.py:89
1377+#, python-format
1378+msgid "The code field is different.\n"
1379+""
1380+msgstr ""
1381+
1382+#. module: l10n_es_aeat_mod340
1383+#: field:l10n.es.aeat.mod340,total_taxable:0
1384+msgid "Total Taxable"
1385+msgstr ""
1386+
1387+#. module: l10n_es_aeat_mod340
1388+#: code:addons/l10n_es_aeat_mod340/account.py:158
1389+#, python-format
1390+msgid "Created tax code %s.\n"
1391+""
1392 msgstr ""
1393
1394 #. module: l10n_es_aeat_mod340
1395@@ -61,12 +70,17 @@
1396 msgstr ""
1397
1398 #. module: l10n_es_aeat_mod340
1399+#: field:l10n.es.aeat.mod340,total_sharetax:0
1400+msgid "Total Share Tax"
1401+msgstr ""
1402+
1403+#. module: l10n_es_aeat_mod340
1404 #: field:l10n.es.aeat.mod340,number_records:0
1405 msgid "Records"
1406 msgstr ""
1407
1408 #. module: l10n_es_aeat_mod340
1409-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:270
1410+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:297
1411 #, python-format
1412 msgid "The type 2 received record must be 500 characters long for each Vat registry"
1413 msgstr ""
1414@@ -82,41 +96,57 @@
1415 msgstr ""
1416
1417 #. module: l10n_es_aeat_mod340
1418+#: field:l10n.es.aeat.mod340.intracomunitarias,base_tax:0
1419+#: field:l10n.es.aeat.mod340.investment,base_tax:0
1420+#: field:l10n.es.aeat.mod340.issued,base_tax:0
1421+#: field:l10n.es.aeat.mod340.received,base_tax:0
1422 #: field:l10n.es.aeat.mod340.tax_line_issued,base_amount:0
1423 #: field:l10n.es.aeat.mod340.tax_line_received,base_amount:0
1424 msgid "Base tax bill"
1425 msgstr ""
1426
1427 #. module: l10n_es_aeat_mod340
1428+#: model:ir.model,name:l10n_es_aeat_mod340.model_account_tax_code
1429+msgid "Tax Code"
1430+msgstr ""
1431+
1432+#. module: l10n_es_aeat_mod340
1433 #: model:ir.actions.act_window,help:l10n_es_aeat_mod340.action_l10n_es_aeat_mod340_report
1434 msgid "Create and query AEAT Model 340 Reports"
1435 msgstr ""
1436
1437 #. module: l10n_es_aeat_mod340
1438-#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:92
1439+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:95
1440 #, python-format
1441-msgid "El periodo seleccionado no coincide con los periodos del año fiscal:"
1442-msgstr ""
1443-
1444-#. module: l10n_es_aeat_mod340
1445-#: view:l10n.es.aeat.mod340:0
1446-msgid "In process"
1447-msgstr ""
1448-
1449-#. module: l10n_es_aeat_mod340
1450+msgid "The period hasn't a valid Mod340 period"
1451+msgstr ""
1452+
1453+#. module: l10n_es_aeat_mod340
1454+#: report:report_mod340:0
1455+#: report:vat_book:0
1456+msgid "Apellidos y nombre de contacto:"
1457+msgstr ""
1458+
1459+#. module: l10n_es_aeat_mod340
1460+#: selection:l10n.es.aeat.mod340,state:0
1461+msgid "Processed"
1462+msgstr ""
1463+
1464+#. module: l10n_es_aeat_mod340
1465+#: field:account.tax.code,mod340:0
1466+#: field:account.tax.code.template,mod340:0
1467+msgid "Include in mod340"
1468+msgstr ""
1469+
1470+#. module: l10n_es_aeat_mod340
1471+#: field:l10n.es.aeat.mod340.intracomunitarias,tax_line_ids:0
1472+#: field:l10n.es.aeat.mod340.investment,tax_line_ids:0
1473+#: field:l10n.es.aeat.mod340.issued,tax_line_ids:0
1474 #: field:l10n.es.aeat.mod340.received,tax_line_ids:0
1475 msgid "Tax lines"
1476 msgstr ""
1477
1478 #. module: l10n_es_aeat_mod340
1479-#: code:addons/l10n_es_aeat_mod340/mod340.py:156
1480-#: code:addons/l10n_es_aeat_mod340/mod340.py:158
1481-#: code:addons/l10n_es_aeat_mod340/mod340.py:162
1482-#, python-format
1483-msgid "Error!"
1484-msgstr ""
1485-
1486-#. module: l10n_es_aeat_mod340
1487 #: view:l10n.es.aeat.mod340:0
1488 msgid "Cancelled"
1489 msgstr ""
1490@@ -127,17 +157,24 @@
1491 msgstr ""
1492
1493 #. module: l10n_es_aeat_mod340
1494-#: field:l10n.es.aeat.mod340,company_vat:0
1495-msgid "VAT number"
1496-msgstr ""
1497-
1498-#. module: l10n_es_aeat_mod340
1499-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:184
1500+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:213
1501 #, python-format
1502 msgid "The type 2 issued record must be 500 characters long for each Vat registry"
1503 msgstr ""
1504
1505 #. module: l10n_es_aeat_mod340
1506+#: field:l10n.es.aeat.mod340,period_from:0
1507+msgid "Start period"
1508+msgstr ""
1509+
1510+#. module: l10n_es_aeat_mod340
1511+#: code:addons/l10n_es_aeat_mod340/account.py:167
1512+#, python-format
1513+msgid "Updated tax code %s.\n"
1514+""
1515+msgstr ""
1516+
1517+#. module: l10n_es_aeat_mod340
1518 #: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_intracomunitarias
1519 #: field:l10n.es.aeat.mod340,intracomunitarias:0
1520 msgid "Operations Intracomunitarias"
1521@@ -156,22 +193,50 @@
1522 msgstr ""
1523
1524 #. module: l10n_es_aeat_mod340
1525+#: field:l10n.es.aeat.mod340,period_to:0
1526+msgid "End period"
1527+msgstr ""
1528+
1529+#. module: l10n_es_aeat_mod340
1530+#: code:addons/l10n_es_aeat_mod340/account.py:98
1531+#, python-format
1532+msgid "The Mod 340 field is different.\n"
1533+""
1534+msgstr ""
1535+
1536+#. module: l10n_es_aeat_mod340
1537 #: view:l10n.es.aeat.mod340:0
1538 msgid "Identification"
1539 msgstr ""
1540
1541 #. module: l10n_es_aeat_mod340
1542+#: view:account.invoice:0
1543+msgid "Payments"
1544+msgstr ""
1545+
1546+#. module: l10n_es_aeat_mod340
1547+#: report:report mod340:0
1548+#: report:vat_book:0
1549+msgid "Teléfono de contacto:"
1550+msgstr ""
1551+
1552+#. module: l10n_es_aeat_mod340
1553 #: model:ir.actions.report.xml,name:l10n_es_aeat_mod340.report_mod340_action
1554 msgid "mod340 report"
1555 msgstr ""
1556
1557 #. module: l10n_es_aeat_mod340
1558+#: report:vat book:0
1559+msgid "LIBRO DE IVA"
1560+msgstr ""
1561+
1562+#. module: l10n_es_aeat_mod340
1563 #: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_issued
1564 msgid "Invoices invoice"
1565 msgstr ""
1566
1567 #. module: l10n_es_aeat_mod340
1568-#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:65
1569+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:64
1570 #, python-format
1571 msgid "This company dont have NIF"
1572 msgstr ""
1573@@ -187,7 +252,12 @@
1574 msgstr ""
1575
1576 #. module: l10n_es_aeat_mod340
1577-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:306
1578+#: view:l10n.es.aeat.mod340:0
1579+msgid "Cancelled models"
1580+msgstr ""
1581+
1582+#. module: l10n_es_aeat_mod340
1583+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:333
1584 #, python-format
1585 msgid "340_report_%s.txt"
1586 msgstr ""
1587@@ -198,16 +268,24 @@
1588 msgstr ""
1589
1590 #. module: l10n_es_aeat_mod340
1591-#: selection:l10n.es.aeat.mod340,period:0
1592-msgid "First quarter"
1593-msgstr ""
1594-
1595-#. module: l10n_es_aeat_mod340
1596 #: model:ir.ui.menu,name:l10n_es_aeat_mod340.menu_aeat_mod340_report
1597 msgid "AEAT 340 Model"
1598 msgstr ""
1599
1600 #. module: l10n_es_aeat_mod340
1601+#: field:l10n.es.aeat.mod340.intracomunitarias,amount_tax:0
1602+#: field:l10n.es.aeat.mod340.investment,amount_tax:0
1603+#: field:l10n.es.aeat.mod340.issued,amount_tax:0
1604+#: field:l10n.es.aeat.mod340.received,amount_tax:0
1605+msgid "Total tax"
1606+msgstr ""
1607+
1608+#. module: l10n_es_aeat_mod340
1609+#: report:vat book:0
1610+msgid "Nº de factura"
1611+msgstr ""
1612+
1613+#. module: l10n_es_aeat_mod340
1614 #: help:l10n.es.aeat.mod340.intracomunitarias,representative_vat:0
1615 #: help:l10n.es.aeat.mod340.investment,representative_vat:0
1616 #: help:l10n.es.aeat.mod340.issued,representative_vat:0
1617@@ -231,7 +309,7 @@
1618 msgstr ""
1619
1620 #. module: l10n_es_aeat_mod340
1621-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:306
1622+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:333
1623 #, python-format
1624 msgid "%Y-%m-%d"
1625 msgstr ""
1626@@ -242,8 +320,14 @@
1627 msgstr ""
1628
1629 #. module: l10n_es_aeat_mod340
1630-#: selection:l10n.es.aeat.mod340,period:0
1631-msgid "July"
1632+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:74
1633+#, python-format
1634+msgid "The periods selected don't belong to the fiscal year %s"
1635+msgstr ""
1636+
1637+#. module: l10n_es_aeat_mod340
1638+#: field:l10n.es.aeat.mod340,company_vat:0
1639+msgid "VAT number"
1640 msgstr ""
1641
1642 #. module: l10n_es_aeat_mod340
1643@@ -257,14 +341,27 @@
1644 msgstr ""
1645
1646 #. module: l10n_es_aeat_mod340
1647-#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:92
1648+#: code:addons/l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py:108
1649 #, python-format
1650 msgid "The type 1 record must be 500 characters long"
1651 msgstr ""
1652
1653 #. module: l10n_es_aeat_mod340
1654-#: field:l10n.es.aeat.mod340,calculation_date:0
1655-msgid "Calculation date"
1656+#: report:report mod340:0
1657+#: report:report_mod340:0
1658+#: report:vat_book:0
1659+msgid "CIF/NIF:"
1660+msgstr ""
1661+
1662+#. module: l10n_es_aeat_mod340
1663+#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_tax_line_issued
1664+msgid "Mod340 vat lines issued"
1665+msgstr ""
1666+
1667+#. module: l10n_es_aeat_mod340
1668+#: report:report mod340:0
1669+#: report:report_mod340:0
1670+msgid "CIF/NIF del representante legal:"
1671 msgstr ""
1672
1673 #. module: l10n_es_aeat_mod340
1674@@ -277,11 +374,9 @@
1675 msgstr ""
1676
1677 #. module: l10n_es_aeat_mod340
1678-#: field:l10n.es.aeat.mod340.intracomunitarias,base_tax:0
1679-#: field:l10n.es.aeat.mod340.investment,base_tax:0
1680-#: field:l10n.es.aeat.mod340.issued,base_tax:0
1681-#: field:l10n.es.aeat.mod340.received,base_tax:0
1682-msgid "base tax bill"
1683+#: report:report mod340:0
1684+#: report:vat_book:0
1685+msgid "Cuota impuesto"
1686 msgstr ""
1687
1688 #. module: l10n_es_aeat_mod340
1689@@ -290,13 +385,22 @@
1690 msgstr ""
1691
1692 #. module: l10n_es_aeat_mod340
1693-#: selection:l10n.es.aeat.mod340,period:0
1694-msgid "September"
1695-msgstr ""
1696-
1697-#. module: l10n_es_aeat_mod340
1698-#: selection:l10n.es.aeat.mod340,period:0
1699-msgid "December"
1700+#: report:report mod340:0
1701+#: report:report_mod340:0
1702+msgid "MODELO AEAT 340"
1703+msgstr ""
1704+
1705+#. module: l10n_es_aeat_mod340
1706+#: code:addons/l10n_es_aeat_mod340/account.py:95
1707+#, python-format
1708+msgid "The sign field is different.\n"
1709+""
1710+msgstr ""
1711+
1712+#. module: l10n_es_aeat_mod340
1713+#: view:l10n.es.aeat.mod340.issued:0
1714+#: view:l10n.es.aeat.mod340.received:0
1715+msgid "Total Tax"
1716 msgstr ""
1717
1718 #. module: l10n_es_aeat_mod340
1719@@ -310,13 +414,25 @@
1720 msgstr ""
1721
1722 #. module: l10n_es_aeat_mod340
1723-#: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_tax_line_issued
1724-msgid "Mod340 vat lines issued"
1725-msgstr ""
1726-
1727-#. module: l10n_es_aeat_mod340
1728-#: field:l10n.es.aeat.mod340,total_taxable:0
1729-msgid "Total Taxable"
1730+#: report:report mod340:0
1731+#: report:report_mod340:0
1732+msgid "Tipo de declaración"
1733+msgstr ""
1734+
1735+#. module: l10n_es_aeat_mod340
1736+#: field:l10n.es.aeat.mod340,calculation_date:0
1737+msgid "Calculation date"
1738+msgstr ""
1739+
1740+#. module: l10n_es_aeat_mod340
1741+#: model:ir.actions.report.xml,name:l10n_es_aeat_mod340.report_vat_book_action
1742+#: model:ir.actions.report.xml,name:l10n_es_aeat_mod340.vat_book
1743+msgid "Vat Book"
1744+msgstr ""
1745+
1746+#. module: l10n_es_aeat_mod340
1747+#: field:account.invoice,number_tickets:0
1748+msgid "Number of tickets"
1749 msgstr ""
1750
1751 #. module: l10n_es_aeat_mod340
1752@@ -325,8 +441,10 @@
1753 msgstr ""
1754
1755 #. module: l10n_es_aeat_mod340
1756-#: field:l10n.es.aeat.mod340,total_sharetax:0
1757-msgid "Total Share Tax"
1758+#: code:addons/l10n_es_aeat_mod340/account.py:182
1759+#, python-format
1760+msgid "Tax code %s: The parent tax code %s can not be set.\n"
1761+""
1762 msgstr ""
1763
1764 #. module: l10n_es_aeat_mod340
1765@@ -335,19 +453,17 @@
1766 msgstr ""
1767
1768 #. module: l10n_es_aeat_mod340
1769-#: code:addons/l10n_es_aeat_mod340/mod340.py:65
1770-#, python-format
1771-msgid "No disponible:"
1772-msgstr ""
1773-
1774-#. module: l10n_es_aeat_mod340
1775-#: code:addons/l10n_es_aeat_mod340/mod340.py:156
1776-#, python-format
1777-msgid "All partner state code field must be filled."
1778-msgstr ""
1779-
1780-#. module: l10n_es_aeat_mod340
1781-#: model:ir.actions.act_window,name:l10n_es_aeat_mod340.action_account_mod340
1782+#: report:report mod340:0
1783+#: report:vat_book:0
1784+msgid "Fecha"
1785+msgstr ""
1786+
1787+#. module: l10n_es_aeat_mod340
1788+#: view:l10n.es.aeat.mod340:0
1789+msgid "In process"
1790+msgstr ""
1791+
1792+#. module: l10n_es_aeat_mod340
1793 #: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340
1794 #: view:l10n.es.aeat.mod340:0
1795 #: field:l10n.es.aeat.mod340.intracomunitarias,mod340_id:0
1796@@ -369,22 +485,20 @@
1797 msgstr ""
1798
1799 #. module: l10n_es_aeat_mod340
1800-#: code:addons/l10n_es_aeat_mod340/mod340.py:158
1801-#, python-format
1802-msgid "All partner vat number field must be filled."
1803-msgstr ""
1804-
1805-#. module: l10n_es_aeat_mod340
1806-#: field:l10n.es.aeat.mod340.intracomunitarias,total:0
1807-#: field:l10n.es.aeat.mod340.investment,total:0
1808-#: field:l10n.es.aeat.mod340.issued,total:0
1809-#: field:l10n.es.aeat.mod340.received,total:0
1810-msgid "total"
1811-msgstr ""
1812-
1813-#. module: l10n_es_aeat_mod340
1814-#: selection:l10n.es.aeat.mod340,period:0
1815-msgid "August"
1816+#: view:l10n.es.aeat.mod340.issued:0
1817+#: view:l10n.es.aeat.mod340.received:0
1818+msgid "Total Base"
1819+msgstr ""
1820+
1821+#. module: l10n_es_aeat_mod340
1822+#: report:report mod340:0
1823+#: report:report_mod340:0
1824+msgid "Número de la declaración anterior:"
1825+msgstr ""
1826+
1827+#. module: l10n_es_aeat_mod340
1828+#: field:account.invoice,first_ticket:0
1829+msgid "First ticket"
1830 msgstr ""
1831
1832 #. module: l10n_es_aeat_mod340
1833@@ -393,33 +507,34 @@
1834 msgstr ""
1835
1836 #. module: l10n_es_aeat_mod340
1837+#: help:account.invoice,is_ticket_summary:0
1838+msgid "Check if this invoice is a ticket summary"
1839+msgstr ""
1840+
1841+#. module: l10n_es_aeat_mod340
1842 #: selection:l10n.es.aeat.mod340,state:0
1843 msgid "Processing"
1844 msgstr ""
1845
1846 #. module: l10n_es_aeat_mod340
1847-#: selection:l10n.es.aeat.mod340,period:0
1848-msgid "June"
1849-msgstr ""
1850-
1851-#. module: l10n_es_aeat_mod340
1852 #: field:l10n.es.aeat.mod340,contact_phone:0
1853 msgid "Phone"
1854 msgstr ""
1855
1856 #. module: l10n_es_aeat_mod340
1857-#: selection:l10n.es.aeat.mod340,period:0
1858-msgid "November"
1859-msgstr ""
1860-
1861-#. module: l10n_es_aeat_mod340
1862-#: selection:l10n.es.aeat.mod340,period:0
1863-msgid "October"
1864-msgstr ""
1865-
1866-#. module: l10n_es_aeat_mod340
1867-#: selection:l10n.es.aeat.mod340,period:0
1868-msgid "January"
1869+#: field:account.invoice,last_ticket:0
1870+msgid "Last ticket"
1871+msgstr ""
1872+
1873+#. module: l10n_es_aeat_mod340
1874+#: field:account.invoice,is_ticket_summary:0
1875+msgid "Ticket Summary"
1876+msgstr ""
1877+
1878+#. module: l10n_es_aeat_mod340
1879+#: report:report mod340:0
1880+#: report:vat_book:0
1881+msgid "Ejercicio fiscal:"
1882 msgstr ""
1883
1884 #. module: l10n_es_aeat_mod340
1885@@ -441,8 +556,8 @@
1886 msgstr ""
1887
1888 #. module: l10n_es_aeat_mod340
1889-#: selection:l10n.es.aeat.mod340,state:0
1890-msgid "Processed"
1891+#: view:l10n.es.aeat.mod340:0
1892+msgid "AEAT Modelo 340"
1893 msgstr ""
1894
1895 #. module: l10n_es_aeat_mod340
1896@@ -451,6 +566,12 @@
1897 msgstr ""
1898
1899 #. module: l10n_es_aeat_mod340
1900+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:74
1901+#, python-format
1902+msgid "Error"
1903+msgstr ""
1904+
1905+#. module: l10n_es_aeat_mod340
1906 #: field:l10n.es.aeat.mod340,representative_vat:0
1907 #: field:l10n.es.aeat.mod340.intracomunitarias,representative_vat:0
1908 #: field:l10n.es.aeat.mod340.investment,representative_vat:0
1909@@ -470,6 +591,12 @@
1910 msgstr ""
1911
1912 #. module: l10n_es_aeat_mod340
1913+#: report:report mod340:0
1914+#: report:vat_book:0
1915+msgid "Base imponible"
1916+msgstr ""
1917+
1918+#. module: l10n_es_aeat_mod340
1919 #: field:l10n.es.aeat.mod340.tax_line_received,invoice_record_id:0
1920 msgid "Invoice received"
1921 msgstr ""
1922@@ -480,17 +607,17 @@
1923 msgstr ""
1924
1925 #. module: l10n_es_aeat_mod340
1926-#: field:l10n.es.aeat.mod340,period:0
1927-msgid "Period"
1928-msgstr ""
1929-
1930-#. module: l10n_es_aeat_mod340
1931 #: view:l10n.es.aeat.mod340:0
1932 msgid "General"
1933 msgstr ""
1934
1935 #. module: l10n_es_aeat_mod340
1936 #: view:l10n.es.aeat.mod340:0
1937+msgid "In process models"
1938+msgstr ""
1939+
1940+#. module: l10n_es_aeat_mod340
1941+#: view:l10n.es.aeat.mod340:0
1942 #: selection:l10n.es.aeat.mod340,state:0
1943 msgid "Done"
1944 msgstr ""
1945@@ -501,6 +628,7 @@
1946 msgstr ""
1947
1948 #. module: l10n_es_aeat_mod340
1949+#: model:ir.model,name:l10n_es_aeat_mod340.model_account_invoice
1950 #: field:l10n.es.aeat.mod340.intracomunitarias,invoice_id:0
1951 #: field:l10n.es.aeat.mod340.investment,invoice_id:0
1952 #: field:l10n.es.aeat.mod340.issued,invoice_id:0
1953@@ -519,8 +647,9 @@
1954 msgstr ""
1955
1956 #. module: l10n_es_aeat_mod340
1957-#: selection:l10n.es.aeat.mod340,period:0
1958-msgid "Fourth quarter"
1959+#: report:report mod340:0
1960+#: report:report_mod340:0
1961+msgid "Código electrónico autoliquidación IVA:"
1962 msgstr ""
1963
1964 #. module: l10n_es_aeat_mod340
1965@@ -529,6 +658,7 @@
1966 msgstr ""
1967
1968 #. module: l10n_es_aeat_mod340
1969+#: view:account.invoice:0
1970 #: view:l10n.es.aeat.mod340:0
1971 msgid "AEAT 340"
1972 msgstr ""
1973@@ -555,8 +685,9 @@
1974 msgstr ""
1975
1976 #. module: l10n_es_aeat_mod340
1977-#: selection:l10n.es.aeat.mod340,period:0
1978-msgid "May"
1979+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:178
1980+#, python-format
1981+msgid "Invoice %s, Amount untaxed Lines %.2f do not correspond to AmountUntaxed on Invoice %.2f"
1982 msgstr ""
1983
1984 #. module: l10n_es_aeat_mod340
1985@@ -573,6 +704,12 @@
1986 msgstr ""
1987
1988 #. module: l10n_es_aeat_mod340
1989+#: report:report mod340:0
1990+#: report:vat_book:0
1991+msgid "Número de factura"
1992+msgstr ""
1993+
1994+#. module: l10n_es_aeat_mod340
1995 #: field:l10n.es.aeat.mod340.intracomunitarias,partner_vat:0
1996 #: field:l10n.es.aeat.mod340.investment,partner_vat:0
1997 #: field:l10n.es.aeat.mod340.issued,partner_vat:0
1998@@ -602,8 +739,9 @@
1999 msgstr ""
2000
2001 #. module: l10n_es_aeat_mod340
2002-#: selection:l10n.es.aeat.mod340,period:0
2003-msgid "February"
2004+#: report:report mod340:0
2005+#: report:report_mod340:0
2006+msgid "Número:"
2007 msgstr ""
2008
2009 #. module: l10n_es_aeat_mod340
2010@@ -619,8 +757,19 @@
2011 msgstr ""
2012
2013 #. module: l10n_es_aeat_mod340
2014-#: selection:l10n.es.aeat.mod340,period:0
2015-msgid "April"
2016+#: report:report mod340:0
2017+#: report:report_mod340:0
2018+msgid "Tipo de soporte:"
2019+msgstr ""
2020+
2021+#. module: l10n_es_aeat_mod340
2022+#: field:l10n.es.aeat.mod340,attach_id:0
2023+msgid "BOE file"
2024+msgstr ""
2025+
2026+#. module: l10n_es_aeat_mod340
2027+#: view:l10n.es.aeat.mod340:0
2028+msgid "Draft models"
2029 msgstr ""
2030
2031 #. module: l10n_es_aeat_mod340
2032@@ -630,12 +779,25 @@
2033 msgstr ""
2034
2035 #. module: l10n_es_aeat_mod340
2036+#: report:report mod340:0
2037+#: report:vat_book:0
2038+msgid "CIF/NIF"
2039+msgstr ""
2040+
2041+#. module: l10n_es_aeat_mod340
2042 #: model:ir.model,name:l10n_es_aeat_mod340.model_l10n_es_aeat_mod340_received
2043 #: field:l10n.es.aeat.mod340,received:0
2044 msgid "Invoices Received"
2045 msgstr ""
2046
2047 #. module: l10n_es_aeat_mod340
2048+#: code:addons/l10n_es_aeat_mod340/account.py:92
2049+#, python-format
2050+msgid "The info field is different.\n"
2051+""
2052+msgstr ""
2053+
2054+#. module: l10n_es_aeat_mod340
2055 #: selection:l10n.es.aeat.mod340,support_type:0
2056 msgid "Telematics"
2057 msgstr ""
2058@@ -646,8 +808,9 @@
2059 msgstr ""
2060
2061 #. module: l10n_es_aeat_mod340
2062-#: selection:l10n.es.aeat.mod340,period:0
2063-msgid "Second quarter"
2064+#: report:report mod340:0
2065+#: report:vat_book:0
2066+msgid "Empresa"
2067 msgstr ""
2068
2069 #. module: l10n_es_aeat_mod340
2070@@ -656,43 +819,48 @@
2071 msgstr ""
2072
2073 #. module: l10n_es_aeat_mod340
2074-#: field:l10n.es.aeat.mod340.intracomunitarias,tax_line_ids:0
2075-#: field:l10n.es.aeat.mod340.investment,tax_line_ids:0
2076-#: field:l10n.es.aeat.mod340.issued,tax_line_ids:0
2077-msgid "tax lines"
2078+#: model:ir.model,name:l10n_es_aeat_mod340.model_wizard_update_charts_accounts
2079+msgid "wizard.update.charts.accounts"
2080+msgstr ""
2081+
2082+#. module: l10n_es_aeat_mod340
2083+#: report:report mod340:0
2084+#: report:vat_book:0
2085+msgid "Total factura"
2086+msgstr ""
2087+
2088+#. module: l10n_es_aeat_mod340
2089+#: report:report mod340:0
2090+#: report:vat_book:0
2091+msgid "FACTURAS DE ENTRADA"
2092 msgstr ""
2093
2094 #. module: l10n_es_aeat_mod340
2095 #: field:l10n.es.aeat.mod340,total:0
2096+#: field:l10n.es.aeat.mod340.intracomunitarias,total:0
2097+#: field:l10n.es.aeat.mod340.investment,total:0
2098+#: view:l10n.es.aeat.mod340.issued:0
2099+#: field:l10n.es.aeat.mod340.issued,total:0
2100+#: view:l10n.es.aeat.mod340.received:0
2101+#: field:l10n.es.aeat.mod340.received,total:0
2102 msgid "Total"
2103 msgstr ""
2104
2105 #. module: l10n_es_aeat_mod340
2106-#: field:account.invoice,number_tickets:0
2107-msgid "Number of tickets"
2108-msgstr ""
2109-
2110-#. module: l10n_es_aeat_mod340
2111-#: field:account.invoice,first_ticket:0
2112-msgid "First ticket"
2113-msgstr ""
2114-
2115-#. module: l10n_es_aeat_mod340
2116-#: help:account.invoice,is_ticket_summary:0
2117-msgid "Check if this invoice is a ticket summary"
2118-msgstr ""
2119-
2120-#. module: l10n_es_aeat_mod340
2121-#: field:account.invoice,last_ticket:0
2122-msgid "Last ticket"
2123-msgstr ""
2124-
2125-#. module: l10n_es_aeat_mod340
2126-#: field:account.invoice,is_ticket_summary:0
2127-msgid "Ticket Summary"
2128-msgstr ""
2129-
2130-#. module: account
2131-#: view:account.invoice:0
2132-msgid "Tickets"
2133+#: model:ir.model,name:l10n_es_aeat_mod340.model_account_tax_code_template
2134+msgid "Tax Code Template"
2135+msgstr ""
2136+
2137+#. module: l10n_es_aeat_mod340
2138+#: code:addons/l10n_es_aeat_mod340/wizard/calculate_mod340_records.py:109
2139+#, python-format
2140+msgid "La siguiente empresa no tiene asignado nif:"
2141+msgstr ""
2142+
2143+#. module: l10n_es_aeat_mod340
2144+#: field:l10n.es.aeat.mod340.intracomunitarias,date_invoice:0
2145+#: field:l10n.es.aeat.mod340.investment,date_invoice:0
2146+#: field:l10n.es.aeat.mod340.issued,date_invoice:0
2147+#: field:l10n.es.aeat.mod340.received,date_invoice:0
2148+msgid "Date Invoice"
2149 msgstr ""
2150\ No newline at end of file
2151
2152=== modified file 'l10n_es_aeat_mod340/mod340.py'
2153--- l10n_es_aeat_mod340/mod340.py 2013-11-15 03:13:35 +0000
2154+++ l10n_es_aeat_mod340/mod340.py 2014-02-03 11:19:23 +0000
2155@@ -3,7 +3,7 @@
2156 #
2157 # OpenERP, Open Source Management Solution
2158 # Copyright (c) 2011 Ting (http://www.ting.es) All Rights Reserved.
2159-# Copyright (c) 2011 Acysos S.L. (http://acysos.com) All Rights Reserved
2160+# Copyright (c) 2011-2013 Acysos S.L.(http://acysos.com) All Rights Reserved
2161 # Ignacio Ibeas Izquierdo <ignacio@acysos.com>
2162 # Copyright (c) 2011 NaN Projectes de Programari Lliure, S.L.
2163 # http://www.NaN-tic.com
2164@@ -11,8 +11,8 @@
2165 # $Id$
2166 #
2167 # This program is free software: you can redistribute it and/or modify
2168-# it under the terms of the GNU Affero General Public License as published by
2169-# the Free Software Foundation, either version 3 of the License, or
2170+# it under the terms of the GNU Affero General Public License as published
2171+# by the Free Software Foundation, either version 3 of the License, or
2172 # (at your option) any later version.
2173 #
2174 # This program is distributed in the hope that it will be useful,
2175@@ -34,9 +34,6 @@
2176 from tools.translate import _
2177 import pooler
2178
2179-
2180-
2181-
2182 class l10n_es_aeat_mod340(osv.osv):
2183
2184 def button_calculate(self, cr, uid, ids, args, context=None):
2185@@ -47,7 +44,6 @@
2186 calculate_obj = self.pool.get('l10n.es.aeat.mod340.calculate_records')
2187 calculate_obj._wkf_calculate_records(cr, uid, ids, context)
2188
2189-
2190 return True
2191
2192 def button_recalculate(self, cr, uid, ids, context=None):
2193@@ -60,15 +56,13 @@
2194 return True
2195
2196 def button_export(self, cr, uid, ids, context=None):
2197- #FUNCION CALCADA DEL MODELO 347, inoperativa de momento
2198-
2199- #raise osv.except_osv(_('No disponible:'), _('En desarrollo'))
2200
2201 if context is None:
2202 context = {}
2203
2204 export_obj = self.pool.get("l10n.es.aeat.mod340.export_to_boe")
2205- export_obj._export_boe_file(cr, uid, ids, self.browse(cr, uid, ids and ids[0]))
2206+ report = self.browse(cr, uid, ids and ids[0])
2207+ export_obj._export_boe_file(cr, uid, ids, report)
2208
2209 return True
2210
2211@@ -85,91 +79,83 @@
2212
2213 result = {}
2214 for id in ids:
2215- result[id] = {}.fromkeys(['number_records','total_taxable','total_sharetax','total'], 0.0)
2216+ result[id] = {}.fromkeys(
2217+ ['number_records','total_taxable','total_sharetax','total'],
2218+ 0.0)
2219
2220 for model in self.browse(cr, uid, ids,context):
2221
2222 for issue in model.issued:
2223- result[model.id]['number_records'] += len( issue.tax_line_ids )
2224- result[model.id]['total_taxable'] +=issue.base_tax
2225- result[model.id]['total_sharetax'] +=issue.amount_tax
2226- result[model.id]['total'] +=issue.base_tax + issue.amount_tax
2227+ result[model.id]['number_records'] += len( issue.tax_line_ids )
2228+ result[model.id]['total_taxable'] +=issue.base_tax
2229+ result[model.id]['total_sharetax'] +=issue.amount_tax
2230+ result[model.id]['total'] +=issue.base_tax + issue.amount_tax
2231
2232 for issue in model.received:
2233- result[model.id]['number_records'] += len( issue.tax_line_ids )
2234- result[model.id]['total_taxable'] +=issue.base_tax
2235- result[model.id]['total_sharetax'] +=issue.amount_tax
2236- result[model.id]['total'] +=issue.base_tax + issue.amount_tax
2237+ result[model.id]['number_records'] += len( issue.tax_line_ids )
2238+ result[model.id]['total_taxable'] +=issue.base_tax
2239+ result[model.id]['total_sharetax'] +=issue.amount_tax
2240+ result[model.id]['total'] +=issue.base_tax + issue.amount_tax
2241
2242 return result
2243
2244-
2245-
2246 _inherit = "l10n.es.aeat.report"
2247 _name = 'l10n.es.aeat.mod340'
2248 _description = 'Model 340'
2249 _columns = {
2250- 'name': fields.function(_name_get, method=True, type="char", size="64", string="Name"),
2251+ 'name': fields.function(_name_get, method=True, type="char",
2252+ size="64", string="Name"),
2253 'contact_phone': fields.char("Phone", size=9),
2254 'phone_contact' : fields.char('Phone Contact',size=9),
2255 'name_contact' : fields.char('Name And Surname Contact',size=40),
2256- 'period': fields.selection([
2257- ('1T','First quarter'),('2T','Second quarter'),('3T','Third quarter'),
2258- ('4T','Fourth quarter'),('01','January'),('02','February'),('03','March'),('04','April'),
2259- ('05','May'),('06','June'),('07','July'),('08','August'),('09','September'),('10','October'),
2260- ('11','November'),('12','December')
2261- ], 'Period'),
2262- 'issued': fields.one2many('l10n.es.aeat.mod340.issued','mod340_id','Invoices Issued'),
2263- 'received': fields.one2many('l10n.es.aeat.mod340.received','mod340_id','Invoices Received'),
2264- 'investment': fields.one2many(
2265- 'l10n.es.aeat.mod340.investment','mod340_id','Property Investment'),
2266- 'intracomunitarias': fields.one2many('l10n.es.aeat.mod340.intracomunitarias','mod340_id','Operations Intracomunitarias'),
2267+ 'period_from': fields.many2one('account.period', 'Start period',
2268+ states={'done': [('readonly', True)]}),
2269+ 'period_to': fields.many2one('account.period', 'End period',
2270+ states={'done': [('readonly', True)]}),
2271+ 'issued': fields.one2many('l10n.es.aeat.mod340.issued','mod340_id',
2272+ 'Invoices Issued',
2273+ states={'done': [('readonly', True)]}),
2274+ 'received': fields.one2many('l10n.es.aeat.mod340.received',
2275+ 'mod340_id','Invoices Received',
2276+ states={'done': [('readonly', True)]}),
2277+ 'investment': fields.one2many('l10n.es.aeat.mod340.investment',
2278+ 'mod340_id','Property Investment'),
2279+ 'intracomunitarias': fields.one2many(
2280+ 'l10n.es.aeat.mod340.intracomunitarias',
2281+ 'mod340_id','Operations Intracomunitarias'),
2282
2283 'ean13': fields.char('Electronic Code VAT reverse charge', size=16),
2284
2285- '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"),
2286- '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"),
2287- '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"),
2288- '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"),
2289+ 'total_taxable': fields.function(_get_number_records, method=True,
2290+ type='float', string='Total Taxable', multi='recalc',
2291+ help="""The declaration will include partners with the total
2292+ of operations over this limit"""),
2293+ 'total_sharetax': fields.function(_get_number_records, method=True,
2294+ type='float', string='Total Share Tax', multi='recalc',
2295+ help="""The declaration will include partners with the total
2296+ of operations over this limit"""),
2297+ 'number_records': fields.function(_get_number_records, method=True,
2298+ type='integer', string='Records', multi='recalc',
2299+ help="""The declaration will include partners with the total
2300+ of operations over this limit"""),
2301+ 'total': fields.function(_get_number_records, method=True,
2302+ type='float', string="Total", multi='recalc',
2303+ help="""The declaration will include partners with the total
2304+ of operations over this limit"""),
2305 'calculation_date': fields.date('Calculation date', readonly=True),
2306+ 'attach_id':fields.many2one('ir.attachment',
2307+ 'BOE file', readonly=True),
2308 }
2309 _defaults = {
2310- 'support_type' : lambda *a: 'Telemático',
2311 'number' : lambda *a: '340',
2312- 'type': lambda *a: 'Normal'
2313 }
2314
2315 def set_done(self, cr, uid, id, *args):
2316- self.write(cr,uid,id,{'calculation_date': time.strftime('%Y-%m-%d'),'state': 'done',})
2317+ self.write(cr,uid,id,{'calculation_date': time.strftime('%Y-%m-%d'),
2318+ 'state': 'done',})
2319 wf_service = netsvc.LocalService("workflow")
2320 wf_service.trg_validate(uid, 'l10n.es.aeat.mod340', id, 'done', cr)
2321 return True
2322-
2323- def _check_report_lines(self, cr, uid, ids, context=None):
2324- """checks report lines"""
2325-# if context is None: context = {}
2326-
2327-# for item in self.browse(cr, uid, ids, context):
2328-# ## Browse partner record lines to check if all are correct (all fields filled)
2329-# for partner_record in item.partner_record_ids:
2330-# if not partner_record.partner_state_code:
2331-# raise osv.except_osv(_('Error!'), _("All partner state code field must be filled."))
2332-# if not partner_record.partner_vat:
2333-# raise osv.except_osv(_('Error!'), _("All partner vat number field must be filled."))
2334-#
2335-# for real_state_record in item.real_state_record_ids:
2336-# if not real_state_record.state_code:
2337-# raise osv.except_osv(_('Error!'), _("All real estate records state code field must be filled."))
2338-
2339- return True
2340-
2341- def check_report(self, cr, uid, ids, context=None):
2342- """Different check out in report"""
2343- if context is None: context = {}
2344-
2345- self._check_report_lines(cr, uid, ids, context)
2346-
2347- return True
2348
2349 def action_confirm(self, cr, uid, ids, context=None):
2350 """set to done the report and check its records"""
2351@@ -200,17 +186,25 @@
2352 _name = 'l10n.es.aeat.mod340.issued'
2353 _description = 'Invoices invoice'
2354 _columns = {
2355- 'mod340_id': fields.many2one('l10n.es.aeat.mod340','Model 340',ondelete="cascade"),
2356- 'partner_id':fields.many2one('res.partner','Partner',ondelete="cascade"),
2357+ 'mod340_id': fields.many2one('l10n.es.aeat.mod340','Model 340',
2358+ ondelete="cascade"),
2359+ 'partner_id':fields.many2one('res.partner','Partner',
2360+ ondelete="cascade"),
2361 'partner_vat':fields.char('Company CIF/NIF',size=12),
2362- 'representative_vat': fields.char('L.R. VAT number', size=9, help="Legal Representative VAT number"),
2363+ 'representative_vat': fields.char('L.R. VAT number', size=9,
2364+ help="Legal Representative VAT number"),
2365 'partner_country_code': fields.char('Country Code', size=2),
2366- 'invoice_id':fields.many2one('account.invoice','Invoice',ondelete="cascade"),
2367- 'base_tax':fields.float('base tax bill',digits=(13,2)),
2368- 'amount_tax':fields.float('amount of the tax',digits=(13,2)),
2369- 'total':fields.float('total',digits=(13,2)),
2370- 'tax_line_ids': fields.one2many('l10n.es.aeat.mod340.tax_line_issued', 'invoice_record_id', 'tax lines', states = {'done': [('readonly', True)]}),
2371+ 'invoice_id':fields.many2one('account.invoice','Invoice',
2372+ ondelete="cascade"),
2373+ 'base_tax':fields.float('Base tax bill',digits=(13,2)),
2374+ 'amount_tax':fields.float('Total tax',digits=(13,2)),
2375+ 'total':fields.float('Total',digits=(13,2)),
2376+ 'tax_line_ids': fields.one2many('l10n.es.aeat.mod340.tax_line_issued',
2377+ 'invoice_record_id', 'Tax lines'),
2378+ 'date_invoice': fields.date('Date Invoice', readonly=True),
2379 }
2380+
2381+ _order = 'date_invoice asc, invoice_id asc'
2382 l10n_es_aeat_mod340_issued()
2383
2384 class l10n_es_aeat_mod340_received(osv.osv):
2385@@ -218,7 +212,8 @@
2386 _description = 'Invoices Received'
2387 _inherit = 'l10n.es.aeat.mod340.issued'
2388 _columns = {
2389- 'tax_line_ids': fields.one2many('l10n.es.aeat.mod340.tax_line_received', 'invoice_record_id', 'Tax lines', states = {'done': [('readonly', True)]}),
2390+ 'tax_line_ids':fields.one2many('l10n.es.aeat.mod340.tax_line_received',
2391+ 'invoice_record_id', 'Tax lines'),
2392 }
2393 l10n_es_aeat_mod340_received()
2394
2395@@ -242,7 +237,8 @@
2396 'tax_percentage': fields.float('Tax percentage',digits=(0,2)),
2397 'tax_amount': fields.float('Tax amount',digits=(13,2)),
2398 'base_amount': fields.float('Base tax bill',digits=(13,2)),
2399- 'invoice_record_id': fields.many2one('l10n.es.aeat.mod340.issued', 'Invoice issued', required=True, ondelete="cascade", select=1),
2400+ 'invoice_record_id': fields.many2one('l10n.es.aeat.mod340.issued',
2401+ 'Invoice issued', required=True, ondelete="cascade", select=1),
2402 }
2403 l10n_es_aeat_mod340_tax_line_issued()
2404
2405@@ -251,6 +247,7 @@
2406 _description = 'Mod340 vat lines received'
2407 _inherit = 'l10n.es.aeat.mod340.tax_line_issued'
2408 _columns = {
2409- 'invoice_record_id': fields.many2one('l10n.es.aeat.mod340.received', 'Invoice received', required=True, ondelete="cascade", select=1),
2410+ 'invoice_record_id': fields.many2one('l10n.es.aeat.mod340.received',
2411+ 'Invoice received', required=True, ondelete="cascade", select=1),
2412 }
2413 l10n_es_aeat_mod340_tax_line_received()
2414
2415=== modified file 'l10n_es_aeat_mod340/mod340_view.xml'
2416--- l10n_es_aeat_mod340/mod340_view.xml 2011-09-20 06:58:23 +0000
2417+++ l10n_es_aeat_mod340/mod340_view.xml 2014-02-03 11:19:23 +0000
2418@@ -1,217 +1,195 @@
2419 <?xml version="1.0" encoding="utf-8"?>
2420 <openerp>
2421 <data>
2422- <!-- Modelo 340 -->
2423- <record model="ir.ui.view" id="view_account_mod340_tree">
2424- <field name="name">l10n.es.aeat.mod340.tree</field>
2425- <field name="model">l10n.es.aeat.mod340</field>
2426- <field name="type">tree</field>
2427- <!--<field name="priority" eval="5"/>-->
2428- <field name="arch" type="xml">
2429- <tree string="Model 340">
2430- <field name="period"/>
2431- <field name="fiscalyear_id"/>
2432- <field name="number"/>
2433- <field name="type"/>
2434- </tree>
2435- </field>
2436- </record>
2437-
2438- <record model="ir.ui.view" id="view_account_mod340_form">
2439- <field name="name">l10n.es.aeat.mod340.form</field>
2440- <field name="model">l10n.es.aeat.mod340</field>
2441- <field name="type">form</field>
2442- <field name="priority" eval="5"/>
2443- <field name="arch" type="xml">
2444- <form string="Model 340">
2445- <group col="6" colspan="4">
2446- <field name="company_id" on_change="on_change_company_id(company_id)" required="1" select="1" readonly="1"/>
2447- <newline/>
2448- <field name="fiscalyear_id" select="1"/>
2449- <field name="period" select="1" required="1"/>
2450- <newline />
2451- <field name="number"/>
2452- <field name="support_type"/>
2453- </group>
2454- <notebook colspan="4">
2455- <page string="General">
2456- <group string="Identification" colspan="4">
2457- <field name="company_vat" required="1" />
2458- <field name="contact_phone"/>
2459- <field name="name_contact" colspan="4"/>
2460- <field name="representative_vat"/>
2461- </group>
2462- <group string="Susbtitutive/complementary declaration" colspan="4">
2463- <field name="type"/>
2464- <field name="previous_number"/>
2465- </group>
2466- <group string="Electronic Code VAT reverse charge" colspan="4">
2467- <field name="ean13" nolabel="1"/>
2468- </group>
2469- <group string="Summary" colspan="4">
2470- <field name="number_records" select ="2" readonly="1"/>
2471- <newline/>
2472- <field name="total_taxable" select ="2" readonly="1"/>
2473- <field name="total_sharetax" select ="2" readonly="1"/>
2474- <field name="total" select="2" readonly="1"/>
2475- <newline/>
2476- <field name="calculation_date" select ="2" readonly="1"/>
2477- </group>
2478- <group colspan="4" col="10">
2479- <field name="state" select="2" readonly="1"/>
2480- </group>
2481- <group colspan="4" col="10">
2482- <button name="button_calculate"
2483- type="object"
2484- string="Calculate"
2485- states="draft"
2486- icon="terp-stock_format-scientific"
2487- />
2488- <button name="button_recalculate"
2489- type="object"
2490- string="Recalculate"
2491- states="calculating,calculated"
2492- icon="gtk-execute"/>
2493- <button name="button_export"
2494- type="object"
2495- string="Export to BOE"
2496- states="done"
2497- icon="gtk-execute"/>
2498- <button name="confirm" string="Confirm" type="object" states="calculated" icon="gtk-ok"/>
2499- <button name="cancel" string="Cancel" type="object" states="calculated,done" icon="gtk-cancel"/>
2500- <button name="action_recover" string="Draft" type="object" states="canceled" icon="gtk-undo"/>
2501-
2502- </group>
2503- </page>
2504- <page string="Issued invoice" >
2505- <field name="issued" nolabel="1" />
2506- </page>
2507- <page string="Received invoice" >
2508- <field name="received" nolabel="1" />
2509- </page>
2510-
2511- </notebook>
2512- </form>
2513- </field>
2514- </record>
2515- <!-- FIN Modelo 340 -->
2516-
2517-
2518- <!--Invoice Issued-->
2519-
2520- <record id="view_l10n_es_aeat_mod340_invoice_issued_tree" model="ir.ui.view">
2521- <field name="name">l10n.es.aeat.mod340.issued.tree</field>
2522- <field name="model">l10n.es.aeat.mod340.issued</field>
2523- <field name="type">tree</field>
2524- <field name="arch" type="xml">
2525- <tree string="Issued invoices">
2526- <field name="partner_id"/>
2527- <field name="partner_country_code"/>
2528- <field name="partner_vat"/>
2529- <field name="invoice_id"/>
2530- <field name="base_tax" sum="Total Base" />
2531- <field name="amount_tax" sum="Total Tax" />
2532- <field name="total" sum="Total"/>
2533- </tree>
2534- </field>
2535- </record>
2536-
2537- <record id="view_l10n_es_aeat_mod340_invoice_issued_form" model="ir.ui.view">
2538- <field name="name">l10n.es.aeat.mod340.issued.form</field>
2539- <field name="model">l10n.es.aeat.mod340.issued</field>
2540- <field name="type">form</field>
2541- <field name="arch" type="xml">
2542- <form string="Issued invoices">
2543- <field name="invoice_id"/>
2544- <newline/>
2545- <field name="partner_id"/>
2546- <field name="partner_vat"/>
2547- <field name="representative_vat"/>
2548- <field name="partner_country_code"/>
2549- <newline/>
2550- <field name="base_tax" />
2551- <field name="amount_tax" />
2552- <newline/>
2553- <field name="total"/>
2554- <newline />
2555- <field name="tax_line_ids" />
2556- </form>
2557- </field>
2558- </record>
2559-
2560- <!--Invoice Received-->
2561-
2562- <record id="view_l10n_es_aeat_mod340_invoice_received_tree" model="ir.ui.view">
2563- <field name="name">l10n.es.aeat.mod340.received.tree</field>
2564- <field name="model">l10n.es.aeat.mod340.received</field>
2565- <field name="type">tree</field>
2566- <field name="arch" type="xml">
2567- <tree string="Received invoices">
2568- <field name="partner_id"/>
2569- <field name="partner_country_code"/>
2570- <field name="partner_vat"/>
2571- <field name="invoice_id"/>
2572- <field name="base_tax" sum="Total Base"/>
2573- <field name="amount_tax" sum="Total Tax"/>
2574- <field name="total" sum="Total"/>
2575- </tree>
2576- </field>
2577- </record>
2578-
2579- <record id="view_l10n_es_aeat_mod340_invoice_received_form" model="ir.ui.view">
2580- <field name="name">l10n.es.aeat.mod340.received.form</field>
2581- <field name="model">l10n.es.aeat.mod340.received</field>
2582- <field name="type">form</field>
2583- <field name="arch" type="xml">
2584- <form string="Received invoices">
2585- <field name="invoice_id"/>
2586- <newline/>
2587- <field name="partner_id"/>
2588- <field name="partner_vat"/>
2589- <field name="representative_vat"/>
2590- <field name="partner_country_code"/>
2591- <newline/>
2592- <field name="base_tax"/>
2593- <field name="amount_tax"/>
2594- <newline/>
2595- <field name="total"/>
2596- <newline />
2597- <field name="tax_line_ids" />
2598- </form>
2599- </field>
2600- </record>
2601-
2602- <!--Vat Lines-->
2603-
2604- <record id="view_l10n_es_aeat_mod340_tax_line_issued_form" model="ir.ui.view">
2605- <field name="name">l10n.es.aeat.mod340.tax_line_issued.form</field>
2606- <field name="model">l10n.es.aeat.mod340.tax_line_issued</field>
2607- <field name="type">form</field>
2608- <field name="arch" type="xml">
2609- <form string="Tax line issued">
2610- <field name="name"/>
2611- <field name="tax_percentage"/>
2612- <field name="tax_amount"/>
2613- <field name="base_amount"/>
2614- </form>
2615- </field>
2616- </record>
2617-
2618- <record id="view_l10n_es_aeat_mod340_tax_line_received_form" model="ir.ui.view">
2619- <field name="name">l10n.es.aeat.mod340.tax_line_received.form</field>
2620- <field name="model">l10n.es.aeat.mod340.tax_line_received</field>
2621- <field name="type">form</field>
2622- <field name="arch" type="xml">
2623- <form string="Tax line received">
2624- <field name="name"/>
2625- <field name="tax_percentage"/>
2626- <field name="tax_amount"/>
2627- <field name="base_amount"/>
2628- </form>
2629- </field>
2630- </record>
2631-
2632- <record id="view_l10n_es_aeat_mod340_report_search" model="ir.ui.view">
2633+ <!-- Modelo 340 -->
2634+ <record model="ir.ui.view" id="view_l10n_es_aeat_mod340_tree">
2635+ <field name="name">l10n.es.aeat.mod340.tree</field>
2636+ <field name="model">l10n.es.aeat.mod340</field>
2637+ <field name="type">tree</field>
2638+ <field name="arch" type="xml">
2639+ <tree string="Model 340">
2640+ <field name="fiscalyear_id"/>
2641+ <field name="period_from"/>
2642+ <field name="period_to"/>
2643+ <field name="number"/>
2644+ <field name="type"/>
2645+ <field name="state" invisible="1"/>
2646+ </tree>
2647+ </field>
2648+ </record>
2649+
2650+ <record id="view_l10n_es_aeat_mod340_form" model="ir.ui.view">
2651+ <field name="name">l10n_es.aeat.mod340.form</field>
2652+ <field name="model">l10n.es.aeat.mod340</field>
2653+ <field name="inherit_id" ref="l10n_es_aeat.view_l10n_es_aeat_report_form"/>
2654+ <field name="arch" type="xml">
2655+ <button name="%(l10n_es_aeat.action_wizard_aeat_export)d" position="attributes">
2656+ <attribute name="name">%(action_wizard_aeat_mod340_export)d</attribute>
2657+ </button>
2658+ <field name="fiscalyear_id" position="after">
2659+ <field name="period_from" select="1" required="1" domain="[('fiscalyear_id','=',fiscalyear_id)]"/>
2660+ <field name="period_to" select="1" required="1" domain="[('fiscalyear_id','=',fiscalyear_id)]"/>
2661+ </field>
2662+ <field name="calculation_date" position="after">
2663+ <field name="number"/>
2664+ <field name="support_type"/>
2665+ </field>
2666+ <group string="Declaración" position="after">
2667+ <notebook colspan="4">
2668+ <page string="General">
2669+ <group string="Identification" colspan="4">
2670+ <field name="phone_contact" />
2671+ <field name="name_contact" />
2672+ <field name="representative_vat" />
2673+ </group>
2674+ <group string="Susbtitutive/complementary declaration" colspan="4">
2675+ <field name="type"/>
2676+ <field name="previous_number"/>
2677+ </group>
2678+ <group string="Electronic Code VAT reverse charge" colspan="4">
2679+ <field name="ean13" nolabel="1"/>
2680+ </group>
2681+ <group string="Summary" colspan="4">
2682+ <field name="number_records" select ="2" readonly="1"/>
2683+ <newline/>
2684+ <field name="total_taxable" select ="2" readonly="1"/>
2685+ <field name="total_sharetax" select ="2" readonly="1"/>
2686+ <field name="total" select="2" readonly="1"/>
2687+ <newline/>
2688+ <field name="calculation_date" select ="2" readonly="1"/>
2689+ </group>
2690+ <group colspan="4" col="10">
2691+ </group>
2692+ </page>
2693+ <page string="Issued invoice" >
2694+ <field name="issued" nolabel="1" />
2695+ </page>
2696+ <page string="Received invoice" >
2697+ <field name="received" nolabel="1" />
2698+ </page>
2699+ </notebook>
2700+ </group>
2701+ </field>
2702+ </record>
2703+ <!-- FIN Modelo 340 -->
2704+
2705+
2706+ <!--Invoice Issued-->
2707+
2708+ <record id="view_l10n_es_aeat_mod340_invoice_issued_tree" model="ir.ui.view">
2709+ <field name="name">l10n.es.aeat.mod340.issued.tree</field>
2710+ <field name="model">l10n.es.aeat.mod340.issued</field>
2711+ <field name="type">tree</field>
2712+ <field name="arch" type="xml">
2713+ <tree string="Issued invoices">
2714+ <field name="date_invoice"/>
2715+ <field name="partner_id"/>
2716+ <field name="partner_country_code"/>
2717+ <field name="partner_vat"/>
2718+ <field name="invoice_id"/>
2719+ <field name="base_tax" sum="Total Base" />
2720+ <field name="amount_tax" sum="Total Tax" />
2721+ <field name="total" sum="Total"/>
2722+ </tree>
2723+ </field>
2724+ </record>
2725+
2726+ <record id="view_l10n_es_aeat_mod340_invoice_issued_form" model="ir.ui.view">
2727+ <field name="name">l10n.es.aeat.mod340.issued.form</field>
2728+ <field name="model">l10n.es.aeat.mod340.issued</field>
2729+ <field name="type">form</field>
2730+ <field name="arch" type="xml">
2731+ <form string="Issued invoices">
2732+ <field name="invoice_id"/>
2733+ <newline/>
2734+ <field name="partner_id"/>
2735+ <field name="partner_vat"/>
2736+ <field name="representative_vat"/>
2737+ <field name="partner_country_code"/>
2738+ <newline/>
2739+ <field name="base_tax" />
2740+ <field name="amount_tax" />
2741+ <newline/>
2742+ <field name="total"/>
2743+ <newline />
2744+ <field name="tax_line_ids" />
2745+ </form>
2746+ </field>
2747+ </record>
2748+
2749+ <!--Invoice Received-->
2750+
2751+ <record id="view_l10n_es_aeat_mod340_invoice_received_tree" model="ir.ui.view">
2752+ <field name="name">l10n.es.aeat.mod340.received.tree</field>
2753+ <field name="model">l10n.es.aeat.mod340.received</field>
2754+ <field name="type">tree</field>
2755+ <field name="arch" type="xml">
2756+ <tree string="Received invoices">
2757+ <field name="partner_id"/>
2758+ <field name="partner_country_code"/>
2759+ <field name="partner_vat"/>
2760+ <field name="invoice_id"/>
2761+ <field name="base_tax" sum="Total Base"/>
2762+ <field name="amount_tax" sum="Total Tax"/>
2763+ <field name="total" sum="Total"/>
2764+ </tree>
2765+ </field>
2766+ </record>
2767+
2768+ <record id="view_l10n_es_aeat_mod340_invoice_received_form" model="ir.ui.view">
2769+ <field name="name">l10n.es.aeat.mod340.received.form</field>
2770+ <field name="model">l10n.es.aeat.mod340.received</field>
2771+ <field name="type">form</field>
2772+ <field name="arch" type="xml">
2773+ <form string="Received invoices">
2774+ <field name="invoice_id"/>
2775+ <newline/>
2776+ <field name="partner_id"/>
2777+ <field name="partner_vat"/>
2778+ <field name="representative_vat"/>
2779+ <field name="partner_country_code"/>
2780+ <newline/>
2781+ <field name="base_tax"/>
2782+ <field name="amount_tax"/>
2783+ <newline/>
2784+ <field name="total"/>
2785+ <newline />
2786+ <field name="tax_line_ids" />
2787+ </form>
2788+ </field>
2789+ </record>
2790+
2791+ <!--Vat Lines-->
2792+
2793+ <record id="view_l10n_es_aeat_mod340_tax_line_issued_form" model="ir.ui.view">
2794+ <field name="name">l10n.es.aeat.mod340.tax_line_issued.form</field>
2795+ <field name="model">l10n.es.aeat.mod340.tax_line_issued</field>
2796+ <field name="type">form</field>
2797+ <field name="arch" type="xml">
2798+ <form string="Tax line issued">
2799+ <field name="name"/>
2800+ <field name="tax_percentage"/>
2801+ <field name="tax_amount"/>
2802+ <field name="base_amount"/>
2803+ </form>
2804+ </field>
2805+ </record>
2806+
2807+ <record id="view_l10n_es_aeat_mod340_tax_line_received_form" model="ir.ui.view">
2808+ <field name="name">l10n.es.aeat.mod340.tax_line_received.form</field>
2809+ <field name="model">l10n.es.aeat.mod340.tax_line_received</field>
2810+ <field name="type">form</field>
2811+ <field name="arch" type="xml">
2812+ <form string="Tax line received">
2813+ <field name="name"/>
2814+ <field name="tax_percentage"/>
2815+ <field name="tax_amount"/>
2816+ <field name="base_amount"/>
2817+ </form>
2818+ </field>
2819+ </record>
2820+
2821+ <record id="view_l10n_es_aeat_mod340_report_search" model="ir.ui.view">
2822 <field name="name">AEAT Model 340 (search)</field>
2823 <field name="model">l10n.es.aeat.mod340</field>
2824 <field name="type">search</field>
2825@@ -228,7 +206,8 @@
2826 <filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}"/>
2827 </group>
2828 <newline/>
2829- <field name="period"/>
2830+ <field name="period_from"/>
2831+ <field name="period_to" />
2832 <field name="fiscalyear_id"/>
2833 <field name="number"/>
2834 <field name="type"/>
2835@@ -238,14 +217,24 @@
2836
2837 <!-- Window action -->
2838 <record id="action_l10n_es_aeat_mod340_report" model="ir.actions.act_window">
2839- <field name="name">AEAT Model 340</field>
2840+ <field name="name">AEAT model 340</field>
2841 <field name="res_model">l10n.es.aeat.mod340</field>
2842 <field name="view_type">form</field>
2843 <field name="view_mode">tree,form</field>
2844- <field name="help">Create and query AEAT Model 340 Reports</field>
2845- </record>
2846-
2847-
2848+ <field name="help">Create and query AEAT Model 340 reports</field>
2849+ </record>
2850+ <record model="ir.actions.act_window.view" id="action_l10n_es_aeat_mod340_report_tree">
2851+ <field name="sequence" eval="2"/>
2852+ <field name="view_mode">tree</field>
2853+ <field name="view_id" ref="view_l10n_es_aeat_mod340_tree"/>
2854+ <field name="act_window_id" ref="action_l10n_es_aeat_mod340_report"/>
2855+ </record>
2856+ <record model="ir.actions.act_window.view" id="action_l10n_es_aeat_mod340_report_form">
2857+ <field name="sequence" eval="3"/>
2858+ <field name="view_mode">form</field>
2859+ <field name="view_id" ref="view_l10n_es_aeat_mod340_form"/>
2860+ <field name="act_window_id" ref="action_l10n_es_aeat_mod340_report"/>
2861+ </record>
2862
2863 <!--
2864 ### MENU ACCESS ###
2865
2866=== modified file 'l10n_es_aeat_mod340/report/mod340_report.rml'
2867--- l10n_es_aeat_mod340/report/mod340_report.rml 2011-05-20 19:05:27 +0000
2868+++ l10n_es_aeat_mod340/report/mod340_report.rml 2014-02-03 11:19:23 +0000
2869@@ -44,15 +44,18 @@
2870 <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
2871 <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
2872 <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
2873- <lineStyle kind="LINEAFTER" colorName="#000000" start="5,0" stop="5,-1"/>
2874 <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
2875 <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
2876+ <lineStyle kind="LINEAFTER" colorName="#000000" start="6,0" stop="6,-1"/>
2877+ <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
2878+ <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
2879 <blockBackground colorName="#cccccc" start="0,0" stop="0,-1"/>
2880 <blockBackground colorName="#cccccc" start="1,0" stop="1,-1"/>
2881 <blockBackground colorName="#cccccc" start="2,0" stop="2,-1"/>
2882 <blockBackground colorName="#cccccc" start="3,0" stop="3,-1"/>
2883 <blockBackground colorName="#cccccc" start="4,0" stop="4,-1"/>
2884 <blockBackground colorName="#cccccc" start="5,0" stop="5,-1"/>
2885+ <blockBackground colorName="#cccccc" start="6,0" stop="6,-1"/>
2886 </blockTableStyle>
2887 <blockTableStyle id="Taula4">
2888 <blockAlignment value="LEFT"/>
2889@@ -63,6 +66,7 @@
2890 <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
2891 <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
2892 <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
2893+ <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
2894 </blockTableStyle>
2895 <blockTableStyle id="Taula5">
2896 <blockAlignment value="LEFT"/>
2897@@ -78,15 +82,18 @@
2898 <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
2899 <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
2900 <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
2901- <lineStyle kind="LINEAFTER" colorName="#000000" start="5,0" stop="5,-1"/>
2902 <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
2903 <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
2904+ <lineStyle kind="LINEAFTER" colorName="#000000" start="6,0" stop="6,-1"/>
2905+ <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
2906+ <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
2907 <blockBackground colorName="#cccccc" start="0,0" stop="0,-1"/>
2908 <blockBackground colorName="#cccccc" start="1,0" stop="1,-1"/>
2909 <blockBackground colorName="#cccccc" start="2,0" stop="2,-1"/>
2910 <blockBackground colorName="#cccccc" start="3,0" stop="3,-1"/>
2911 <blockBackground colorName="#cccccc" start="4,0" stop="4,-1"/>
2912 <blockBackground colorName="#cccccc" start="5,0" stop="5,-1"/>
2913+ <blockBackground colorName="#cccccc" start="6,0" stop="6,-1"/>
2914 </blockTableStyle>
2915 <blockTableStyle id="Taula6">
2916 <blockAlignment value="LEFT"/>
2917@@ -97,6 +104,7 @@
2918 <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
2919 <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
2920 <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
2921+ <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
2922 </blockTableStyle>
2923 <initialize>
2924 <paraStyle name="all" alignment="justify"/>
2925@@ -112,6 +120,7 @@
2926 <paraStyle name="P9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
2927 <paraStyle name="P10" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
2928 <paraStyle name="P11" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
2929+ <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
2930 <paraStyle name="Standard" fontName="Helvetica"/>
2931 <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
2932 <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
2933@@ -121,10 +130,13 @@
2934 <paraStyle name="Table Contents" fontName="Helvetica"/>
2935 <paraStyle name="Table Heading" fontName="Helvetica-BoldOblique" alignment="CENTER"/>
2936 <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
2937+ <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
2938+ <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"/>
2939 <images/>
2940 </stylesheet>
2941 <story>
2942 <para style="Standard">[[repeatIn(objects, 'o')]]</para>
2943+ <para style="terp_default_8">[[ setLang(o.company_id.partner_id.lang) ]]</para>
2944 <para style="P4">MODELO AEAT 340</para>
2945 <blockTable colWidths="117.0,219.0" style="Taula2">
2946 <tr>
2947@@ -135,7 +147,7 @@
2948 <para style="P3">Tipo de soporte: </para>
2949 </td>
2950 <td>
2951- <para style="P2">[[o.company_id.partner_id.name or '']] </para>
2952+ <para style="P2">[[ o.company_id.name or '']] </para>
2953 <para style="P2">[[o.fiscalyear_id.name or '']] </para>
2954 <para style="P2">[[o.number or '']] </para>
2955 <para style="P2">[[o.support_type]]</para>
2956@@ -177,9 +189,12 @@
2957 <para style="P7">
2958 <font color="white"> </font>
2959 </para>
2960- <blockTable colWidths="108.0,73.0,76.0,75.0,73.0,78.0" repeatRows="1" style="Taula3">
2961+ <blockTable colWidths="75.0,101.0,60.0,62.0,61.0,59.0,64.0" repeatRows="1" style="Taula3">
2962 <tr>
2963 <td>
2964+ <para style="Table Heading">Fecha</para>
2965+ </td>
2966+ <td>
2967 <para style="Table Heading">Empresa</para>
2968 </td>
2969 <td>
2970@@ -204,9 +219,12 @@
2971 </para>
2972 <section>
2973 <para style="P6">[[repeatIn(o.issued,'r')]]</para>
2974- <blockTable colWidths="108.0,73.0,76.0,75.0,73.0,78.0" repeatRows="1" style="Taula4">
2975+ <blockTable colWidths="75.0,101.0,60.0,62.0,61.0,59.0,64.0" repeatRows="1" style="Taula4">
2976 <tr>
2977 <td>
2978+ <para style="P11">[[ formatLang(r.invoice_id.date_invoice,date=True) ]]</para>
2979+ </td>
2980+ <td>
2981 <para style="P9">[[r.partner_id.name]]</para>
2982 </td>
2983 <td>
2984@@ -237,9 +255,12 @@
2985 <para style="P7">
2986 <font color="white"> </font>
2987 </para>
2988- <blockTable colWidths="108.0,73.0,76.0,75.0,73.0,78.0" repeatRows="1" style="Taula5">
2989+ <blockTable colWidths="74.0,102.0,60.0,62.0,61.0,59.0,64.0" repeatRows="1" style="Taula5">
2990 <tr>
2991 <td>
2992+ <para style="Table Heading">Fecha</para>
2993+ </td>
2994+ <td>
2995 <para style="Table Heading">Empresa</para>
2996 </td>
2997 <td>
2998@@ -264,16 +285,19 @@
2999 </para>
3000 <section>
3001 <para style="P6">[[repeatIn(o.received,'r')]]</para>
3002- <blockTable colWidths="108.0,73.0,76.0,75.0,73.0,78.0" repeatRows="1" style="Taula6">
3003+ <blockTable colWidths="75.0,101.0,60.0,62.0,61.0,59.0,64.0" repeatRows="1" style="Taula6">
3004 <tr>
3005 <td>
3006+ <para style="P11">[[ formatLang(r.invoice_id.date_invoice,date=True) ]]</para>
3007+ </td>
3008+ <td>
3009 <para style="P9">[[r.partner_id.name]]</para>
3010 </td>
3011 <td>
3012 <para style="P11">[[r.partner_vat]]</para>
3013 </td>
3014 <td>
3015- <para style="P11">[[r.invoice_id.number or '0']]</para>
3016+ <para style="P11">[[r.invoice_id.reference or '0']]</para>
3017 </td>
3018 <td>
3019 <para style="P10">[[r.base_tax]]</para>
3020@@ -295,4 +319,3 @@
3021 </para>
3022 </story>
3023 </document>
3024-
3025
3026=== modified file 'l10n_es_aeat_mod340/report/mod340_report.sxw'
3027Binary 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
3028=== modified file 'l10n_es_aeat_mod340/report/report_view.xml'
3029--- l10n_es_aeat_mod340/report/report_view.xml 2011-05-07 11:33:47 +0000
3030+++ l10n_es_aeat_mod340/report/report_view.xml 2014-02-03 11:19:23 +0000
3031@@ -21,6 +21,26 @@
3032 rml="l10n_es_aeat_mod340/report/mod340_report.rml"
3033 auto="True"
3034 header="False" />
3035+
3036+ <record id="report_vat_book_action" model="ir.actions.report.xml">
3037+ <field name="name">Vat Book</field>
3038+ <field name="type">ir.actions.report.xml</field>
3039+ <field name="model">l10n.es.aeat.mod340</field>
3040+ <field name="report_name">vat_book</field>
3041+ <field name="report_type">pdf</field>
3042+ <field name="report_rml">l10n_es_aeat_mod340/report/vat_book.rml</field>
3043+ <field name="auto" eval="True"/>
3044+ <field name="header" eval="False"/>
3045+ </record>
3046+
3047+ <report
3048+ id="vat_book"
3049+ string="Vat Book"
3050+ model="l10n.es.aeat.mod340"
3051+ name="vat book"
3052+ rml="l10n_es_aeat_mod340/report/vat_book.rml"
3053+ auto="True"
3054+ header="False" />
3055 </data>
3056 </openerp>
3057
3058
3059=== added file 'l10n_es_aeat_mod340/report/vat_book.rml'
3060--- l10n_es_aeat_mod340/report/vat_book.rml 1970-01-01 00:00:00 +0000
3061+++ l10n_es_aeat_mod340/report/vat_book.rml 2014-02-03 11:19:23 +0000
3062@@ -0,0 +1,310 @@
3063+<?xml version="1.0"?>
3064+<document filename="test.pdf">
3065+ <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
3066+ <pageTemplate id="first">
3067+ <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
3068+ </pageTemplate>
3069+ </template>
3070+ <stylesheet>
3071+ <blockTableStyle id="Standard_Outline">
3072+ <blockAlignment value="LEFT"/>
3073+ <blockValign value="TOP"/>
3074+ </blockTableStyle>
3075+ <blockTableStyle id="Taula2">
3076+ <blockAlignment value="LEFT"/>
3077+ <blockValign value="TOP"/>
3078+ <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
3079+ <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
3080+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
3081+ <lineStyle kind="LINEAFTER" colorName="#000000" start="1,0" stop="1,-1"/>
3082+ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
3083+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
3084+ </blockTableStyle>
3085+ <blockTableStyle id="Taula1">
3086+ <blockAlignment value="LEFT"/>
3087+ <blockValign value="TOP"/>
3088+ <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
3089+ <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
3090+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
3091+ <lineStyle kind="LINEAFTER" colorName="#000000" start="1,0" stop="1,-1"/>
3092+ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
3093+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
3094+ </blockTableStyle>
3095+ <blockTableStyle id="Taula3">
3096+ <blockAlignment value="LEFT"/>
3097+ <blockValign value="TOP"/>
3098+ <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
3099+ <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
3100+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
3101+ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
3102+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
3103+ <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
3104+ <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
3105+ <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
3106+ <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
3107+ <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
3108+ <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
3109+ <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
3110+ <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
3111+ <lineStyle kind="LINEAFTER" colorName="#000000" start="6,0" stop="6,-1"/>
3112+ <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
3113+ <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
3114+ <blockBackground colorName="#cccccc" start="0,0" stop="0,-1"/>
3115+ <blockBackground colorName="#cccccc" start="1,0" stop="1,-1"/>
3116+ <blockBackground colorName="#cccccc" start="2,0" stop="2,-1"/>
3117+ <blockBackground colorName="#cccccc" start="3,0" stop="3,-1"/>
3118+ <blockBackground colorName="#cccccc" start="4,0" stop="4,-1"/>
3119+ <blockBackground colorName="#cccccc" start="5,0" stop="5,-1"/>
3120+ <blockBackground colorName="#cccccc" start="6,0" stop="6,-1"/>
3121+ </blockTableStyle>
3122+ <blockTableStyle id="Taula4">
3123+ <blockAlignment value="LEFT"/>
3124+ <blockValign value="TOP"/>
3125+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
3126+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
3127+ <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
3128+ <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
3129+ <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
3130+ <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
3131+ <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
3132+ </blockTableStyle>
3133+ <blockTableStyle id="Taula5">
3134+ <blockAlignment value="LEFT"/>
3135+ <blockValign value="TOP"/>
3136+ <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
3137+ <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
3138+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
3139+ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
3140+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
3141+ <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
3142+ <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
3143+ <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
3144+ <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
3145+ <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
3146+ <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
3147+ <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
3148+ <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
3149+ <lineStyle kind="LINEAFTER" colorName="#000000" start="6,0" stop="6,-1"/>
3150+ <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
3151+ <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
3152+ <blockBackground colorName="#cccccc" start="0,0" stop="0,-1"/>
3153+ <blockBackground colorName="#cccccc" start="1,0" stop="1,-1"/>
3154+ <blockBackground colorName="#cccccc" start="2,0" stop="2,-1"/>
3155+ <blockBackground colorName="#cccccc" start="3,0" stop="3,-1"/>
3156+ <blockBackground colorName="#cccccc" start="4,0" stop="4,-1"/>
3157+ <blockBackground colorName="#cccccc" start="5,0" stop="5,-1"/>
3158+ <blockBackground colorName="#cccccc" start="6,0" stop="6,-1"/>
3159+ </blockTableStyle>
3160+ <blockTableStyle id="Taula6">
3161+ <blockAlignment value="LEFT"/>
3162+ <blockValign value="TOP"/>
3163+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
3164+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
3165+ <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
3166+ <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
3167+ <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
3168+ <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
3169+ <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
3170+ </blockTableStyle>
3171+ <initialize>
3172+ <paraStyle name="all" alignment="justify"/>
3173+ </initialize>
3174+ <paraStyle name="P1" fontName="Helvetica" alignment="CENTER"/>
3175+ <paraStyle name="P2" fontName="Helvetica"/>
3176+ <paraStyle name="P3" fontName="Helvetica" alignment="RIGHT"/>
3177+ <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="20.0" leading="25" alignment="CENTER"/>
3178+ <paraStyle name="P5" fontName="Helvetica" fontSize="6.0" leading="8"/>
3179+ <paraStyle name="P6" fontName="Helvetica" fontSize="6.0" leading="8"/>
3180+ <paraStyle name="P7" fontName="Helvetica" alignment="LEFT"/>
3181+ <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="LEFT"/>
3182+ <paraStyle name="P9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
3183+ <paraStyle name="P10" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
3184+ <paraStyle name="P11" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
3185+ <paraStyle name="P12" fontName="Helvetica"/>
3186+ <paraStyle name="P13" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
3187+ <paraStyle name="Standard" fontName="Helvetica"/>
3188+ <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
3189+ <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
3190+ <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
3191+ <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
3192+ <paraStyle name="Index" fontName="Helvetica"/>
3193+ <paraStyle name="Table Contents" fontName="Helvetica"/>
3194+ <paraStyle name="Table Heading" fontName="Helvetica-BoldOblique" alignment="CENTER"/>
3195+ <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
3196+ <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
3197+ <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"/>
3198+ <images/>
3199+ </stylesheet>
3200+ <story>
3201+ <para style="Standard">[[repeatIn(objects, 'o')]]</para>
3202+ <para style="terp_default_8">[[ setLang(o.company_id.partner_id.lang) ]]</para>
3203+ <para style="P4">LIBRO DE IVA</para>
3204+ <blockTable colWidths="117.0,219.0" style="Taula2">
3205+ <tr>
3206+ <td>
3207+ <para style="P3">Compañía: </para>
3208+ <para style="P3">Ejercicio fiscal: </para>
3209+ </td>
3210+ <td>
3211+ <para style="P2">[[o.company_id.name or '']] </para>
3212+ <para style="P2">[[o.fiscalyear_id.name or '']] </para>
3213+ </td>
3214+ </tr>
3215+ </blockTable>
3216+ <para style="P2">
3217+ <font color="white"> </font>
3218+ </para>
3219+ <para style="P1">
3220+ <font color="white"> </font>
3221+ </para>
3222+ <blockTable colWidths="237.0,244.0" style="Taula1">
3223+ <tr>
3224+ <td>
3225+ <para style="P3">CIF/NIF: </para>
3226+ <para style="P3">Teléfono de contacto: </para>
3227+ <para style="P3">Apellidos y nombre de contacto: </para>
3228+ </td>
3229+ <td>
3230+ <para style="P2">[[o.company_vat or '']] </para>
3231+ <para style="P2">[[o.contact_phone or '']] </para>
3232+ <para style="P2">[[o.name_contact or '']] </para>
3233+ </td>
3234+ </tr>
3235+ </blockTable>
3236+ <para style="P2">
3237+ <font color="white"> </font>
3238+ </para>
3239+ <para style="P8">FACTURAS DE SALIDA</para>
3240+ <para style="P7">
3241+ <font color="white"> </font>
3242+ </para>
3243+ <blockTable colWidths="73.0,103.0,60.0,62.0,61.0,59.0,64.0" repeatRows="1" style="Taula3">
3244+ <tr>
3245+ <td>
3246+ <para style="Table Heading">Fecha</para>
3247+ </td>
3248+ <td>
3249+ <para style="Table Heading">Empresa</para>
3250+ </td>
3251+ <td>
3252+ <para style="Table Heading">CIF/NIF</para>
3253+ </td>
3254+ <td>
3255+ <para style="Table Heading">Número de factura</para>
3256+ </td>
3257+ <td>
3258+ <para style="Table Heading">Base imponible</para>
3259+ </td>
3260+ <td>
3261+ <para style="Table Heading">Cuota impuesto</para>
3262+ </td>
3263+ <td>
3264+ <para style="Table Heading">Total factura</para>
3265+ </td>
3266+ </tr>
3267+ </blockTable>
3268+ <para style="P6">
3269+ <font color="white"> </font>
3270+ </para>
3271+ <section>
3272+ <para style="P6">[[repeatIn(o.issued,'r')]]</para>
3273+ <blockTable colWidths="74.0,102.0,60.0,62.0,61.0,59.0,64.0" repeatRows="1" style="Taula4">
3274+ <tr>
3275+ <td>
3276+ <para style="P11">[[ formatLang(r.invoice_id.date_invoice,date=True) ]]</para>
3277+ </td>
3278+ <td>
3279+ <para style="P9">[[r.partner_id.name]]</para>
3280+ </td>
3281+ <td>
3282+ <para style="P11">[[r.partner_vat]]</para>
3283+ </td>
3284+ <td>
3285+ <para style="P11">[[r.invoice_id.number]]</para>
3286+ </td>
3287+ <td>
3288+ <para style="P10">[[r.base_tax]]</para>
3289+ </td>
3290+ <td>
3291+ <para style="P10">[[r.amount_tax or '0']]</para>
3292+ </td>
3293+ <td>
3294+ <para style="P10">[[r.total or '0']]</para>
3295+ </td>
3296+ </tr>
3297+ </blockTable>
3298+ <para style="P5">
3299+ <font color="white"> </font>
3300+ </para>
3301+ </section>
3302+ <para style="P2">
3303+ <font color="white"> </font>
3304+ </para>
3305+ <para style="P8">FACTURAS DE ENTRADA</para>
3306+ <para style="P7">
3307+ <font color="white"> </font>
3308+ </para>
3309+ <blockTable colWidths="74.0,102.0,60.0,62.0,61.0,59.0,64.0" repeatRows="1" style="Taula5">
3310+ <tr>
3311+ <td>
3312+ <para style="Table Heading">Fecha</para>
3313+ </td>
3314+ <td>
3315+ <para style="Table Heading">Empresa</para>
3316+ </td>
3317+ <td>
3318+ <para style="Table Heading">CIF/NIF</para>
3319+ </td>
3320+ <td>
3321+ <para style="Table Heading">Nº de factura</para>
3322+ </td>
3323+ <td>
3324+ <para style="Table Heading">Base imponible</para>
3325+ </td>
3326+ <td>
3327+ <para style="Table Heading">Cuota impuesto</para>
3328+ </td>
3329+ <td>
3330+ <para style="Table Heading">Total factura</para>
3331+ </td>
3332+ </tr>
3333+ </blockTable>
3334+ <para style="P6">
3335+ <font color="white"> </font>
3336+ </para>
3337+ <section>
3338+ <para style="P6">[[repeatIn(o.received,'r')]]</para>
3339+ <blockTable colWidths="74.0,102.0,60.0,62.0,61.0,59.0,64.0" repeatRows="1" style="Taula6">
3340+ <tr>
3341+ <td>
3342+ <para style="P11">[[ formatLang(r.invoice_id.date_invoice,date=True) ]]</para>
3343+ </td>
3344+ <td>
3345+ <para style="P9">[[r.partner_id.name]]</para>
3346+ </td>
3347+ <td>
3348+ <para style="P11">[[r.partner_vat]]</para>
3349+ </td>
3350+ <td>
3351+ <para style="P11">[[r.invoice_id.reference or '0']]</para>
3352+ </td>
3353+ <td>
3354+ <para style="P10">[[r.base_tax]]</para>
3355+ </td>
3356+ <td>
3357+ <para style="P10">[[r.amount_tax or '0']]</para>
3358+ </td>
3359+ <td>
3360+ <para style="P10">[[r.total or '0']]</para>
3361+ </td>
3362+ </tr>
3363+ </blockTable>
3364+ <para style="P5">
3365+ <font color="white"> </font>
3366+ </para>
3367+ </section>
3368+ <para style="P5">
3369+ <font color="white"> </font>
3370+ </para>
3371+ </story>
3372+</document>
3373
3374=== added file 'l10n_es_aeat_mod340/report/vat_book.sxw'
3375Binary 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
3376=== modified file 'l10n_es_aeat_mod340/security/ir.model.access.csv'
3377--- l10n_es_aeat_mod340/security/ir.model.access.csv 2012-09-08 15:32:47 +0000
3378+++ l10n_es_aeat_mod340/security/ir.model.access.csv 2014-02-03 11:19:23 +0000
3379@@ -1,15 +1,13 @@
3380-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
3381-"access_l10n_es_aeat_mod340","l10n_es_aeat_mod340","model_l10n_es_aeat_mod340","account.group_account_user",1,0,0,0
3382-"access_l10n_es_aeat_mod340_manager","l10n_es_aeat_mod340 manager","model_l10n_es_aeat_mod340","account.group_account_manager",1,1,1,1
3383-"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
3384-"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
3385-"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
3386-"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
3387-"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
3388-"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
3389-"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
3390-"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
3391-"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
3392-
3393-
3394-
3395+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
3396+access_l10n_es_aeat_mod340,l10n_es_aeat_mod340,model_l10n_es_aeat_mod340,account.group_account_user,1,0,0,0
3397+access_l10n_es_aeat_mod340_manager,l10n_es_aeat_mod340 manager,model_l10n_es_aeat_mod340,account.group_account_manager,1,1,1,1
3398+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
3399+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
3400+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
3401+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
3402+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
3403+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
3404+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
3405+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
3406+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
3407+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
3408
3409=== added directory 'l10n_es_aeat_mod340/static'
3410=== added directory 'l10n_es_aeat_mod340/static/src'
3411=== added directory 'l10n_es_aeat_mod340/static/src/img'
3412=== added file 'l10n_es_aeat_mod340/static/src/img/icon.png'
3413Binary 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
3414=== added file 'l10n_es_aeat_mod340/static/src/img/icon_source.svg'
3415--- l10n_es_aeat_mod340/static/src/img/icon_source.svg 1970-01-01 00:00:00 +0000
3416+++ l10n_es_aeat_mod340/static/src/img/icon_source.svg 2014-02-03 11:19:23 +0000
3417@@ -0,0 +1,99 @@
3418+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
3419+<!-- Created with Inkscape (http://www.inkscape.org/) -->
3420+
3421+<svg
3422+ xmlns:dc="http://purl.org/dc/elements/1.1/"
3423+ xmlns:cc="http://creativecommons.org/ns#"
3424+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
3425+ xmlns:svg="http://www.w3.org/2000/svg"
3426+ xmlns="http://www.w3.org/2000/svg"
3427+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
3428+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
3429+ id="svg2"
3430+ version="1.1"
3431+ inkscape:version="0.48.3.1 r9886"
3432+ width="128"
3433+ height="128"
3434+ sodipodi:docname="icon_source.svg"
3435+ inkscape:export-filename="/home/ignacio/Proyectos/erp/Demo/openerp-7.0-20131224-002412/openerp/addons/l10n_es_aeat_mod340/static/src/img/icon.png"
3436+ inkscape:export-xdpi="90"
3437+ inkscape:export-ydpi="90">
3438+ <metadata
3439+ id="metadata8">
3440+ <rdf:RDF>
3441+ <cc:Work
3442+ rdf:about="">
3443+ <dc:format>image/svg+xml</dc:format>
3444+ <dc:type
3445+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
3446+ <dc:title></dc:title>
3447+ </cc:Work>
3448+ </rdf:RDF>
3449+ </metadata>
3450+ <defs
3451+ id="defs6" />
3452+ <sodipodi:namedview
3453+ pagecolor="#ffffff"
3454+ bordercolor="#666666"
3455+ borderopacity="1"
3456+ objecttolerance="10"
3457+ gridtolerance="10"
3458+ guidetolerance="10"
3459+ inkscape:pageopacity="0"
3460+ inkscape:pageshadow="2"
3461+ inkscape:window-width="1920"
3462+ inkscape:window-height="1028"
3463+ id="namedview4"
3464+ showgrid="false"
3465+ inkscape:zoom="9.2903224"
3466+ inkscape:cx="65.663825"
3467+ inkscape:cy="38.86526"
3468+ inkscape:window-x="1437"
3469+ inkscape:window-y="-3"
3470+ inkscape:window-maximized="1"
3471+ inkscape:current-layer="svg2"
3472+ fit-margin-top="0"
3473+ fit-margin-left="0"
3474+ fit-margin-right="0"
3475+ fit-margin-bottom="0" />
3476+ <g
3477+ id="g3003"
3478+ transform="translate(-0.07356158,0)">
3479+ <g
3480+ transform="translate(0,-3.31149)"
3481+ id="g2998">
3482+ <rect
3483+ 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"
3484+ id="rect2998"
3485+ width="51.523285"
3486+ height="118.80513"
3487+ x="13.910543"
3488+ y="3.8516259"
3489+ ry="0"
3490+ transform="matrix(1,0,0.51069126,0.85976417,0,0)" />
3491+ <path
3492+ style="fill:#ffd715;fill-opacity:1;stroke:none"
3493+ 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"
3494+ id="path3000"
3495+ inkscape:connector-curvature="0"
3496+ sodipodi:nodetypes="ccccccccc" />
3497+ <path
3498+ style="fill:#db2f34;fill-opacity:1;stroke:none"
3499+ 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"
3500+ id="path3021"
3501+ inkscape:connector-curvature="0"
3502+ sodipodi:nodetypes="ccccc" />
3503+ </g>
3504+ </g>
3505+ <text
3506+ sodipodi:linespacing="125%"
3507+ id="text2988"
3508+ y="127.48399"
3509+ x="-1.5893271"
3510+ 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"
3511+ xml:space="preserve"><tspan
3512+ y="127.48399"
3513+ x="-1.5893271"
3514+ id="tspan2990"
3515+ sodipodi:role="line">340</tspan></text>
3516+</svg>
3517
3518=== added file 'l10n_es_aeat_mod340/taxes_data.xml'
3519--- l10n_es_aeat_mod340/taxes_data.xml 1970-01-01 00:00:00 +0000
3520+++ l10n_es_aeat_mod340/taxes_data.xml 2014-02-03 11:19:23 +0000
3521@@ -0,0 +1,192 @@
3522+<?xml version="1.0" encoding="utf-8"?>
3523+<openerp>
3524+ <data noupdate="0">
3525+ <!-- Bases incluidas en el Modelo 340
3526+ Ignacio Ibeas (Acysos) - ignacio@acysos.com (2013-05-13)
3527+ -->
3528+ <!--IVA Devengado Base imponible-->
3529+ <record id="l10n_es.iva_dev_base" model="account.tax.code.template">
3530+ <field name="mod340" eval="True"/>
3531+ </record>
3532+ <!-- Exentas IVA -->
3533+ <record id="l10n_es.base_sop_ex" model="account.tax.code.template">
3534+ <field name="mod340" eval="True"/>
3535+ </record>
3536+
3537+ <record id="l10n_es.base_rep_ex" model="account.tax.code.template">
3538+ <field name="mod340" eval="True"/>
3539+ </record>
3540+ <!--Regimen general-->
3541+ <record id="l10n_es.iva_dev_01" model="account.tax.code.template">
3542+ <field name="mod340" eval="True"/>
3543+ </record>
3544+
3545+ <record id="l10n_es.iva_dev_04" model="account.tax.code.template">
3546+ <field name="mod340" eval="True"/>
3547+ </record>
3548+
3549+ <record id="l10n_es.iva_dev_04_8" model="account.tax.code.template">
3550+ <field name="mod340" eval="True"/>
3551+ </record>
3552+
3553+ <record id="l10n_es.iva_dev_04_10" model="account.tax.code.template">
3554+ <field name="mod340" eval="True"/>
3555+ </record>
3556+
3557+ <record id="l10n_es.iva_dev_07" model="account.tax.code.template">
3558+ <field name="mod340" eval="True"/>
3559+ </record>
3560+
3561+ <record id="l10n_es.iva_dev_07_18" model="account.tax.code.template">
3562+ <field name="mod340" eval="True"/>
3563+ </record>
3564+
3565+ <record id="l10n_es.iva_dev_07_21" model="account.tax.code.template">
3566+ <field name="mod340" eval="True"/>
3567+ </record>
3568+ <!-- ADQUISICIONES INTRACOMUNITARIAS -->
3569+ <record id="l10n_es.iva_dev_19" model="account.tax.code.template">
3570+ <field name="mod340" eval="True"/>
3571+ </record>
3572+ <!--IVA DEDUCIBLE -->
3573+ <record id="l10n_es.iva_ded_base_total" model="account.tax.code.template">
3574+ <field name="mod340" eval="True"/>
3575+ </record>
3576+ <!-- Base en OPERACIONES INTERIORES CORRIENTES-->
3577+ <record id="l10n_es.iva_ded_22" model="account.tax.code.template">
3578+ <field name="mod340" eval="True"/>
3579+ </record>
3580+
3581+ <record id="l10n_es.iva_ded_22_4" model="account.tax.code.template">
3582+ <field name="mod340" eval="True"/>
3583+ </record>
3584+
3585+ <record id="l10n_es.iva_ded_22_7" model="account.tax.code.template">
3586+ <field name="mod340" eval="True"/>
3587+ </record>
3588+
3589+ <record id="l10n_es.iva_ded_22_8" model="account.tax.code.template">
3590+ <field name="mod340" eval="True"/>
3591+ </record>
3592+
3593+ <record id="l10n_es.iva_ded_22_10" model="account.tax.code.template">
3594+ <field name="mod340" eval="True"/>
3595+ </record>
3596+
3597+ <record id="l10n_es.iva_ded_22_16" model="account.tax.code.template">
3598+ <field name="mod340" eval="True"/>
3599+ </record>
3600+
3601+ <record id="l10n_es.iva_ded_22_18" model="account.tax.code.template">
3602+ <field name="mod340" eval="True"/>
3603+ </record>
3604+
3605+ <record id="l10n_es.iva_ded_22_21" model="account.tax.code.template">
3606+ <field name="mod340" eval="True"/>
3607+ </record>
3608+ <!-- Base en OPERACIONES INTERIORES CON BIENES DE INVERSIÓN-->
3609+ <record id="l10n_es.iva_ded_24" model="account.tax.code.template">
3610+ <field name="mod340" eval="True"/>
3611+ </record>
3612+
3613+ <record id="l10n_es.iva_ded_24_4" model="account.tax.code.template">
3614+ <field name="mod340" eval="True"/>
3615+ </record>
3616+
3617+ <record id="l10n_es.iva_ded_24_7" model="account.tax.code.template">
3618+ <field name="mod340" eval="True"/>
3619+ </record>
3620+
3621+ <record id="l10n_es.iva_ded_24_8" model="account.tax.code.template">
3622+ <field name="mod340" eval="True"/>
3623+ </record>
3624+
3625+ <record id="l10n_es.iva_ded_24_10" model="account.tax.code.template">
3626+ <field name="mod340" eval="True"/>
3627+ </record>
3628+
3629+ <record id="l10n_es.iva_ded_24_16" model="account.tax.code.template">
3630+ <field name="mod340" eval="True"/>
3631+ </record>
3632+
3633+ <record id="l10n_es.iva_ded_24_18" model="account.tax.code.template">
3634+ <field name="mod340" eval="True"/>
3635+ </record>
3636+
3637+ <record id="l10n_es.iva_ded_24_21" model="account.tax.code.template">
3638+ <field name="mod340" eval="True"/>
3639+ </record>
3640+ <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES CORRIENTES-->
3641+ <record id="l10n_es.iva_ded_30" model="account.tax.code.template">
3642+ <field name="mod340" eval="True"/>
3643+ </record>
3644+
3645+ <record id="l10n_es.iva_ded_30_4" model="account.tax.code.template">
3646+ <field name="mod340" eval="True"/>
3647+ </record>
3648+
3649+ <record id="l10n_es.iva_ded_30_7" model="account.tax.code.template">
3650+ <field name="mod340" eval="True"/>
3651+ </record>
3652+
3653+ <record id="l10n_es.iva_ded_30_8" model="account.tax.code.template">
3654+ <field name="mod340" eval="True"/>
3655+ </record>
3656+
3657+ <record id="l10n_es.iva_ded_30_10" model="account.tax.code.template">
3658+ <field name="mod340" eval="True"/>
3659+ </record>
3660+
3661+ <record id="l10n_es.iva_ded_30_16" model="account.tax.code.template">
3662+ <field name="mod340" eval="True"/>
3663+ </record>
3664+
3665+ <record id="l10n_es.iva_ded_30_18" model="account.tax.code.template">
3666+ <field name="mod340" eval="True"/>
3667+ </record>
3668+
3669+ <record id="l10n_es.iva_ded_30_21" model="account.tax.code.template">
3670+ <field name="mod340" eval="True"/>
3671+ </record>
3672+ <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES DE INVERSIÓN-->
3673+ <record id="l10n_es.iva_ded_32" model="account.tax.code.template">
3674+ <field name="mod340" eval="True"/>
3675+ </record>
3676+
3677+ <record id="l10n_es.iva_ded_32_4" model="account.tax.code.template">
3678+ <field name="mod340" eval="True"/>
3679+ </record>
3680+
3681+ <record id="l10n_es.iva_ded_32_7" model="account.tax.code.template">
3682+ <field name="mod340" eval="True"/>
3683+ </record>
3684+
3685+ <record id="l10n_es.iva_ded_32_8" model="account.tax.code.template">
3686+ <field name="mod340" eval="True"/>
3687+ </record>
3688+
3689+ <record id="l10n_es.iva_ded_32_10" model="account.tax.code.template">
3690+ <field name="mod340" eval="True"/>
3691+ </record>
3692+
3693+ <record id="l10n_es.iva_ded_32_16" model="account.tax.code.template">
3694+ <field name="mod340" eval="True"/>
3695+ </record>
3696+
3697+ <record id="l10n_es.iva_ded_32_18" model="account.tax.code.template">
3698+ <field name="mod340" eval="True"/>
3699+ </record>
3700+
3701+ <record id="l10n_es.iva_ded_32_21" model="account.tax.code.template">
3702+ <field name="mod340" eval="True"/>
3703+ </record>
3704+ <!--Otros Códigos de Impuestos-->
3705+ <record id="l10n_es.base_intra_42" model="account.tax.code.template">
3706+ <field name="mod340" eval="True"/>
3707+ </record>
3708+
3709+ <record id="l10n_es.base_extra_44" model="account.tax.code.template">
3710+ <field name="mod340" eval="True"/>
3711+ </record>
3712+ </data>
3713+</openerp>
3714\ No newline at end of file
3715
3716=== added file 'l10n_es_aeat_mod340/taxes_data_assoc.xml'
3717--- l10n_es_aeat_mod340/taxes_data_assoc.xml 1970-01-01 00:00:00 +0000
3718+++ l10n_es_aeat_mod340/taxes_data_assoc.xml 2014-02-03 11:19:23 +0000
3719@@ -0,0 +1,192 @@
3720+<?xml version="1.0" encoding="utf-8"?>
3721+<openerp>
3722+ <data noupdate="0">
3723+ <!-- Bases incluidas en el Modelo 340
3724+ Ignacio Ibeas (Acysos) - ignacio@acysos.com (2013-05-13)
3725+ -->
3726+ <!--IVA Devengado Base imponible-->
3727+ <record id="l10n_es.iva_assoc_dev_base" model="account.tax.code.template">
3728+ <field name="mod340" eval="True"/>
3729+ </record>
3730+ <!-- Exentas IVA -->
3731+ <record id="l10n_es.base_assoc_sop_ex" model="account.tax.code.template">
3732+ <field name="mod340" eval="True"/>
3733+ </record>
3734+
3735+ <record id="l10n_es.base_assoc_rep_ex" model="account.tax.code.template">
3736+ <field name="mod340" eval="True"/>
3737+ </record>
3738+ <!--Regimen general-->
3739+ <record id="l10n_es.iva_assoc_dev_01" model="account.tax.code.template">
3740+ <field name="mod340" eval="True"/>
3741+ </record>
3742+
3743+ <record id="l10n_es.iva_assoc_dev_04" model="account.tax.code.template">
3744+ <field name="mod340" eval="True"/>
3745+ </record>
3746+
3747+ <record id="l10n_es.iva_assoc_dev_04_8" model="account.tax.code.template">
3748+ <field name="mod340" eval="True"/>
3749+ </record>
3750+
3751+ <record id="l10n_es.iva_assoc_dev_04_10" model="account.tax.code.template">
3752+ <field name="mod340" eval="True"/>
3753+ </record>
3754+
3755+ <record id="l10n_es.iva_assoc_dev_07" model="account.tax.code.template">
3756+ <field name="mod340" eval="True"/>
3757+ </record>
3758+
3759+ <record id="l10n_es.iva_assoc_dev_07_18" model="account.tax.code.template">
3760+ <field name="mod340" eval="True"/>
3761+ </record>
3762+
3763+ <record id="l10n_es.iva_assoc_dev_07_21" model="account.tax.code.template">
3764+ <field name="mod340" eval="True"/>
3765+ </record>
3766+ <!-- ADQUISICIONES INTRACOMUNITARIAS -->
3767+ <record id="l10n_es.iva_assoc_dev_19" model="account.tax.code.template">
3768+ <field name="mod340" eval="True"/>
3769+ </record>
3770+ <!--IVA DEDUCIBLE -->
3771+ <record id="l10n_es.iva_assoc_ded_base_total" model="account.tax.code.template">
3772+ <field name="mod340" eval="True"/>
3773+ </record>
3774+ <!-- Base en OPERACIONES INTERIORES CORRIENTES-->
3775+ <record id="l10n_es.iva_assoc_ded_22" model="account.tax.code.template">
3776+ <field name="mod340" eval="True"/>
3777+ </record>
3778+
3779+ <record id="l10n_es.iva_assoc_ded_22_4" model="account.tax.code.template">
3780+ <field name="mod340" eval="True"/>
3781+ </record>
3782+
3783+ <record id="l10n_es.iva_assoc_ded_22_7" model="account.tax.code.template">
3784+ <field name="mod340" eval="True"/>
3785+ </record>
3786+
3787+ <record id="l10n_es.iva_assoc_ded_22_8" model="account.tax.code.template">
3788+ <field name="mod340" eval="True"/>
3789+ </record>
3790+
3791+ <record id="l10n_es.iva_assoc_ded_22_10" model="account.tax.code.template">
3792+ <field name="mod340" eval="True"/>
3793+ </record>
3794+
3795+ <record id="l10n_es.iva_assoc_ded_22_16" model="account.tax.code.template">
3796+ <field name="mod340" eval="True"/>
3797+ </record>
3798+
3799+ <record id="l10n_es.iva_assoc_ded_22_18" model="account.tax.code.template">
3800+ <field name="mod340" eval="True"/>
3801+ </record>
3802+
3803+ <record id="l10n_es.iva_assoc_ded_22_21" model="account.tax.code.template">
3804+ <field name="mod340" eval="True"/>
3805+ </record>
3806+ <!-- Base en OPERACIONES INTERIORES CON BIENES DE INVERSIÓN-->
3807+ <record id="l10n_es.iva_assoc_ded_24" model="account.tax.code.template">
3808+ <field name="mod340" eval="True"/>
3809+ </record>
3810+
3811+ <record id="l10n_es.iva_assoc_ded_24_4" model="account.tax.code.template">
3812+ <field name="mod340" eval="True"/>
3813+ </record>
3814+
3815+ <record id="l10n_es.iva_assoc_ded_24_7" model="account.tax.code.template">
3816+ <field name="mod340" eval="True"/>
3817+ </record>
3818+
3819+ <record id="l10n_es.iva_assoc_ded_24_8" model="account.tax.code.template">
3820+ <field name="mod340" eval="True"/>
3821+ </record>
3822+
3823+ <record id="l10n_es.iva_assoc_ded_24_10" model="account.tax.code.template">
3824+ <field name="mod340" eval="True"/>
3825+ </record>
3826+
3827+ <record id="l10n_es.iva_assoc_ded_24_16" model="account.tax.code.template">
3828+ <field name="mod340" eval="True"/>
3829+ </record>
3830+
3831+ <record id="l10n_es.iva_assoc_ded_24_18" model="account.tax.code.template">
3832+ <field name="mod340" eval="True"/>
3833+ </record>
3834+
3835+ <record id="l10n_es.iva_assoc_ded_24_21" model="account.tax.code.template">
3836+ <field name="mod340" eval="True"/>
3837+ </record>
3838+ <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES CORRIENTES-->
3839+ <record id="l10n_es.iva_assoc_ded_30" model="account.tax.code.template">
3840+ <field name="mod340" eval="True"/>
3841+ </record>
3842+
3843+ <record id="l10n_es.iva_assoc_ded_30_4" model="account.tax.code.template">
3844+ <field name="mod340" eval="True"/>
3845+ </record>
3846+
3847+ <record id="l10n_es.iva_assoc_ded_30_7" model="account.tax.code.template">
3848+ <field name="mod340" eval="True"/>
3849+ </record>
3850+
3851+ <record id="l10n_es.iva_assoc_ded_30_8" model="account.tax.code.template">
3852+ <field name="mod340" eval="True"/>
3853+ </record>
3854+
3855+ <record id="l10n_es.iva_assoc_ded_30_10" model="account.tax.code.template">
3856+ <field name="mod340" eval="True"/>
3857+ </record>
3858+
3859+ <record id="l10n_es.iva_assoc_ded_30_16" model="account.tax.code.template">
3860+ <field name="mod340" eval="True"/>
3861+ </record>
3862+
3863+ <record id="l10n_es.iva_assoc_ded_30_18" model="account.tax.code.template">
3864+ <field name="mod340" eval="True"/>
3865+ </record>
3866+
3867+ <record id="l10n_es.iva_assoc_ded_30_21" model="account.tax.code.template">
3868+ <field name="mod340" eval="True"/>
3869+ </record>
3870+ <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES DE INVERSIÓN-->
3871+ <record id="l10n_es.iva_assoc_ded_32" model="account.tax.code.template">
3872+ <field name="mod340" eval="True"/>
3873+ </record>
3874+
3875+ <record id="l10n_es.iva_assoc_ded_32_4" model="account.tax.code.template">
3876+ <field name="mod340" eval="True"/>
3877+ </record>
3878+
3879+ <record id="l10n_es.iva_assoc_ded_32_7" model="account.tax.code.template">
3880+ <field name="mod340" eval="True"/>
3881+ </record>
3882+
3883+ <record id="l10n_es.iva_assoc_ded_32_8" model="account.tax.code.template">
3884+ <field name="mod340" eval="True"/>
3885+ </record>
3886+
3887+ <record id="l10n_es.iva_assoc_ded_32_10" model="account.tax.code.template">
3888+ <field name="mod340" eval="True"/>
3889+ </record>
3890+
3891+ <record id="l10n_es.iva_assoc_ded_32_16" model="account.tax.code.template">
3892+ <field name="mod340" eval="True"/>
3893+ </record>
3894+
3895+ <record id="l10n_es.iva_assoc_ded_32_18" model="account.tax.code.template">
3896+ <field name="mod340" eval="True"/>
3897+ </record>
3898+
3899+ <record id="l10n_es.iva_assoc_ded_32_21" model="account.tax.code.template">
3900+ <field name="mod340" eval="True"/>
3901+ </record>
3902+ <!--Otros Códigos de Impuestos-->
3903+ <record id="l10n_es.base_intra_42" model="account.tax.code.template">
3904+ <field name="mod340" eval="True"/>
3905+ </record>
3906+
3907+ <record id="l10n_es.base_extra_44" model="account.tax.code.template">
3908+ <field name="mod340" eval="True"/>
3909+ </record>
3910+ </data>
3911+</openerp>
3912\ No newline at end of file
3913
3914=== added file 'l10n_es_aeat_mod340/taxes_data_pymes.xml'
3915--- l10n_es_aeat_mod340/taxes_data_pymes.xml 1970-01-01 00:00:00 +0000
3916+++ l10n_es_aeat_mod340/taxes_data_pymes.xml 2014-02-03 11:19:23 +0000
3917@@ -0,0 +1,192 @@
3918+<?xml version="1.0" encoding="utf-8"?>
3919+<openerp>
3920+ <data noupdate="0">
3921+ <!-- Bases incluidas en el Modelo 340
3922+ Ignacio Ibeas (Acysos) - ignacio@acysos.com (2013-05-13)
3923+ -->
3924+ <!--IVA Devengado Base imponible-->
3925+ <record id="l10n_es.iva_pymes_dev_base" model="account.tax.code.template">
3926+ <field name="mod340" eval="True"/>
3927+ </record>
3928+ <!-- Exentas IVA -->
3929+ <record id="l10n_es.base_pymes_sop_ex" model="account.tax.code.template">
3930+ <field name="mod340" eval="True"/>
3931+ </record>
3932+
3933+ <record id="l10n_es.base_pymes_rep_ex" model="account.tax.code.template">
3934+ <field name="mod340" eval="True"/>
3935+ </record>
3936+ <!--Regimen general-->
3937+ <record id="l10n_es.iva_pymes_dev_01" model="account.tax.code.template">
3938+ <field name="mod340" eval="True"/>
3939+ </record>
3940+
3941+ <record id="l10n_es.iva_pymes_dev_04" model="account.tax.code.template">
3942+ <field name="mod340" eval="True"/>
3943+ </record>
3944+
3945+ <record id="l10n_es.iva_pymes_dev_04_8" model="account.tax.code.template">
3946+ <field name="mod340" eval="True"/>
3947+ </record>
3948+
3949+ <record id="l10n_es.iva_pymes_dev_04_10" model="account.tax.code.template">
3950+ <field name="mod340" eval="True"/>
3951+ </record>
3952+
3953+ <record id="l10n_es.iva_pymes_dev_07" model="account.tax.code.template">
3954+ <field name="mod340" eval="True"/>
3955+ </record>
3956+
3957+ <record id="l10n_es.iva_pymes_dev_07_18" model="account.tax.code.template">
3958+ <field name="mod340" eval="True"/>
3959+ </record>
3960+
3961+ <record id="l10n_es.iva_pymes_dev_07_21" model="account.tax.code.template">
3962+ <field name="mod340" eval="True"/>
3963+ </record>
3964+ <!-- ADQUISICIONES INTRACOMUNITARIAS -->
3965+ <record id="l10n_es.iva_pymes_dev_19" model="account.tax.code.template">
3966+ <field name="mod340" eval="True"/>
3967+ </record>
3968+ <!--IVA DEDUCIBLE -->
3969+ <record id="l10n_es.iva_pymes_ded_base_total" model="account.tax.code.template">
3970+ <field name="mod340" eval="True"/>
3971+ </record>
3972+ <!-- Base en OPERACIONES INTERIORES CORRIENTES-->
3973+ <record id="l10n_es.iva_pymes_ded_22" model="account.tax.code.template">
3974+ <field name="mod340" eval="True"/>
3975+ </record>
3976+
3977+ <record id="l10n_es.iva_pymes_ded_22_4" model="account.tax.code.template">
3978+ <field name="mod340" eval="True"/>
3979+ </record>
3980+
3981+ <record id="l10n_es.iva_pymes_ded_22_7" model="account.tax.code.template">
3982+ <field name="mod340" eval="True"/>
3983+ </record>
3984+
3985+ <record id="l10n_es.iva_pymes_ded_22_8" model="account.tax.code.template">
3986+ <field name="mod340" eval="True"/>
3987+ </record>
3988+
3989+ <record id="l10n_es.iva_pymes_ded_22_10" model="account.tax.code.template">
3990+ <field name="mod340" eval="True"/>
3991+ </record>
3992+
3993+ <record id="l10n_es.iva_pymes_ded_22_16" model="account.tax.code.template">
3994+ <field name="mod340" eval="True"/>
3995+ </record>
3996+
3997+ <record id="l10n_es.iva_pymes_ded_22_18" model="account.tax.code.template">
3998+ <field name="mod340" eval="True"/>
3999+ </record>
4000+
4001+ <record id="l10n_es.iva_pymes_ded_22_21" model="account.tax.code.template">
4002+ <field name="mod340" eval="True"/>
4003+ </record>
4004+ <!-- Base en OPERACIONES INTERIORES CON BIENES DE INVERSIÓN-->
4005+ <record id="l10n_es.iva_pymes_ded_24" model="account.tax.code.template">
4006+ <field name="mod340" eval="True"/>
4007+ </record>
4008+
4009+ <record id="l10n_es.iva_pymes_ded_24_4" model="account.tax.code.template">
4010+ <field name="mod340" eval="True"/>
4011+ </record>
4012+
4013+ <record id="l10n_es.iva_pymes_ded_24_7" model="account.tax.code.template">
4014+ <field name="mod340" eval="True"/>
4015+ </record>
4016+
4017+ <record id="l10n_es.iva_pymes_ded_24_8" model="account.tax.code.template">
4018+ <field name="mod340" eval="True"/>
4019+ </record>
4020+
4021+ <record id="l10n_es.iva_pymes_ded_24_10" model="account.tax.code.template">
4022+ <field name="mod340" eval="True"/>
4023+ </record>
4024+
4025+ <record id="l10n_es.iva_pymes_ded_24_16" model="account.tax.code.template">
4026+ <field name="mod340" eval="True"/>
4027+ </record>
4028+
4029+ <record id="l10n_es.iva_pymes_ded_24_18" model="account.tax.code.template">
4030+ <field name="mod340" eval="True"/>
4031+ </record>
4032+
4033+ <record id="l10n_es.iva_pymes_ded_24_21" model="account.tax.code.template">
4034+ <field name="mod340" eval="True"/>
4035+ </record>
4036+ <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES CORRIENTES-->
4037+ <record id="l10n_es.iva_pymes_ded_30" model="account.tax.code.template">
4038+ <field name="mod340" eval="True"/>
4039+ </record>
4040+
4041+ <record id="l10n_es.iva_pymes_ded_30_4" model="account.tax.code.template">
4042+ <field name="mod340" eval="True"/>
4043+ </record>
4044+
4045+ <record id="l10n_es.iva_pymes_ded_30_7" model="account.tax.code.template">
4046+ <field name="mod340" eval="True"/>
4047+ </record>
4048+
4049+ <record id="l10n_es.iva_pymes_ded_30_8" model="account.tax.code.template">
4050+ <field name="mod340" eval="True"/>
4051+ </record>
4052+
4053+ <record id="l10n_es.iva_pymes_ded_30_10" model="account.tax.code.template">
4054+ <field name="mod340" eval="True"/>
4055+ </record>
4056+
4057+ <record id="l10n_es.iva_pymes_ded_30_16" model="account.tax.code.template">
4058+ <field name="mod340" eval="True"/>
4059+ </record>
4060+
4061+ <record id="l10n_es.iva_pymes_ded_30_18" model="account.tax.code.template">
4062+ <field name="mod340" eval="True"/>
4063+ </record>
4064+
4065+ <record id="l10n_es.iva_pymes_ded_30_21" model="account.tax.code.template">
4066+ <field name="mod340" eval="True"/>
4067+ </record>
4068+ <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES DE INVERSIÓN-->
4069+ <record id="l10n_es.iva_pymes_ded_32" model="account.tax.code.template">
4070+ <field name="mod340" eval="True"/>
4071+ </record>
4072+
4073+ <record id="l10n_es.iva_pymes_ded_32_4" model="account.tax.code.template">
4074+ <field name="mod340" eval="True"/>
4075+ </record>
4076+
4077+ <record id="l10n_es.iva_pymes_ded_32_7" model="account.tax.code.template">
4078+ <field name="mod340" eval="True"/>
4079+ </record>
4080+
4081+ <record id="l10n_es.iva_pymes_ded_32_8" model="account.tax.code.template">
4082+ <field name="mod340" eval="True"/>
4083+ </record>
4084+
4085+ <record id="l10n_es.iva_pymes_ded_32_10" model="account.tax.code.template">
4086+ <field name="mod340" eval="True"/>
4087+ </record>
4088+
4089+ <record id="l10n_es.iva_pymes_ded_32_16" model="account.tax.code.template">
4090+ <field name="mod340" eval="True"/>
4091+ </record>
4092+
4093+ <record id="l10n_es.iva_pymes_ded_32_18" model="account.tax.code.template">
4094+ <field name="mod340" eval="True"/>
4095+ </record>
4096+
4097+ <record id="l10n_es.iva_pymes_ded_32_21" model="account.tax.code.template">
4098+ <field name="mod340" eval="True"/>
4099+ </record>
4100+ <!--Otros Códigos de Impuestos-->
4101+ <record id="l10n_es.base_intra_42" model="account.tax.code.template">
4102+ <field name="mod340" eval="True"/>
4103+ </record>
4104+
4105+ <record id="l10n_es.base_extra_44" model="account.tax.code.template">
4106+ <field name="mod340" eval="True"/>
4107+ </record>
4108+ </data>
4109+</openerp>
4110\ No newline at end of file
4111
4112=== modified file 'l10n_es_aeat_mod340/wizard/calculate_mod340_records.py'
4113--- l10n_es_aeat_mod340/wizard/calculate_mod340_records.py 2012-09-26 18:05:45 +0000
4114+++ l10n_es_aeat_mod340/wizard/calculate_mod340_records.py 2014-02-03 11:19:23 +0000
4115@@ -2,12 +2,12 @@
4116 ##############################################################################
4117 #
4118 # Copyright (C) 2011 Ting. All Rights Reserved
4119-# Copyright (c) 2011 Acysos S.L. (http://acysos.com) All Rights Reserved
4120+# Copyright (c) 2011-2013 Acysos S.L.(http://acysos.com) All Rights Reserved
4121 # Ignacio Ibeas Izquierdo <ignacio@acysos.com>
4122 #
4123 # This program is free software: you can redistribute it and/or modify
4124-# it under the terms of the GNU Affero General Public License as published by
4125-# the Free Software Foundation, either version 3 of the License, or
4126+# it under the terms of the GNU Affero General Public License as published
4127+# by the Free Software Foundation, either version 3 of the License, or
4128 # (at your option) any later version.
4129 #
4130 # This program is distributed in the hope that it will be useful,
4131@@ -39,7 +39,8 @@
4132
4133 self._calculate_records(cr, uid, ids, context, recalculate=False)
4134 wf_service = netsvc.LocalService("workflow")
4135- wf_service.trg_validate(uid, 'l10n.es.aeat.mod340', ids and ids[0], 'calculate', cr)
4136+ wf_service.trg_validate(uid, 'l10n.es.aeat.mod340', ids and ids[0],
4137+ 'calculate', cr)
4138
4139
4140
4141@@ -53,6 +54,7 @@
4142
4143 invoices340 = self.pool.get('l10n.es.aeat.mod340.issued')
4144 invoices340_rec = self.pool.get('l10n.es.aeat.mod340.received')
4145+ period_obj = self.pool.get('account.period')
4146
4147 mod340.write({
4148 'state' : 'calculated',
4149@@ -60,35 +62,23 @@
4150 })
4151
4152 if not mod340.company_id.partner_id.vat:
4153- raise osv.except_osv(mod340.company_id.partner_id.name, _('This company dont have NIF'))
4154+ raise osv.except_osv(mod340.company_id.partner_id.name,
4155+ _('This company dont have NIF'))
4156
4157 wf_service = netsvc.LocalService("workflow")
4158- wf_service.trg_validate(uid, 'l10n.es.aeat.mod347.report', ids and ids[0], 'calculate', cr)
4159-
4160- fecha_ini = False
4161- fecha_fin = False
4162-
4163- dec_year =mod340.fiscalyear_id.date_start.split('-')[0]
4164-
4165- mod = mod340.period
4166-
4167- if mod >= '01' and mod <= '12':
4168- fecha_ini = datetime.strptime('%s-%s-01' % (dec_year, mod), '%Y-%m-%d')
4169- fecha_fin = fecha_ini + relativedelta(months=+1, days=-1)
4170-
4171- if mod in ('1T', '2T', '3T', '4T'):
4172- month = ( ( int(mod[0])-1 ) * 3 ) + 1
4173- fecha_ini = datetime.strptime('%s-%s-01' % (dec_year, month), '%Y-%m-%d')
4174- fecha_fin = fecha_ini + relativedelta(months=+3, days=-1)
4175- mod = '%02d' % month
4176-
4177- code = '340'+dec_year+''+mod+'0001'
4178-
4179- account_period_id = self.pool.get('account.period').search(cr,uid,[('date_start','=',fecha_ini),('date_stop','=',fecha_fin)])
4180-
4181- if not account_period_id:
4182- raise osv.except_osv(_('El periodo seleccionado no coincide con los periodos del año fiscal:'), dec_year)
4183-
4184+ wf_service.trg_validate(uid, 'l10n.es.aeat.mod347.report',
4185+ ids and ids[0], 'calculate', cr)
4186+
4187+ code = '340'+mod340.fiscalyear_id.code+''
4188+ code += mod340.period_to.date_stop[5:7]+'0001'
4189+
4190+ account_period_ids = period_obj.build_ctx_periods(cr, uid,
4191+ mod340.period_from.id, mod340.period_to.id)
4192+
4193+ if len(account_period_ids) == 0:
4194+ raise osv.except_osv(_('Error'),
4195+ _("The periods selected don't belong to the fiscal year %s")
4196+ % (mod340.fiscalyear_id.name))
4197
4198 tot_base = 0
4199 tot_amount = 0
4200@@ -110,89 +100,103 @@
4201 if del_ids:
4202 invoices340_rec.unlink(cr, uid, del_ids, context=context)
4203
4204- domain = [('period_id', '=',account_period_id[0]),
4205+ domain = [('period_id', 'in',account_period_ids),
4206 ('state', 'in', ('open', 'paid'))]
4207-
4208- invoice_ids = self.pool.get('account.invoice').search(cr, uid, domain, context=context)
4209- for invoice in self.pool.get('account.invoice').browse(cr, uid, invoice_ids, context):
4210- if invoice.partner_id.vat_type == 1:
4211- if not invoice.partner_id.vat:
4212- raise osv.except_osv(_('La siguiente empresa no tiene asignado nif:'), invoice.partner_id.name)
4213-
4214- nif = invoice.partner_id.vat and re.match(r"([A-Z]{0,2})(.*)", invoice.partner_id.vat).groups()[1]
4215- country_code = invoice.address_invoice_id.country_id.code
4216-
4217- values = {
4218- 'mod340_id': mod340.id,
4219- 'partner_id':invoice.partner_id.id,
4220- 'partner_vat':nif,
4221- 'representative_vat': '',
4222- 'partner_country_code' : country_code,
4223- 'invoice_id':invoice.id,
4224- 'base_tax':invoice.amount_untaxed,
4225- 'amount_tax':invoice.amount_tax,
4226- 'total':invoice.amount_total
4227- }
4228- if invoice.type in ( 'out_refund','in_refund'):
4229- values['base_tax'] *=-1
4230- values['amount_tax'] *=-1
4231- values['total'] *=-1
4232-
4233-
4234- if invoice.type=="out_invoice" or invoice.type=="out_refund":
4235- invoice_created = invoices340.create(cr,uid,values)
4236-
4237- if invoice.type=="in_invoice" or invoice.type=="in_refund":
4238- invoice_created = invoices340_rec.create(cr,uid,values)
4239-
4240- tot_tax_invoice = 0
4241- check_tax=0
4242- check_base=0
4243-
4244- # Add the invoices detail to the partner record
4245+
4246+ invoice_obj=self.pool.get('account.invoice')
4247+ invoice_ids = invoice_obj.search(cr, uid,domain, context=context)
4248+ for invoice in invoice_obj.browse(cr, uid, invoice_ids, context):
4249+ include = False
4250 for tax_line in invoice.tax_line:
4251- if tax_line.name.find('IRPF') == -1: # Remove IRPF from Mod340
4252- tax_description = tax_line.name.split(' - ')
4253- if len(tax_description) == 2: name = tax_description[1]
4254- if len(tax_description) == 1: name = tax_description[0]
4255- account_tax = self.pool.get('account.tax').browse(cr, uid, self.pool.get('account.tax').search(cr, uid, [('name','=',name)], context=context))
4256- if account_tax[0].amount < 0:
4257- continue
4258-
4259- values = {
4260- 'name': name,
4261- 'tax_percentage': account_tax[0].amount,
4262- 'tax_amount': tax_line.tax_amount,
4263- 'base_amount': tax_line.base_amount,
4264- 'invoice_record_id': invoice_created,
4265- }
4266- if invoice.type=="out_invoice" or invoice.type=="out_refund":
4267- self.pool.get('l10n.es.aeat.mod340.tax_line_issued').create(cr, uid, values)
4268- if invoice.type=="in_invoice" or invoice.type=="in_refund":
4269- self.pool.get('l10n.es.aeat.mod340.tax_line_received').create(cr, uid, values)
4270- tot_tax_invoice += tax_line.tax_amount
4271- tot_rec += 1
4272- check_tax += tax_line.tax_amount
4273- check_base += tax_line.base_amount
4274-
4275- tot_base += invoice.amount_untaxed
4276- tot_amount += tot_tax_invoice
4277- tot_tot += invoice.amount_untaxed + tot_tax_invoice
4278-
4279- if invoice.type=="out_invoice" or invoice.type=="out_refund":
4280- invoices340.write(cr,uid,invoice_created,{'amount_tax':tot_tax_invoice})
4281- if invoice.type=="in_invoice" or invoice.type=="in_refund":
4282- invoices340_rec.write(cr,uid,invoice_created,{'amount_tax':tot_tax_invoice})
4283-
4284- sign=1
4285- if invoice.type in ( 'out_refund','in_refund' ):
4286- sign = -1
4287-
4288- if str(invoice.amount_untaxed*sign) != str(check_base):
4289- print "id:", invoice.id, "base: %.5f"%invoice.amount_untaxed , "taxlibe base: %.5f"%check_base, "number:",invoice.number
4290- 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) )
4291-
4292- mod340.write({'total_taxable':tot_base,'total_sharetax':tot_amount,'number_records':tot_rec,'total':tot_tot,'number':code})
4293+ if tax_line.base_code_id:
4294+ if tax_line.base_code_id.mod340 == True:
4295+ include = True
4296+ if include == True:
4297+ if invoice.partner_id.vat_type == 1:
4298+ if not invoice.partner_id.vat:
4299+ raise osv.except_osv(
4300+ _('La siguiente empresa no tiene asignado nif:'),
4301+ invoice.partner_id.name)
4302+
4303+ nif = invoice.partner_id.vat and re.match(r"([A-Z]{0,2})(.*)",
4304+ invoice.partner_id.vat).groups()[1]
4305+ country_code = invoice.partner_id.country_id.code
4306+
4307+ values = {
4308+ 'mod340_id': mod340.id,
4309+ 'partner_id':invoice.partner_id.id,
4310+ 'partner_vat':nif,
4311+ 'representative_vat': '',
4312+ 'partner_country_code' : country_code,
4313+ 'invoice_id':invoice.id,
4314+ 'base_tax':invoice.amount_untaxed,
4315+ 'amount_tax':invoice.amount_tax,
4316+ 'total':invoice.amount_total,
4317+ 'date_invoice':invoice.date_invoice,
4318+ }
4319+ if invoice.type in ( 'out_refund','in_refund'):
4320+ values['base_tax'] *=-1
4321+ values['amount_tax'] *=-1
4322+ values['total'] *=-1
4323+
4324+
4325+ if invoice.type=="out_invoice" or invoice.type=="out_refund":
4326+ invoice_created = invoices340.create(cr,uid,values)
4327+
4328+ if invoice.type=="in_invoice" or invoice.type=="in_refund":
4329+ invoice_created = invoices340_rec.create(cr,uid,values)
4330+
4331+ tot_tax_invoice = 0
4332+ check_tax=0
4333+ check_base=0
4334+
4335+ # Add the invoices detail to the partner record
4336+ for tax_line in invoice.tax_line:
4337+ if tax_line.base_code_id:
4338+ if tax_line.base_code_id.mod340 == True:
4339+ tax_percentage = tax_line.amount/tax_line.base
4340+
4341+ values = {
4342+ 'name': tax_line.name,
4343+ 'tax_percentage': tax_percentage,
4344+ 'tax_amount': tax_line.tax_amount,
4345+ 'base_amount': tax_line.base_amount,
4346+ 'invoice_record_id': invoice_created,
4347+ }
4348+ if invoice.type=="out_invoice" or invoice.type=="out_refund":
4349+ issued_obj = self.pool.get('l10n.es.aeat.mod340.tax_line_issued')
4350+ issued_obj.create(cr, uid, values)
4351+ if invoice.type=="in_invoice" or invoice.type=="in_refund":
4352+ received_obj=self.pool.get('l10n.es.aeat.mod340.tax_line_received')
4353+ received_obj.create(cr, uid, values)
4354+ tot_tax_invoice += tax_line.tax_amount
4355+ tot_rec += 1
4356+ check_tax += tax_line.tax_amount
4357+ if tax_percentage >= 0:
4358+ check_base += tax_line.base_amount
4359+
4360+ tot_base += invoice.amount_untaxed
4361+ tot_amount += tot_tax_invoice
4362+ tot_tot += invoice.amount_untaxed + tot_tax_invoice
4363+
4364+ if invoice.type=="out_invoice" or invoice.type=="out_refund":
4365+ invoices340.write(cr,uid,invoice_created,
4366+ {'amount_tax':tot_tax_invoice})
4367+ if invoice.type=="in_invoice" or invoice.type=="in_refund":
4368+ invoices340_rec.write(cr,uid,invoice_created,
4369+ {'amount_tax':tot_tax_invoice})
4370+
4371+ sign=1
4372+ if invoice.type in ( 'out_refund','in_refund' ):
4373+ sign = -1
4374+
4375+ if str(invoice.amount_untaxed*sign) != str(check_base):
4376+ raise osv.except_osv( "REVIEW INVOICE",
4377+ _('Invoice %s, Amount untaxed Lines %.2f do not correspond to AmountUntaxed on Invoice %.2f' )
4378+ %(invoice.number, check_base, invoice.amount_untaxed*sign) )
4379+
4380+ mod340.write({'total_taxable':tot_base,'total_sharetax':tot_amount,
4381+ 'number_records':tot_rec,'total':tot_tot,'number':code})
4382
4383 if recalculate:
4384 mod340.write({
4385@@ -212,10 +216,10 @@
4386 if context is None:
4387 context = {}
4388
4389- threaded_calculation = threading.Thread(target=self._calculate_records, args=(cr, uid, ids, context))
4390+ threaded_calculation = threading.Thread(target=self._calculate_records,
4391+ args=(cr, uid, ids, context))
4392 threaded_calculation.start()
4393
4394 return {}
4395
4396 l10n_es_aeat_mod340_calculate_records()
4397-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
4398
4399=== modified file 'l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py' (properties changed: -x to +x)
4400--- l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py 2013-11-22 23:44:11 +0000
4401+++ l10n_es_aeat_mod340/wizard/export_mod340_to_boe.py 2014-02-03 11:19:23 +0000
4402@@ -1,7 +1,7 @@
4403 # -*- coding: utf-8 -*-
4404 ##############################################################################
4405 #
4406-# Copyright (c) 2011 Acysos S.L. (http://acysos.com) All Rights Reserved.
4407+# Copyright (c) 2011-2013 Acysos S.L. (http://acysos.com) All Rights Reserved.
4408 # Ignacio Ibeas <ignacio@acysos.com>
4409 # Copyright (c) 2011 NaN Projectes de Programari Lliure, S.L.
4410 # http://www.NaN-tic.com
4411@@ -21,15 +21,14 @@
4412 #
4413 ##############################################################################
4414
4415+from datetime import datetime
4416+from openerp.tools.translate import _
4417+from openerp.osv import orm
4418 import base64
4419 import time
4420
4421-from osv import osv
4422-from tools.translate import _
4423-
4424-
4425-class l10n_es_aeat_mod340_export_to_boe(osv.osv_memory):
4426-
4427+
4428+class l10n_es_aeat_mod340_export_to_boe(orm.TransientModel):
4429 _inherit = "l10n.es.aeat.report.export_to_boe"
4430 _name = "l10n.es.aeat.mod340.export_to_boe"
4431 _description = "Export AEAT Model 340 to BOE format"
4432@@ -63,33 +62,71 @@
4433 416-500 Blancos
4434 """
4435 text = ''
4436-
4437- text += '1' # Tipo de Registro
4438- text += '340' # Modelo Declaración
4439- text += self._formatString(report.fiscalyear_id.code, 4) # Ejercicio
4440- text += self._formatString(report.company_vat, 9) # NIF del declarante
4441- text += self._formatString(report.company_id.name, 40) # Apellidos y nombre o razón social del declarante
4442- text += self._formatString(report.support_type, 1) # Tipo de soporte
4443- text += self._formatString(report.contact_phone, 9) # Persona de contacto (Teléfono)
4444- text += self._formatString(report.name_contact, 40) # Persona de contacto (Apellidos y nombre)
4445- text += self._formatNumber(report.number, 13) # Número identificativo de la declaración
4446- if (report.type == 'C'): text += 'C' # Declaración complementaria
4447- else: text += ' '
4448- if (report.type == 'S'): text += 'S' # Declaración substitutiva
4449- else: text += ' '
4450- text += self._formatNumber(report.previous_number, 13) # Número identificativo de la declaración anterior
4451- text += self._formatString(report.period,2) # Periodo
4452- text += self._formatNumber(report.number_records, 9) # Número total de registros
4453- text += self._formatNumber(report.total_taxable, 15, 2,True) # Importe total de la base imponible
4454- text += self._formatNumber(report.total_sharetax, 15, 2,True) # Importe Total de la cuota del impuesto
4455- text += self._formatNumber(report.total, 15, 2,True) # Importe total de las facturas
4456- text += 190*' ' # Blancos
4457- text += self._formatString(report.representative_vat, 9) # NIF del representante legal
4458- text += self._formatString(report.ean13, 17) # Sello electrónico
4459- text += 84*' ' # Blancos
4460+ # Tipo de Registro
4461+ text += '1'
4462+ # Modelo Declaración
4463+ text += '340'
4464+ # Ejercicio
4465+ text += self._formatString(report.fiscalyear_id.code, 4)
4466+ # NIF del declarante
4467+ text += self._formatString(report.company_vat, 9)
4468+ # Apellidos y nombre o razón social del declarante
4469+ text += self._formatString(report.company_id.name, 40)
4470+ # Tipo de soporte
4471+ text += self._formatString(report.support_type, 1)
4472+ # Persona de contacto (Teléfono)
4473+ text += self._formatString(report.contact_phone, 9)
4474+ # Persona de contacto (Apellidos y nombre)
4475+ text += self._formatString(report.name_contact, 40)
4476+ # Número identificativo de la declaración
4477+ text += self._formatNumber(report.number, 13)
4478+ # Declaración complementaria
4479+ if (report.type == 'C'): text += 'C'
4480+ else: text += ' '
4481+ # Declaración substitutiva
4482+ if (report.type == 'S'): text += 'S'
4483+ else: text += ' '
4484+ # Número identificativo de la declaración anterior
4485+ text += self._formatNumber(report.previous_number, 13)
4486+ period_stop = report.period_to.date_stop[5:7]
4487+ period_start = report.period_to.date_start[5:7]
4488+ if period_start == period_stop:
4489+ period = period_stop
4490+ else:
4491+ if period_stop == '03':
4492+ period = '1T'
4493+ elif period_stop == '06':
4494+ period = '2T'
4495+ elif period_stop == '09':
4496+ period = '3T'
4497+ elif period_stop == '12':
4498+ period = '4T'
4499+ else:
4500+ raise orm.except_orm( "ERROR",
4501+ _("The period hasn't a valid Mod340 period" ))
4502+ # Periodo
4503+ text += self._formatString(period,2)
4504+ # Número total de registros
4505+ text += self._formatNumber(report.number_records, 9)
4506+ # Importe total de la base imponible
4507+ text += self._formatNumber(report.total_taxable, 15, 2,True)
4508+ # Importe Total de la cuota del impuesto
4509+ text += self._formatNumber(report.total_sharetax, 15, 2,True)
4510+ # Importe total de las facturas
4511+ text += self._formatNumber(report.total, 15, 2,True)
4512+ # Blancos
4513+ text += 190*' '
4514+ # NIF del representante legal
4515+ text += self._formatString(report.representative_vat, 9)
4516+ # Sello electrónico
4517+ text += self._formatString(report.ean13, 17)
4518+ # Blancos
4519+ text += 84*' '
4520 text += '\r\n'
4521
4522- assert len(text) == 502, _("The type 1 record must be 500 characters long")
4523+ assert len(text)==502,_("The type 1 record must be 500 characters long")
4524+ print 'Declaration'
4525+ print text
4526 return text
4527
4528 def _get_formated_invoice_issued(self, cr, uid, report, invoice_issued):
4529@@ -105,15 +142,20 @@
4530 9-17 NIF del declarante
4531 18-26 NIF del declarado
4532 27-35 NIF del representante legal
4533- 36-75 Apellidos y nombre, razón social o denominación del declarado
4534+ 36-75 Apellidos y nombre, razón social o
4535+ denominación del declarado
4536 76-77 Código país
4537 78 Clave de identificación en el país de residencia
4538- 79-95 Número de identificación fiscal en el país de residencia. TODO de momento blancos.
4539+ 79-95 Número de identificación fiscal en el país de
4540+ residencia. TODO de momento blancos.
4541 96-98 Blancos
4542 99 Clave tipo de libro. Constante 'E'.
4543- 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.
4544+ 100 Clave de operación. Constante ' ' para un solo tipo de
4545+ IVA. Constante 'C' para varios tipos de IVA. TODO Resto
4546+ de operaciones. Varios tipos impositivos.
4547 101-108 Fecha de expedición
4548- 109-116 Fecha de operación. Se consigna la misma que expedición. TODO. Fecha del uso del bien.
4549+ 109-116 Fecha de operación. Se consigna la misma que
4550+ expedición. TODO. Fecha del uso del bien.
4551 117-121 Tipo impositivo
4552 122-135 Base imponible
4553 136-149 Cuota del impuesto
4554@@ -121,42 +163,60 @@
4555 164-177 Base imponible a coste. TODO de momento 0.
4556 178-217 Identificación de la factura
4557 218-235 Número de registro TODO No se exactamente que es
4558- 236-243 Número de facturas. Siempre 1. TODO Resumenes de facturas o tickets. Clave A o B.
4559- 244-245 Número de registro. Siempre 1. TODO Facturas con varios asientos. Clave C.
4560- 246-325 Intervalo de acumulación. Vacio. TODO Intervalo de resumenes de facturas o tickets.
4561+ 236-243 Número de facturas. Siempre 1. TODO Resumenes de
4562+ facturas o tickets. Clave A o B.
4563+ 244-245 Número de registro. Siempre 1. TODO Facturas con varios
4564+ asientos. Clave C.
4565+ 246-325 Intervalo de acumulación. Vacio. TODO Intervalo de
4566+ resumenes de facturas o tickets.
4567 326-365 Identificación de la factura rectificativa. TODO.
4568 366-370 Tipo recargo de equivalencia. TODO.
4569 371-384 Cuota recargo de equivalencia. TODO.
4570- 385 Situación del Inmueble #TODO 2012
4571- 386-410 Referencia Catastral #TODO 2012
4572- 411-425 Importe Percibido en Metálico #TODO 2012
4573- 426-429 Ejercicio ( cifras del ejercicio en el que se hubieran declarado las operaciones que dan origen al cobro ) #TODO 2012
4574- 430-444 Importe percibido por transmisiones de Inmuebles sujetas a IVA. #TODO 2012
4575+ 385 Situación del Inmueble #TODO
4576+ 386-410 Referencia Catastral #TODO
4577+ 411-425 Importe Percibido en Metálico #TODO
4578+ 426-429 Ejercicio (cifras del ejercicio en el que se hubieran
4579+ declarado las operaciones que dan origen al cobro)
4580+ #TODO
4581+ 430-444 Importe percibido por transmisiones de Inmuebles
4582+ sujetas a IVA. #TODO
4583 445-500 BLANCOS
4584
4585
4586 """
4587 text = ''
4588 for tax_line in invoice_issued.tax_line_ids:
4589-
4590- text += '2' # Tipo de Registro
4591- text += '340' # Modelo Declaración
4592- text += self._formatString(report.fiscalyear_id.code, 4) # Ejercicio
4593- text += self._formatString(report.company_vat, 9) # NIF del declarante
4594- if invoice_issued.partner_country_code == 'ES': text += self._formatString(invoice_issued.partner_vat, 9) # NIF del declarado
4595- else: text += self._formatString(' ', 9)
4596- text += self._formatString(invoice_issued.representative_vat, 9) # NIF del representante legal
4597- text += self._formatString(invoice_issued.partner_id.name, 40) # Apellidos y nombre, razón social o denominación del declarado
4598- text += self._formatString(invoice_issued.partner_country_code, 2) # Código país
4599- text += self._formatNumber(invoice_issued.partner_id.vat_type, 1) # Clave de identificación en el país de residencia
4600- if invoice_issued.partner_country_code != 'ES': # Número de identificación fiscal en el país de residencia.
4601- text += self._formatString(invoice_issued.partner_country_code, 2)
4602- text += self._formatString(invoice_issued.partner_vat, 15)
4603+ # Tipo de Registro
4604+ text += '2'
4605+ # Modelo Declaración
4606+ text += '340'
4607+ # Ejercicio
4608+ text += self._formatString(report.fiscalyear_id.code, 4)
4609+ # NIF del declarante
4610+ text += self._formatString(report.company_vat, 9)
4611+ # NIF del declarado
4612+ if invoice_issued.partner_country_code == 'ES':
4613+ text += self._formatString(invoice_issued.partner_vat, 9)
4614+ else: text += self._formatString(' ', 9)
4615+ # NIF del representante legal
4616+ text += self._formatString(invoice_issued.representative_vat, 9)
4617+ # Apellidos y nombre, razón social o denominación del declarado
4618+ text += self._formatString(invoice_issued.partner_id.name, 40)
4619+ # Código país
4620+ text += self._formatString(invoice_issued.partner_country_code, 2)
4621+ # Clave de identificación en el país de residencia
4622+ text += self._formatNumber(invoice_issued.partner_id.vat_type, 1)
4623+ # Número de identificación fiscal en el país de residencia.
4624+ if invoice_issued.partner_country_code != 'ES':
4625+ text+=self._formatString(invoice_issued.partner_country_code,2)
4626+ text+=self._formatString(invoice_issued.partner_vat, 15)
4627 else: text += 17*' '
4628- text += 3*' ' # Blancos
4629- text += 'E' # Clave tipo de libro. Constante 'E'.
4630-
4631- if invoice_issued.invoice_id.origin_invoices_ids: # Clave de operación
4632+ # Blancos
4633+ text += 3*' '
4634+ # Clave tipo de libro. Constante 'E'.
4635+ text += 'E'
4636+ # Clave de operación
4637+ if invoice_issued.invoice_id.origin_invoices_ids:
4638 text +='D'
4639 elif len(invoice_issued.tax_line_ids) > 1: text += 'C'
4640 elif invoice_issued.invoice_id.is_ticket_summary == 1: text += 'B'
4641@@ -164,27 +224,38 @@
4642
4643 text += self._formatNumber(invoice_issued.invoice_id.date_invoice.split('-')[0],4)
4644 text += self._formatNumber(invoice_issued.invoice_id.date_invoice.split('-')[1],2)
4645- text += self._formatNumber(invoice_issued.invoice_id.date_invoice.split('-')[2],2) # Fecha de expedición
4646+ text += self._formatNumber(invoice_issued.invoice_id.date_invoice.split('-')[2],2)
4647 text += self._formatNumber(invoice_issued.invoice_id.date_invoice.split('-')[0],4)
4648 text += self._formatNumber(invoice_issued.invoice_id.date_invoice.split('-')[1],2)
4649- text += self._formatNumber(invoice_issued.invoice_id.date_invoice.split('-')[2],2) # Fecha de operación
4650-
4651- text += self._formatNumber(tax_line.tax_percentage*100,3,2) #Tipo impositivo
4652- text += self._formatNumber(tax_line.base_amount, 11,2,True) # Base imponible
4653- text += self._formatNumber(tax_line.tax_amount, 11,2,True) # Cuota del impuesto
4654- text += self._formatNumber(tax_line.tax_amount+tax_line.base_amount, 11,2,True) # Importe total de la factura
4655- text += ' '+self._formatNumber(0, 11,2) # Base imponible a coste.
4656- text += self._formatString(invoice_issued.invoice_id.number, 40) # Identificación de la factura
4657- text += self._formatString(self.pool.get('ir.sequence').get(cr, uid, 'mod340'),18) # Número de registro
4658- if invoice_issued.invoice_id.is_ticket_summary == 1: # Número de facturas
4659+ text += self._formatNumber(invoice_issued.invoice_id.date_invoice.split('-')[2],2)
4660+ #Tipo impositivo
4661+ text += self._formatNumber(tax_line.tax_percentage*100,3,2)
4662+ # Base imponible
4663+ text += self._formatNumber(tax_line.base_amount, 11,2,True)
4664+ # Cuota del impuesto
4665+ text += self._formatNumber(tax_line.tax_amount, 11,2,True)
4666+ # Importe total de la factura
4667+ text += self._formatNumber(tax_line.tax_amount+
4668+ tax_line.base_amount, 11,2,True)
4669+ # Base imponible a coste.
4670+ text += ' '+self._formatNumber(0, 11,2)
4671+ # Identificación de la factura
4672+ text += self._formatString(invoice_issued.invoice_id.number, 40)
4673+ # Número de registro
4674+ text += self._formatString(self.pool.get('ir.sequence').get(cr, uid, 'mod340'),18)
4675+ # Número de facturas
4676+ if invoice_issued.invoice_id.is_ticket_summary == 1:
4677 text += self._formatNumber(invoice_issued.invoice_id.number_tickets, 8)
4678 else: text += self._formatNumber(1, 8)
4679- text += self._formatNumber(len(invoice_issued.tax_line_ids), 2) # Número de registros (Desglose)
4680- if invoice_issued.invoice_id.is_ticket_summary == 1: # Intervalo de identificación de la acumulación
4681+ # Número de registros (Desglose)
4682+ text += self._formatNumber(len(invoice_issued.tax_line_ids), 2)
4683+ # Intervalo de identificación de la acumulación
4684+ if invoice_issued.invoice_id.is_ticket_summary == 1:
4685 text += self._formatString(invoice_issued.invoice_id.first_ticket, 40)
4686 text += self._formatString(invoice_issued.invoice_id.last_ticket, 40)
4687 else: text += 80*' '
4688- text += self._formatString( ",".join( [x.number for x in invoice_issued.invoice_id.origin_invoices_ids]) , 40 ) # Identificación factura rectificativa
4689+ # Identificación factura rectificativa
4690+ text += self._formatString( ",".join( [x.number for x in invoice_issued.invoice_id.origin_invoices_ids]) , 40 )
4691 text += self._formatNumber(0, 5) # Tipo Recargo de equivalencia
4692 text += ' '+self._formatNumber(0, 11,2) # Couta del recargo de equivalencia
4693 text += '0' #Situación del Inmueble #TODO 2012
4694@@ -254,9 +325,7 @@
4695 text += 3*' ' # Blancos
4696 text += 'R' # Clave tipo de libro. Constante 'E'.
4697
4698- if invoice_received.invoice_id.operation_key == 'I':
4699- text +='I'
4700- elif len(invoice_received.tax_line_ids) > 1: text += 'C' # Clave de operación
4701+ if len(invoice_received.tax_line_ids) > 1: text += 'C' # Clave de operación
4702 else: text += ' '
4703
4704 text += self._formatNumber(invoice_received.invoice_id.date_invoice.split('-')[0],4)
4705@@ -291,38 +360,7 @@
4706
4707 for invoice_received in report.received:
4708 file_contents += self._get_formated_invoice_received(cr,uid,report, invoice_received)
4709-
4710+ print 'Other'
4711+ print file_contents
4712 return file_contents
4713-
4714-
4715- def _export_boe_file(self, cr, uid, ids, report, model=None, context=None):
4716- """
4717- Action that exports the data into a BOE formated text file
4718- """
4719- if context is None:
4720- context = {}
4721-
4722- file_contents = ''
4723-
4724- ##
4725- ## Add header record
4726- file_contents += self._get_formated_declaration_record(report)
4727-
4728- ##
4729- ## Adds other fields
4730- file_contents += self._get_formated_other_records(cr,uid,report)
4731-
4732- ##
4733- ## Generate the file and save as attachment
4734- file = base64.encodestring(file_contents)
4735-
4736- file_name = _("340_report_%s.txt") % (time.strftime(_("%Y-%m-%d")))
4737- self.pool.get("ir.attachment").create(cr, uid, {
4738- "name" : file_name,
4739- "datas" : file,
4740- "datas_fname" : file_name,
4741- "res_model" : "l10n.es.aeat.mod340",
4742- "res_id" : ids and ids[0]
4743- }, context=context)
4744-
4745-l10n_es_aeat_mod340_export_to_boe()
4746+
4747
4748=== added file 'l10n_es_aeat_mod340/wizard/export_mod340_to_boe.xml'
4749--- l10n_es_aeat_mod340/wizard/export_mod340_to_boe.xml 1970-01-01 00:00:00 +0000
4750+++ l10n_es_aeat_mod340/wizard/export_mod340_to_boe.xml 2014-02-03 11:19:23 +0000
4751@@ -0,0 +1,18 @@
4752+<?xml version="1.0" encoding="utf-8"?>
4753+<openerp>
4754+ <data>
4755+ <record model="ir.actions.act_window" id="action_wizard_aeat_mod340_export">
4756+ <field name="name">Export AEAT 340 BOE file</field>
4757+ <field name="type">ir.actions.act_window</field>
4758+ <field name="res_model">l10n.es.aeat.mod340.export_to_boe</field>
4759+ <field name="view_type">form</field>
4760+ <field name="view_mode">form</field>
4761+ <field name="target">new</field>
4762+ </record>
4763+ <record model="ir.actions.act_window.view" id="action_wizard_aeat_mod340_export_form">
4764+ <field name="act_window_id" ref="action_wizard_aeat_mod340_export"/>
4765+ <field name="view_mode">form</field>
4766+ <field name="view_id" ref="l10n_es_aeat.wizard_aeat_export"/>
4767+ </record>
4768+ </data>
4769+</openerp>
4770
4771=== added directory 'l10n_es_aeat_mod340_type0'
4772=== added file 'l10n_es_aeat_mod340_type0/__init__.py'
4773--- l10n_es_aeat_mod340_type0/__init__.py 1970-01-01 00:00:00 +0000
4774+++ l10n_es_aeat_mod340_type0/__init__.py 2014-02-03 11:19:23 +0000
4775@@ -0,0 +1,27 @@
4776+# -*- coding: utf-8 -*-
4777+##############################################################################
4778+#
4779+# OpenERP, Open Source Management Solution
4780+# Copyright (c) 2013 Acysos S.L. (http://acysos.com) All Rights Reserved
4781+# Ignacio Ibeas Izquierdo <ignacio@acysos.com>
4782+#
4783+# $Id$
4784+#
4785+# This program is free software: you can redistribute it and/or modify
4786+# it under the terms of the GNU Affero General Public License as published by
4787+# the Free Software Foundation, either version 3 of the License, or
4788+# (at your option) any later version.
4789+#
4790+# This program is distributed in the hope that it will be useful,
4791+# but WITHOUT ANY WARRANTY; without even the implied warranty of
4792+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4793+# GNU Affero General Public License for more details.
4794+#
4795+# You should have received a copy of the GNU Affero General Public License
4796+# along with this program. If not, see <http://www.gnu.org/licenses/>.
4797+#
4798+##############################################################################
4799+
4800+import wizard
4801+import mod340
4802+
4803
4804=== added file 'l10n_es_aeat_mod340_type0/__openerp__.py'
4805--- l10n_es_aeat_mod340_type0/__openerp__.py 1970-01-01 00:00:00 +0000
4806+++ l10n_es_aeat_mod340_type0/__openerp__.py 2014-02-03 11:19:23 +0000
4807@@ -0,0 +1,45 @@
4808+# -*- coding: utf-8 -*-
4809+##############################################################################
4810+#
4811+# OpenERP, Open Source Management Solution
4812+# Copyright (c) 2011 Ting (http://www.ting.es) All Rights Reserved.
4813+# Copyright (c) 2011-2013 Acysos S.L. (http://acysos.com) All Rights Reserved
4814+# Ignacio Ibeas Izquierdo <ignacio@acysos.com>
4815+# $Id$
4816+#
4817+# This program is free software: you can redistribute it and/or modify
4818+# it under the terms of the GNU Affero General Public License as published by
4819+# the Free Software Foundation, either version 3 of the License, or
4820+# (at your option) any later version.
4821+#
4822+# This program is distributed in the hope that it will be useful,
4823+# but WITHOUT ANY WARRANTY; without even the implied warranty of
4824+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4825+# GNU Affero General Public License for more details.
4826+#
4827+# You should have received a copy of the GNU Affero General Public License
4828+# along with this program. If not, see <http://www.gnu.org/licenses/>.
4829+#
4830+##############################################################################
4831+
4832+{
4833+ 'name' : 'Generación de fichero modelo 340. Registro tipo 0',
4834+ 'version' : '1.0',
4835+ 'author' : 'Acysos S.L.',
4836+ 'website' : 'www.acysos.com',
4837+ 'category' : 'Localisation/Accounting',
4838+ 'description' : '''
4839+ Exporta el registro de tipo 0 del Modelo 340.
4840+ Actualmente solo obligatorio para la Comunidad Foral de Navarra.
4841+ ''',
4842+ 'license' : 'AGPL-3',
4843+ 'depends' : ['l10n_es_aeat_mod340',
4844+ 'city',
4845+ ],
4846+ 'init_xml' : [],
4847+ 'demo_xml' : [],
4848+ 'update_xml' : [
4849+ 'mod340_view.xml'],
4850+ 'installable' : True,
4851+ 'active' : False,
4852+}
4853
4854=== added directory 'l10n_es_aeat_mod340_type0/i18n'
4855=== added file 'l10n_es_aeat_mod340_type0/i18n/es.po'
4856--- l10n_es_aeat_mod340_type0/i18n/es.po 1970-01-01 00:00:00 +0000
4857+++ l10n_es_aeat_mod340_type0/i18n/es.po 2014-02-03 11:19:23 +0000
4858@@ -0,0 +1,124 @@
4859+# Translation of OpenERP Server.
4860+# This file contains the translation of the following modules:
4861+# * l10n_es_aeat_mod340_type0
4862+#
4863+msgid ""
4864+msgstr ""
4865+"Project-Id-Version: OpenERP Server 6.0.3\n"
4866+"Report-Msgid-Bugs-To: support@openerp.com\n"
4867+"POT-Creation-Date: 2013-05-17 16:32+0000\n"
4868+"PO-Revision-Date: 2013-05-17 16:32+0000\n"
4869+"Last-Translator: <>\n"
4870+"Language-Team: \n"
4871+"MIME-Version: 1.0\n"
4872+"Content-Type: text/plain; charset=UTF-8\n"
4873+"Content-Transfer-Encoding: \n"
4874+"Plural-Forms: \n"
4875+
4876+#. module: l10n_es_aeat_mod340_type0
4877+#: view:l10n.es.aeat.mod340:0
4878+msgid "Presenter"
4879+msgstr "Presentador"
4880+
4881+#. module: l10n_es_aeat_mod340_type0
4882+#: model:ir.model,name:l10n_es_aeat_mod340_type0.model_l10n_es_aeat_mod340_export_to_boe
4883+msgid "Export AEAT Model 340 to BOE format"
4884+msgstr "Exportar Modelo AEAT 340 al formato del BOE"
4885+
4886+#. module: l10n_es_aeat_mod340_type0
4887+#: code:addons/l10n_es_aeat_mod340_type0/wizard/export_mod340_to_boe.py:121
4888+#, python-format
4889+msgid "340_report_%s.txt"
4890+msgstr "340_report_%s.txt"
4891+
4892+#. module: l10n_es_aeat_mod340_type0
4893+#: model:ir.model,name:l10n_es_aeat_mod340_type0.model_l10n_es_aeat_mod340
4894+msgid "Model 340"
4895+msgstr "Modelo 340"
4896+
4897+#. module: l10n_es_aeat_mod340_type0
4898+#: code:addons/l10n_es_aeat_mod340_type0/wizard/export_mod340_to_boe.py:121
4899+#, python-format
4900+msgid "%Y-%m-%d"
4901+msgstr "%Y-%m-%d"
4902+
4903+#. module: l10n_es_aeat_mod340_type0
4904+#: code:addons/l10n_es_aeat_mod340_type0/wizard/export_mod340_to_boe.py:92
4905+#, python-format
4906+msgid "The type 0 record must be 500 characters long"
4907+msgstr "El registro de tipo 0 debe tener 500 caracteres"
4908+
4909+#. module: l10n_es_aeat_mod340_type0
4910+#: view:l10n.es.aeat.mod340:0
4911+msgid "Address"
4912+msgstr "Dirección"
4913+
4914+#. module: l10n_es_aeat_mod340_type0
4915+#: view:l10n.es.aeat.mod340:0
4916+msgid "This information is only for the company that have to present registry type 0. For the moment, only in Comunidad Foral de Navarra"
4917+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."
4918+
4919+#. module: l10n_es_aeat_mod340
4920+#: field:l10n.es.aeat.mod340,presenter_address_stair:0
4921+msgid "Stair"
4922+msgstr "Escalera"
4923+
4924+#. module: l10n_es_aeat_mod340
4925+#: help:l10n.es.aeat.mod340,presenter_city_id:0
4926+msgid "Use the name or the zip to search the location"
4927+msgstr "Utilice el nombre o el código postal para buscar la localización"
4928+
4929+#. module: l10n_es_aeat_mod340
4930+#: field:l10n.es.aeat.mod340,presenter_phone_contact:0
4931+msgid "Phone Contact"
4932+msgstr "Teléfono de contacto"
4933+
4934+#. module: l10n_es_aeat_mod340
4935+#: field:l10n.es.aeat.mod340,presenter_address_acronym:0
4936+msgid "Address Acronym"
4937+msgstr "Siglas"
4938+
4939+#. module: l10n_es_aeat_mod340
4940+#: field:l10n.es.aeat.mod340,presenter_city_id:0
4941+msgid "Location"
4942+msgstr "Localización"
4943+
4944+#. module: l10n_es_aeat_mod340
4945+#: field:l10n.es.aeat.mod340,presenter_address_door:0
4946+msgid "Door"
4947+msgstr "Puerta"
4948+
4949+#. module: l10n_es_aeat_mod340
4950+#: field:l10n.es.aeat.mod340,presenter_vat:0
4951+msgid "VAT number"
4952+msgstr "CIF/NIF"
4953+
4954+#. module: l10n_es_aeat_mod340
4955+#: help:l10n.es.aeat.mod340,presenter_address_acronym:0
4956+msgid "Acronyms of the type of public roadway, example St."
4957+msgstr "Siglas de la vía pública, por ejemplo CL."
4958+
4959+#. module: l10n_es_aeat_mod340
4960+#: field:l10n.es.aeat.mod340,presenter_address_number:0
4961+msgid "Number"
4962+msgstr "Nº"
4963+
4964+#. module: l10n_es_aeat_mod340
4965+#: field:l10n.es.aeat.mod340,presenter_address_floor:0
4966+msgid "Floor"
4967+msgstr "Piso"
4968+
4969+#. module: l10n_es_aeat_mod340
4970+#: field:l10n.es.aeat.mod340,presenter_name_contact:0
4971+msgid "Name And Surname Contact"
4972+msgstr "Nombre y apellido de contacto"
4973+
4974+#. module: l10n_es_aeat_mod340
4975+#: field:l10n.es.aeat.mod340,presenter_name:0
4976+msgid "Name And Surname"
4977+msgstr "Nombre y apellido"
4978+
4979+#. module: l10n_es_aeat_mod340
4980+#: field:l10n.es.aeat.mod340,presenter_address_name:0
4981+msgid "Street Name"
4982+msgstr "Calle"
4983
4984=== added file 'l10n_es_aeat_mod340_type0/i18n/l10n_es_aeat_mod340_type0.pot'
4985--- l10n_es_aeat_mod340_type0/i18n/l10n_es_aeat_mod340_type0.pot 1970-01-01 00:00:00 +0000
4986+++ l10n_es_aeat_mod340_type0/i18n/l10n_es_aeat_mod340_type0.pot 2014-02-03 11:19:23 +0000
4987@@ -0,0 +1,124 @@
4988+# Translation of OpenERP Server.
4989+# This file contains the translation of the following modules:
4990+# * l10n_es_aeat_mod340_type0
4991+#
4992+msgid ""
4993+msgstr ""
4994+"Project-Id-Version: OpenERP Server 6.0.3\n"
4995+"Report-Msgid-Bugs-To: support@openerp.com\n"
4996+"POT-Creation-Date: 2013-05-17 16:31+0000\n"
4997+"PO-Revision-Date: 2013-05-17 16:31+0000\n"
4998+"Last-Translator: <>\n"
4999+"Language-Team: \n"
5000+"MIME-Version: 1.0\n"
The diff has been truncated for viewing.