Merge lp:~joaquing-pedrosa/openerp-spain/7.0-l10n_es_aeat_mod347 into lp:~openerp-spain-team/openerp-spain/7.0

[Joaquin Gutierrez]

Migracion del modelo 347 a OpenERP 7

[FIX]: Update view definitions to version 7.0.
[FIX]: Add security definition for objects l10n_es_aeat_mod347_calculate_records and l10n_es_aeat_mod347_export_to_boe.
[FIX]: Changed types to orm.Model, orm.TransientModel and orm.AbstractModel.
[FIX]: Contributions have been written in the standard format of the community.
[FIX]: Remove 'init_xml' keys, because it's no longer needed in v7.
[FIX]: Remove __author__ variables in files, because authors are put on manifest file (__openerp__.py).
[FIX]: Increased compatibility with standard PEP8.
[FIX]: Imports in standard format.
[IMP]: Add "state" field in tree view.
[IMP]: Option to generate report suppliers only.
[FIX]: Update address partner search to V7.
[FIX]: Update state in address partner to V7.
[FIX]: Update dependencies, now required the module documents to view generated file in V7.
[FIX]: Translate .pot file to v7.
[FIX]: Translate field "only_supplier" to spanish language.
[FIX]: Format the text that explains the module.
[IMP]: Add icon and screencapture.

[Joaquin Gutierrez (joaquing-pedrosa)]

Hola Pedro:

Al final he borrado todo, actualizado la rama de la localizacion y vuelto a meter el modulo. Me daba conflictos y hacia el merge y me los daba tambien en el modulo 347.

Tal y como indicabas en la revision anterior, he agregado el icono png transparente y el svg como icon_source.

Un saludo

[Pedro Manuel Baeza (pedro.baeza)]

Buenas, Joaquín,

Puesto que he actualizado el l10n_es_aeat con algunas mejoras, descargando los módulos "hijos" de la necesidad de ciertas cosas (workflow, botón, interfaz básico, etc), ¿puedes tú revisar este MP para adecuarlo a ello, o directamente me encargo yo?

Un saludo.

review: Needs Fixing

[Joaquin Gutierrez (joaquing-pedrosa)]

Hola Pedro:

Ok, este fin de semana lo miro y lo adapto. Un saludo

Enviado en movilidad x un cacharro con iOS

> El 31/01/2014, a las 01:07, Pedro Manuel Baeza <email address hidden> escribió:
>
> Review: Needs Fixing
>
> Buenas, Joaquín,
>
> Puesto que he actualizado el l10n_es_aeat con algunas mejoras, descargando los módulos "hijos" de la necesidad de ciertas cosas (workflow, botón, interfaz básico, etc), ¿puedes tú revisar este MP para adecuarlo a ello, o directamente me encargo yo?
>
> Un saludo.
> --
> https://code.launchpad.net/~joaquing-pedrosa/openerp-spain/7.0-l10n_es_aeat_mod347/+merge/200095
> You are the owner of lp:~joaquing-pedrosa/openerp-spain/7.0-l10n_es_aeat_mod347.

[Pedro Manuel Baeza (pedro.baeza)]

Lo incluyo para arreglarlo más tarde en una revisión.

review: Approve

=== modified file 'l10n_es_aeat_mod347/__init__.py' (properties changed: -x to +x)
--- l10n_es_aeat_mod347/__init__.py	2013-11-22 23:44:11 +0000
+++ l10n_es_aeat_mod347/__init__.py	2013-12-27 10:08:05 +0000
@@ -19,11 +19,10 @@
 #
 ##############################################################################
 
-__author__ = "Luis Manuel Angueira Blanco (Pexego)"
 
 import account_journal
 import res_partner
 import mod347
-
 import wizard
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_es_aeat_mod347/__openerp__.py' (properties changed: -x to +x)
--- l10n_es_aeat_mod347/__openerp__.py	2013-11-22 23:44:11 +0000
+++ l10n_es_aeat_mod347/__openerp__.py	2013-12-27 10:08:05 +0000
@@ -20,72 +20,78 @@
 ##############################################################################
 
 {
-    "name" : "AEAT Model 347",
-    "version" : "1.0",
-    "author" : "Pexego, ASR-OSS, NaN·tic, Acysos",
-    "license" : "AGPL-3",
-    "website" : "http://www.pexego.es, www.asr-oss.com, www.nan-tic.com, www.acysos.com",
-    "category" : "Localisation/Accounting",
-    "description" : """
-    Módulo para la presentación del Modelo AEAT 347 (Declaración Anual de Operaciones con Terceros)
+    'name': "AEAT Model 347",
+    'version': "1.0",
+    'author': "Pexego, ASR-OSS, NaN·tic, Acysos",
+    'website': "http://www.pexego.es, www.asr-oss.com, www.nan-tic.com, www.acysos.com",
+    'contributors': ['Pedro M. Baeza', 'Joaquín Gutierrez'],
+    'category': "Localisation/Accounting",
+    'description': """
+Presentación del Modelo AEAT 347 
+============================================
 
+(Declaración Anual de Operaciones con Terceros)
 Basado en la Orden EHA/3012/2008, de 20 de Octubre, por el que se aprueban los diseños físicos y lógicos del 347.
 
 De acuerdo con la normativa de la Hacienda Española, están obligados a presentar el modelo 347:
-    * Todas aquellas personas físicas o jurídicas que no esten acogidas al regimen
-        de módulos en el IRPF, de naturaleza pública o privada que desarrollen
-        actividades empresariales o profesionales, siempre y cuando hayan
-        realizado operaciones que, en su conjunto, respecto de otra persona
-        o Entidad, cualquiera que sea su naturaleza o carácter, hayan superado
-        la cifra de 3.005,06€ durante el año natural al que se refiere la
-        declaración. Para el cálculo de la cifra de 3.005,06 € se computan de
-        forma separada las entregas de biene y servicios y las adquisiciones
-        de los mismos.
-    * En el caso de Sociedades Irregulares, Sociedades Civiles y Comunidad de Bienes
-        no acogidas el regimen de módulos en el IRPF, deben incluir las facturas sin
-        incluir la cuantía del IRPF.
-    * En el caso de facturas de proveedor con IRPF, no deben ser presentadas en este
-        modelo. Se presentan en el modelo 190. Desactivar en la ficha del proveedor
-        la opción de "Incluir en el informe 347".
+-----------------------------------------------------------------------------------------------
+* Todas aquellas personas físicas o jurídicas que no esten acogidas al regimen de módulos en el IRPF,
+  de naturaleza pública o privada que desarrollen actividades empresariales o profesionales,
+  siempre y cuando hayan realizado operaciones que, en su conjunto, respecto de otra persona
+  o Entidad, cualquiera que sea su naturaleza o carácter, hayan superado la cifra de 3.005,06€ 
+  durante el año natural al que se refiere la declaración. Para el cálculo de la cifra de 3.005,06 €
+  se computan de forma separada las entregas de biene y servicios y las adquisiciones de los mismos.
+* En el caso de Sociedades Irregulares, Sociedades Civiles y Comunidad de Bienes
+  no acogidas el regimen de módulos en el IRPF, deben incluir las facturas sin
+  incluir la cuantía del IRPF.
+* En el caso de facturas de proveedor con IRPF, no deben ser presentadas en este
+  modelo. Se presentan en el modelo 190. Desactivar en la ficha del proveedor
+  la opción de "Incluir en el informe 347".
 
 De acuerdo con la normativa no están obligados a presentar el modelo 347:
-    * Quienes realicen en España actividades empresariales o profesionales sin
-        tener en territorio español la sede de su actividad, un establecimiento
-        permanente o su domicilio fiscal.
-    * Las personas físicas y entidades en régimen de atribución de rentas en
-        el IRPF, por las actividades que tributen en dicho impuesto por el
-        régimen de estimación objetiva y, simultáneamente, en el IVA por los
-        régimenes especiales simplificados o de la agricultura, ganadería
-        y pesca o recargo de equivalencia, salvo las operaciones que estén
-        excluidas de la aplicación de los expresados regímenes.
-    * Los obligados tributarios que no hayan realizado operaciones que en su
-        conjunto superen la cifra de 3.005,06€
-    * Los obligados tributarios que hayan realizado exclusivamente operaciones
-        no declarables.
-    * Los obligados tributarios que deban informar sobre las operaciones
-        incluidas en los libros registro de IVA (modelo 340) salvo que realicen
-        operaciones que expresamente deban incluirse en el modelo 347.
+-------------------------------------------------------------------------
+* Quienes realicen en España actividades empresariales o profesionales sin
+  tener en territorio español la sede de su actividad, un establecimiento
+  permanente o su domicilio fiscal.
+* Las personas físicas y entidades en régimen de atribución de rentas en
+  el IRPF, por las actividades que tributen en dicho impuesto por el
+  régimen de estimación objetiva y, simultáneamente, en el IVA por los
+  régimenes especiales simplificados o de la agricultura, ganadería
+  y pesca o recargo de equivalencia, salvo las operaciones que estén
+  excluidas de la aplicación de los expresados regímenes.
+* Los obligados tributarios que no hayan realizado operaciones que en su
+  conjunto superen la cifra de 3.005,06€
+* Los obligados tributarios que hayan realizado exclusivamente operaciones
+  no declarables.
+* Los obligados tributarios que deban informar sobre las operaciones
+  incluidas en los libros registro de IVA (modelo 340) salvo que realicen
+  operaciones que expresamente deban incluirse en el modelo 347.
 
 (http://www.boe.es/boe/dias/2008/10/23/pdfs/A42154-42190.pdf)
     """,
-    "init_xml" : [],
-    "depends" : [
-        "base_vat",
-        "l10n_es_aeat",
-        "account_invoice_currency",
-    ],
-    "update_xml" : [
-        "account_journal_view.xml",
-        "res_partner_view.xml",
-        "mod347_view.xml",
-        "mod347_workflow.xml",
-        "mod347_report.xml",
-        "security/ir.model.access.csv",
-        "security/mod_347_security.xml"
-    ],
-    "demo_xml" : [],
-    "test" : [],
-    "installable" : False,
-    "active" : False,
+    'license': "AGPL-3",
+    'init_xml': [],
+    'depends': [
+                "base_vat",
+                "l10n_es_aeat",
+                "account_invoice_currency",
+                "document",
+                ],
+    'data': [
+             "account_journal_view.xml",
+             "res_partner_view.xml",
+             "mod347_view.xml",
+             "mod347_workflow.xml",
+             "mod347_report.xml",
+             "security/ir.model.access.csv",
+             "security/mod_347_security.xml"
+             ],
+    'installable': True,
+    'active': False,
+    'images': [
+        'images/l10n_es_aeat_mod347.png',
+    ],
+
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_es_aeat_mod347/account_journal.py' (properties changed: -x to +x)
--- l10n_es_aeat_mod347/account_journal.py	2013-11-22 23:44:11 +0000
+++ l10n_es_aeat_mod347/account_journal.py	2013-12-27 10:08:05 +0000
@@ -19,27 +19,23 @@
 #
 ##############################################################################
 
-__author__ = "Luis Manuel Angueira Blanco (Pexego)"
-
-"""
-Extends the account journals to add fields used by the 347 report.
-"""
-
-from osv import osv, fields
-
-class account_journal(osv.osv):
-    """
-    Extends the account journals to add the cash_journal field.
-    """
+
+from openerp.osv import fields
+from openerp.osv import orm
+
+
+class account_journal(orm.Model):
     _inherit = 'account.journal'
-
     _columns = {
         'cash_journal': fields.boolean('Cash payments journal',
-            help="Payments of this journal will be considered as cash (used on the 347 report)"),
-    }
+            help="Payments of this journal will be considered as cash" \
+                 "(used on the 347 report)"),
+            }
 
     _defaults = {
-        'cash_journal': lambda *a : False
-    }
-    
+        'cash_journal': lambda *a: False
+        }
+
 account_journal()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_es_aeat_mod347/account_journal_view.xml' (properties changed: -x to +x)
--- l10n_es_aeat_mod347/account_journal_view.xml	2013-11-22 23:44:11 +0000
+++ l10n_es_aeat_mod347/account_journal_view.xml	2013-12-27 10:08:05 +0000
@@ -24,8 +24,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_account_period_form"/>
             <field name="arch" type="xml">
-                    <field name="date_stop" position="after">
-                      <field name="quarter"/>
+                    <field name="company_id" position="after">
+                    	<field name="quarter"/>
                     </field>
             </field>
         </record>
@@ -36,9 +36,9 @@
             <field name="type">tree</field>
             <field name="inherit_id" ref="account.view_account_period_tree"/>
             <field name="arch" type="xml">
-                    <field name="date_stop" position="after">
-                      <field name="quarter" />
-                    </field>                        
+                    <field name="company_id" position="after">
+                      	<field name="quarter" />
+                      </field>                        
             </field>
         </record>
 

=== modified file 'l10n_es_aeat_mod347/i18n/ca.po'
--- l10n_es_aeat_mod347/i18n/ca.po	2013-12-19 06:16:40 +0000
+++ l10n_es_aeat_mod347/i18n/ca.po	2013-12-27 10:08:05 +0000
@@ -7,15 +7,15 @@
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-03-20 17:21+0000\n"
-"PO-Revision-Date: 2013-12-10 16:44+0000\n"
+"PO-Revision-Date: 2013-10-12 00:00+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<[e-mail]>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-19 06:16+0000\n"
-"X-Generator: Launchpad (build 16872)\n"
+"X-Launchpad-Export-Date: 2013-10-14 05:33+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 
 #. module: l10n_es_aeat_mod347
 #: code:addons/l10n_es_aeat_mod347/wizard/export_mod347_to_boe.py:157
@@ -33,7 +33,7 @@
 #. module: l10n_es_aeat_mod347
 #: code:addons/l10n_es_aeat_mod347/mod347.py:142
 #, python-format
-msgid "All real estate records state code field must be filled."
+msgid "All real state records state code field must be filled."
 msgstr ""
 "El codi de província de tots els registres d'immobles han d'estar introduïts."
 
@@ -61,12 +61,12 @@
 #: field:l10n.es.aeat.mod347.partner_record,real_state_record_ids:0
 #: view:l10n.es.aeat.mod347.real_state_record:0
 #: field:l10n.es.aeat.mod347.report,real_state_record_ids:0
-msgid "Real Estate Records"
+msgid "Real State Records"
 msgstr "Registres d'immobles"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,fourth_quarter_real_state_transmission_amount:0
-msgid "Fourth Quarter Real Estate Transmossion Amount"
+msgid "Fourth Quarter Real State Transmossion Amount"
 msgstr "Import transmissió immoble (T4)"
 
 #. module: l10n_es_aeat_mod347
@@ -89,7 +89,7 @@
 #. module: l10n_es_aeat_mod347
 #: model:ir.model,name:l10n_es_aeat_mod347.model_l10n_es_aeat_mod347_real_state_record
 #: view:l10n.es.aeat.mod347.real_state_record:0
-msgid "Real Estate Record"
+msgid "Real State Record"
 msgstr "Registre d'immoble"
 
 #. module: l10n_es_aeat_mod347
@@ -123,7 +123,7 @@
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,total_real_state_amount:0
-msgid "Real Estate Amount"
+msgid "Real State Amount"
 msgstr "Import immobles"
 
 #. module: l10n_es_aeat_mod347
@@ -227,7 +227,7 @@
 #. module: l10n_es_aeat_mod347
 #: code:addons/l10n_es_aeat_mod347/wizard/export_mod347_to_boe.py:232
 #, python-format
-msgid "The type 2-I record (real estate) must be 502 characters long"
+msgid "The type 2-I record (real state) must be 502 characters long"
 msgstr ""
 "El tipus de registre 2-I (estat real) ha de ser de 502 caràcters de llargada"
 
@@ -244,7 +244,7 @@
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
-msgid "Real Estate records"
+msgid "Real State records"
 msgstr "Registres d'immobles"
 
 #. module: l10n_es_aeat_mod347
@@ -293,7 +293,7 @@
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,bussiness_real_state_rent:0
-msgid "Bussiness Real Estate Rent"
+msgid "Bussiness Real State Rent"
 msgstr "Arrendament local negoci"
 
 #. module: l10n_es_aeat_mod347
@@ -445,7 +445,7 @@
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,situation:0
-msgid "Real estate Situation"
+msgid "Real state Situation"
 msgstr "Situació d'immobles"
 
 #. module: l10n_es_aeat_mod347
@@ -496,12 +496,12 @@
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.partner_record:0
 #: view:l10n.es.aeat.mod347.real_state_record:0
-msgid "Real estate info"
+msgid "Real state info"
 msgstr "Informació Immobles"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,real_state_transmissions_amount:0
-msgid "Real Estate Transmisions amount"
+msgid "Real State Transmisions amount"
 msgstr "Import transmissió immoble"
 
 #. module: l10n_es_aeat_mod347
@@ -582,8 +582,8 @@
 #. module: l10n_es_aeat_mod347
 #: help:l10n.es.aeat.mod347.partner_record,bussiness_real_state_rent:0
 msgid ""
-"Set to identify real estate rent operations aside from the rest. You'll need "
-"to fill in the real estate info only when you are the one that receives the "
+"Set to identify real state rent operations aside from the rest. You'll need "
+"to fill in the real state info only when you are the one that receives the "
 "money."
 msgstr ""
 "(Només arrendadors i arrendataris de Locals de Negoci). Marcaran aquesta "
@@ -691,7 +691,7 @@
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,third_quarter_real_state_transmission_amount:0
-msgid "Third Quarter Real Estate Transmission Amount"
+msgid "Third Quarter Real State Transmission Amount"
 msgstr "Import transmissió immoble (T3)"
 
 #. module: l10n_es_aeat_mod347
@@ -747,7 +747,7 @@
 
 #. module: l10n_es_aeat_mod347
 #: report:report_l10n_es_aeat_mod347.report:0
-msgid "Real Estate Transmission (Q1|Q2|Q3|Q4)"
+msgid "Real State Transmission (Q1|Q2|Q3|Q4)"
 msgstr "Import transmissió immoble (T1|T2|T3|T4)"
 
 #. module: l10n_es_aeat_mod347
@@ -830,7 +830,7 @@
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.real_state_record:0
-msgid "Real estate address"
+msgid "Real state address"
 msgstr "Adreça de l'immoble"
 
 #. module: l10n_es_aeat_mod347
@@ -855,7 +855,7 @@
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,first_quarter_real_state_transmission_amount:0
-msgid "First Quarter Real Estate Transmission Amount"
+msgid "First Quarter Real State Transmission Amount"
 msgstr "Import transmissió immoble (T1)"
 
 #. module: l10n_es_aeat_mod347
@@ -870,7 +870,7 @@
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,second_quarter_real_state_transmission_amount:0
-msgid "Second Quarter Real Estate Transmission Amount"
+msgid "Second Quarter Real State Transmission Amount"
 msgstr "Import transmissió immoble (T2)"
 
 #. module: l10n_es_aeat_mod347
@@ -905,7 +905,7 @@
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,total_real_state_transmissions_amount:0
-msgid "Real Estate Transmissions Amount"
+msgid "Real State Transmissions Amount"
 msgstr "Import transmissió immoble"
 
 #. module: l10n_es_aeat_mod347
@@ -932,7 +932,7 @@
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,total_real_state_records:0
-msgid "Real estate records"
+msgid "Real state records"
 msgstr "Registres d'immobles"
 
 #. module: l10n_es_aeat_mod347
@@ -968,74 +968,3 @@
 #: model:ir.model,name:l10n_es_aeat_mod347.model_account_journal
 msgid "Journal"
 msgstr "Diari"
-
-#~ msgid "Real State Record"
-#~ msgstr "Registre d'immoble"
-
-#~ msgid "Real State Records"
-#~ msgstr "Registres d'immobles"
-
-#~ msgid "Real State records"
-#~ msgstr "Registres d'immobles"
-
-#~ msgid "Bussiness Real State Rent"
-#~ msgstr "Arrendament local negoci"
-
-#~ msgid "Real state info"
-#~ msgstr "Informació Immobles"
-
-#~ msgid "Real State Transmisions amount"
-#~ msgstr "Import transmissió immoble"
-
-#~ msgid ""
-#~ "Set to identify real state rent operations aside from the rest. You'll need "
-#~ "to fill in the real state info only when you are the one that receives the "
-#~ "money."
-#~ msgstr ""
-#~ "(Només arrendadors i arrendataris de Locals de Negoci). Marcaran aquesta "
-#~ "casella per identificar les operacions d'arrendament de locals de negoci, i "
-#~ "s'han de consignar separadament de la resta. A més a més els arrendadors han "
-#~ "d'emplenar els camps que componen el REGISTRE D'IMMOBLE, consignant l'Import "
-#~ "Total de cada arrendament corresponent a l'any natural al qual es refereix "
-#~ "la declaració, amb independència que aquest ja hagi estat inclòs en la clau "
-#~ "'B' (vendes)."
-
-#~ msgid "Real state address"
-#~ msgstr "Adreça de l'immoble"
-
-#~ msgid "Real State Transmissions Amount"
-#~ msgstr "Import transmissió immoble"
-
-#~ msgid "Real State Amount"
-#~ msgstr "Import immobles"
-
-#~ msgid "Real state records"
-#~ msgstr "Registres d'immobles"
-
-#, python-format
-#~ msgid "All real state records state code field must be filled."
-#~ msgstr ""
-#~ "El codi de província de tots els registres d'immobles han d'estar introduïts."
-
-#~ msgid "Fourth Quarter Real State Transmossion Amount"
-#~ msgstr "Import transmissió immoble (T4)"
-
-#, python-format
-#~ msgid "The type 2-I record (real state) must be 502 characters long"
-#~ msgstr ""
-#~ "El tipus de registre 2-I (estat real) ha de ser de 502 caràcters de llargada"
-
-#~ msgid "Real state Situation"
-#~ msgstr "Situació d'immobles"
-
-#~ msgid "Third Quarter Real State Transmission Amount"
-#~ msgstr "Import transmissió immoble (T3)"
-
-#~ msgid "Real State Transmission (Q1|Q2|Q3|Q4)"
-#~ msgstr "Import transmissió immoble (T1|T2|T3|T4)"
-
-#~ msgid "First Quarter Real State Transmission Amount"
-#~ msgstr "Import transmissió immoble (T1)"
-
-#~ msgid "Second Quarter Real State Transmission Amount"
-#~ msgstr "Import transmissió immoble (T2)"

=== modified file 'l10n_es_aeat_mod347/i18n/es.po'
--- l10n_es_aeat_mod347/i18n/es.po	2013-12-19 06:16:40 +0000
+++ l10n_es_aeat_mod347/i18n/es.po	2013-12-27 10:08:05 +0000
@@ -5,23 +5,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.2\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-03-20 17:21+0000\n"
-"PO-Revision-Date: 2013-12-10 16:44+0000\n"
-"Last-Translator: Alejandro Santana <[e-mail]>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-11-18 11:54+0000\n"
+"PO-Revision-Date: 2013-11-19 18:01+0100\n"
+"Last-Translator: Joaquin Gutierrez <[e-mail]>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-19 06:16+0000\n"
-"X-Generator: Launchpad (build 16872)\n"
-
-#. module: l10n_es_aeat_mod347
-#: code:addons/l10n_es_aeat_mod347/wizard/export_mod347_to_boe.py:157
+"X-Launchpad-Export-Date: 2013-10-14 05:33+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
+
+#. module: l10n_es_aeat_mod347
+#: view:l10n.es.aeat.mod347.report:0
+#, fuzzy
+msgid "Confirmed models"
+msgstr "Confirmar"
+
+#. module: l10n_es_aeat_mod347
+#: code:addons/l10n_es_aeat_mod347/wizard/export_mod347_to_boe.py:202
 #, python-format
 msgid "The type 2-D record (partner) must be 502 characters long"
-msgstr ""
-"El tipo de registro 2-D (empresa) debe ser de 502 caracteres de largo"
+msgstr "El tipo de registro 2-D (empresa) debe ser de 502 caracteres de largo"
 
 #. module: l10n_es_aeat_mod347
 #: model:ir.model,name:l10n_es_aeat_mod347.model_l10n_es_aeat_mod347_partner_record
@@ -30,12 +36,10 @@
 msgstr "Registro de empresa"
 
 #. module: l10n_es_aeat_mod347
-#: code:addons/l10n_es_aeat_mod347/mod347.py:142
+#: code:addons/l10n_es_aeat_mod347/mod347.py:199
 #, python-format
-msgid "All real estate records state code field must be filled."
-msgstr ""
-"El código de provincia de todos los registros de inmuebles debe estar "
-"rellenado."
+msgid "All real state records state code field must be filled."
+msgstr "El código de provincia de todos los registros de inmuebles debe estar rellenado."
 
 #. module: l10n_es_aeat_mod347
 #: report:report_l10n_es_aeat_mod347.report:0
@@ -43,6 +47,12 @@
 msgstr "Clave oper."
 
 #. module: l10n_es_aeat_mod347
+#: view:l10n.es.aeat.mod347.report:0
+#, fuzzy
+msgid "Group By..."
+msgstr "Agrupar por CIF"
+
+#. module: l10n_es_aeat_mod347
 #: selection:account.period,quarter:0
 msgid "Fourth"
 msgstr "Cuarto"
@@ -61,12 +71,12 @@
 #: field:l10n.es.aeat.mod347.partner_record,real_state_record_ids:0
 #: view:l10n.es.aeat.mod347.real_state_record:0
 #: field:l10n.es.aeat.mod347.report,real_state_record_ids:0
-msgid "Real Estate Records"
+msgid "Real State Records"
 msgstr "Registros de inmuebles"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,fourth_quarter_real_state_transmission_amount:0
-msgid "Fourth Quarter Real Estate Transmossion Amount"
+msgid "Fourth Quarter Real State Transmossion Amount"
 msgstr "Importe transmisión inmueble (T4)"
 
 #. module: l10n_es_aeat_mod347
@@ -89,17 +99,13 @@
 #. module: l10n_es_aeat_mod347
 #: model:ir.model,name:l10n_es_aeat_mod347.model_l10n_es_aeat_mod347_real_state_record
 #: view:l10n.es.aeat.mod347.real_state_record:0
-msgid "Real Estate Record"
+msgid "Real State Record"
 msgstr "Registros de inmuebles"
 
 #. module: l10n_es_aeat_mod347
 #: help:l10n.es.aeat.mod347.report,operations_limit:0
-msgid ""
-"The declaration will include partners with the total of operations over this "
-"limit"
-msgstr ""
-"La declaración incluirá las empresas cuya suma de operaciones supere este "
-"límite."
+msgid "The declaration will include partners with the total of operations over this limit"
+msgstr "La declaración incluirá las empresas cuya suma de operaciones supere este límite."
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,number_calification:0
@@ -117,13 +123,8 @@
 msgstr "Importe en efectivo"
 
 #. module: l10n_es_aeat_mod347
-#: constraint:account.period:0
-msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr "¡Error! La duración del periodo(s) no es válida. "
-
-#. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,total_real_state_amount:0
-msgid "Real Estate Amount"
+msgid "Real State Amount"
 msgstr "Importe inmuebles"
 
 #. module: l10n_es_aeat_mod347
@@ -167,7 +168,7 @@
 msgstr "Registros de empresas"
 
 #. module: l10n_es_aeat_mod347
-#: code:addons/l10n_es_aeat_mod347/wizard/export_mod347_to_boe.py:88
+#: code:addons/l10n_es_aeat_mod347/wizard/export_mod347_to_boe.py:106
 #, python-format
 msgid "The type 1 record must be 502 characters long"
 msgstr "El tipo de registro 1 debe ser de 502 caracteres de largo"
@@ -178,9 +179,9 @@
 msgstr "Tipo de soporte"
 
 #. module: l10n_es_aeat_mod347
-#: code:addons/l10n_es_aeat_mod347/mod347.py:136
-#: code:addons/l10n_es_aeat_mod347/mod347.py:138
-#: code:addons/l10n_es_aeat_mod347/mod347.py:142
+#: code:addons/l10n_es_aeat_mod347/mod347.py:184
+#: code:addons/l10n_es_aeat_mod347/mod347.py:190
+#: code:addons/l10n_es_aeat_mod347/mod347.py:198
 #, python-format
 msgid "Error!"
 msgstr "¡Error!"
@@ -220,21 +221,21 @@
 msgstr "CIF/NIF"
 
 #. module: l10n_es_aeat_mod347
+#: help:account.journal,cash_journal:0
+#, fuzzy
+msgid "Payments of this journal will be considered as cash(used on the 347 report)"
+msgstr "Los pagos realizados con este diario serán considerados como efectivo (utilizado en la declaración 347)."
+
+#. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
 msgid "Calculation"
 msgstr "Cálculo"
 
 #. module: l10n_es_aeat_mod347
-#: code:addons/l10n_es_aeat_mod347/wizard/export_mod347_to_boe.py:232
+#: code:addons/l10n_es_aeat_mod347/wizard/export_mod347_to_boe.py:306
 #, python-format
-msgid "The type 2-I record (real estate) must be 502 characters long"
-msgstr ""
-"El tipo de registro 2-I (estado real) debe ser de 502 caracteres de largo"
-
-#. module: l10n_es_aeat_mod347
-#: sql_constraint:account.journal:0
-msgid "The code of the journal must be unique per company !"
-msgstr "¡El código del diario debe ser único por compañía!"
+msgid "The type 2-I record (real state) must be 502 characters long"
+msgstr "El tipo de registro 2-I (estado real) debe ser de 502 caracteres de largo"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
@@ -244,7 +245,7 @@
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
-msgid "Real Estate records"
+msgid "Real State records"
 msgstr "Registros de inmuebles"
 
 #. module: l10n_es_aeat_mod347
@@ -258,18 +259,20 @@
 msgstr "Confirmar"
 
 #. module: l10n_es_aeat_mod347
+#: view:l10n.es.aeat.mod347.report:0
+#, fuzzy
+msgid "Cancelled models"
+msgstr "Cancelada"
+
+#. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,origin_fiscalyear_id:0
 msgid "Origin fiscal year"
 msgstr "Ejercicio fiscal origen"
 
 #. module: l10n_es_aeat_mod347
 #: help:l10n.es.aeat.mod347.report,charges_obtp_limit:0
-msgid ""
-"The declaration will include partners from which we received payments, on "
-"behalf of third parties, over this limit"
-msgstr ""
-"La declaración incluirá las empresas a las que hemos realizado cobros por "
-"cuenta de terceros superiores al límite."
+msgid "The declaration will include partners from which we received payments, on behalf of third parties, over this limit"
+msgstr "La declaración incluirá las empresas a las que hemos realizado cobros por cuenta de terceros superiores al límite."
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,operations_limit:0
@@ -282,7 +285,7 @@
 msgstr "3 - España, sin referencia catastral"
 
 #. module: l10n_es_aeat_mod347
-#: code:addons/l10n_es_aeat_mod347/mod347.py:138
+#: code:addons/l10n_es_aeat_mod347/mod347.py:191
 #, python-format
 msgid ""
 "All partner vat number field must be filled.\n"
@@ -293,18 +296,17 @@
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,bussiness_real_state_rent:0
-msgid "Bussiness Real Estate Rent"
+msgid "Bussiness Real State Rent"
 msgstr "Arrendamiento local negocio"
 
 #. module: l10n_es_aeat_mod347
-#: code:addons/l10n_es_aeat_mod347/mod347.py:136
+#: code:addons/l10n_es_aeat_mod347/mod347.py:185
 #, python-format
 msgid ""
 "All partner state code field must be filled.\n"
 "Partner: %s (%s)"
 msgstr ""
-"El código de provincia de todos los registros de empresas debe estar "
-"rellenado.\n"
+"El código de provincia de todos los registros de empresas debe estar rellenado.\n"
 "Empresa: %s (%s)"
 
 #. module: l10n_es_aeat_mod347
@@ -401,6 +403,11 @@
 msgstr "Escalera"
 
 #. module: l10n_es_aeat_mod347
+#: field:l10n.es.aeat.mod347.report,only_supplier:0
+msgid "Only Suppliers"
+msgstr "Solo Proveedores"
+
+#. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,third_quarter:0
 msgid "Third Quarter"
 msgstr "Tercer trimestre"
@@ -445,7 +452,7 @@
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,situation:0
-msgid "Real estate Situation"
+msgid "Real state Situation"
 msgstr "Situación de inmuebles"
 
 #. module: l10n_es_aeat_mod347
@@ -496,12 +503,12 @@
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.partner_record:0
 #: view:l10n.es.aeat.mod347.real_state_record:0
-msgid "Real estate info"
+msgid "Real state info"
 msgstr "Información de inmuebles"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,real_state_transmissions_amount:0
-msgid "Real Estate Transmisions amount"
+msgid "Real State Transmisions amount"
 msgstr "Importe transmisión inmueble"
 
 #. module: l10n_es_aeat_mod347
@@ -581,18 +588,8 @@
 
 #. module: l10n_es_aeat_mod347
 #: help:l10n.es.aeat.mod347.partner_record,bussiness_real_state_rent:0
-msgid ""
-"Set to identify real estate rent operations aside from the rest. You'll need "
-"to fill in the real estate info only when you are the one that receives the "
-"money."
-msgstr ""
-"(Sólo arrendadores y arrendatarios de Locales de Negocio). Marcarán esta "
-"casilla para identificar las operaciones de arrendamiento de locales de "
-"negocio, debiendo consignarlas separadamente del resto. Además los "
-"arrendadores deberán cumplimentar los campos que componen el REGISTRO DE "
-"INMUEBLE, consignando el Importe Total de cada arrendamiento correspondiente "
-"al año natural al que se refiere la declaración, con independencia de que "
-"éste ya haya sido incluido en la clave 'B' (ventas)."
+msgid "Set to identify real state rent operations aside from the rest. You'll need to fill in the real state info only when you are the one that receives the money."
+msgstr "(Sólo arrendadores y arrendatarios de Locales de Negocio). Marcarán esta casilla para identificar las operaciones de arrendamiento de locales de negocio, debiendo consignarlas separadamente del resto. Además los arrendadores deberán cumplimentar los campos que componen el REGISTRO DE INMUEBLE, consignando el Importe Total de cada arrendamiento correspondiente al año natural al que se refiere la declaración, con independencia de que éste ya haya sido incluido en la clave 'B' (ventas)."
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
@@ -611,12 +608,25 @@
 msgstr "Número:"
 
 #. module: l10n_es_aeat_mod347
-#: help:l10n.es.aeat.mod347.report,received_cash_limit:0
+#: model:ir.actions.act_window,help:l10n_es_aeat_mod347.action_l10n_es_aeat_mod347_report
 msgid ""
-"The declaration will show the total of cash operations over this limit"
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a AEAT Model 347 Reports.\n"
+"                \n"
+"              </p><p>\n"
+"                Basado en la Orden EHA/3012/2008, de 20 de Octubre, por el que se aprueban \n"
+"                los diseños físicos y lógicos del 347.\n"
+"              </p>\n"
+"              "
 msgstr ""
-"La declaración muestra el total de las operaciones realizadas en efectivo "
-"superiores a este límite."
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a AEAT Model 347 Reports.\n"
+"                \n"
+"              </p><p>\n"
+"                Basado en la Orden EHA/3012/2008, de 20 de Octubre, por el que se aprueban \n"
+"                los diseños físicos y lógicos del 347.\n"
+"              </p>\n"
+"              "
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,cash_record_ids:0
@@ -682,22 +692,19 @@
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.partner_record,operation_key:0
-msgid ""
-"D - Adquisiciones efectuadas por Entidades Públicas (...) superiores al "
-"límite (1)"
-msgstr ""
-"D - Adquisiciones efectuadas por Entidades Públicas (...) superiores al "
-"límite (1)"
+msgid "D - Adquisiciones efectuadas por Entidades Públicas (...) superiores al límite (1)"
+msgstr "D - Adquisiciones efectuadas por Entidades Públicas (...) superiores al límite (1)"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,third_quarter_real_state_transmission_amount:0
-msgid "Third Quarter Real Estate Transmission Amount"
+msgid "Third Quarter Real State Transmission Amount"
 msgstr "Importe transmisión inmueble (T3)"
 
 #. module: l10n_es_aeat_mod347
-#: model:ir.actions.act_window,help:l10n_es_aeat_mod347.action_l10n_es_aeat_mod347_report
-msgid "Create and query AEAT Model 347 Reports"
-msgstr "Permite crear y consultar las declaraciones sobre el modelo AEAT 347"
+#: help:l10n.es.aeat.mod347.report,received_cash_limit:0
+#, fuzzy
+msgid "The declaration will showthe total of cash operations over this limit"
+msgstr "La declaración muestra el total de las operaciones realizadas en efectivo superiores a este límite."
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,type:0
@@ -705,15 +712,6 @@
 msgstr "Tipo de declaración"
 
 #. module: l10n_es_aeat_mod347
-#: constraint:account.period:0
-msgid ""
-"Invalid period ! Some periods overlap or the date period is not in the scope "
-"of the fiscal year. "
-msgstr ""
-"¡Periodo no válido! Algunos periodos se sobreponen o las fechas del periodo "
-"no están dentro del ejercicio fiscal. "
-
-#. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,number:0
 #: selection:l10n.es.aeat.mod347.real_state_record,number_type:0
 msgid "Number"
@@ -730,6 +728,12 @@
 msgstr "Ant"
 
 #. module: l10n_es_aeat_mod347
+#: view:l10n.es.aeat.mod347.report:0
+#, fuzzy
+msgid "In process models"
+msgstr "En proceso"
+
+#. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,first_quarter:0
 msgid "First Quarter"
 msgstr "Primer trimestre"
@@ -747,7 +751,7 @@
 
 #. module: l10n_es_aeat_mod347
 #: report:report_l10n_es_aeat_mod347.report:0
-msgid "Real Estate Transmission (Q1|Q2|Q3|Q4)"
+msgid "Real State Transmission (Q1|Q2|Q3|Q4)"
 msgstr "Importe transmisión inmueble (T1|T2|T3|T4)"
 
 #. module: l10n_es_aeat_mod347
@@ -762,13 +766,8 @@
 
 #. module: l10n_es_aeat_mod347
 #: help:l10n.es.aeat.mod347.partner_record,insurance_operation:0
-msgid ""
-"Only for insurance companies. Set to identify insurance operations aside "
-"from the rest."
-msgstr ""
-"Sólo entidades aseguradoras. Las entidades aseguradoras marcarán esta "
-"casilla para identificar las operaciones de seguros, debiendo consignarlas "
-"separadamente del resto de operaciones."
+msgid "Only for insurance companies. Set to identify insurance operations aside from the rest."
+msgstr "Sólo entidades aseguradoras. Las entidades aseguradoras marcarán esta casilla para identificar las operaciones de seguros, debiendo consignarlas separadamente del resto de operaciones."
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,city:0
@@ -776,14 +775,6 @@
 msgstr "Población"
 
 #. module: l10n_es_aeat_mod347
-#: help:account.journal,cash_journal:0
-msgid ""
-"Payments of this journal will be considered as cash (used on the 347 report)"
-msgstr ""
-"Los pagos realizados con este diario serán considerados como efectivo "
-"(utilizado en la declaración 347)."
-
-#. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,floor:0
 msgid "Floor"
 msgstr "Planta"
@@ -830,7 +821,7 @@
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.real_state_record:0
-msgid "Real estate address"
+msgid "Real state address"
 msgstr "Dirección del inmueble"
 
 #. module: l10n_es_aeat_mod347
@@ -855,7 +846,7 @@
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,first_quarter_real_state_transmission_amount:0
-msgid "First Quarter Real Estate Transmission Amount"
+msgid "First Quarter Real State Transmission Amount"
 msgstr "Importe transmisión inmueble (T1)"
 
 #. module: l10n_es_aeat_mod347
@@ -870,7 +861,7 @@
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,second_quarter_real_state_transmission_amount:0
-msgid "Second Quarter Real Estate Transmission Amount"
+msgid "Second Quarter Real State Transmission Amount"
 msgstr "Importe transmisión inmueble (T2)"
 
 #. module: l10n_es_aeat_mod347
@@ -905,7 +896,7 @@
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,total_real_state_transmissions_amount:0
-msgid "Real Estate Transmissions Amount"
+msgid "Real State Transmissions Amount"
 msgstr "Importe transmisión inmueble"
 
 #. module: l10n_es_aeat_mod347
@@ -920,6 +911,16 @@
 msgstr "Importe T.I."
 
 #. module: l10n_es_aeat_mod347
+#: field:l10n.es.aeat.mod347.report,attach_id:0
+msgid "BOE file"
+msgstr "BOE file"
+
+#. module: l10n_es_aeat_mod347
+#: view:l10n.es.aeat.mod347.report:0
+msgid "Draft models"
+msgstr "Draft models"
+
+#. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
 #: field:l10n.es.aeat.mod347.report,fiscalyear_id:0
 msgid "Fiscal Year"
@@ -932,7 +933,7 @@
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,total_real_state_records:0
-msgid "Real estate records"
+msgid "Real state records"
 msgstr "Registros de inmuebles"
 
 #. module: l10n_es_aeat_mod347
@@ -947,17 +948,8 @@
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.partner_record,operation_key:0
-msgid ""
-"E - Subvenciones, auxilios y ayudas satisfechas por Ad. Públicas superiores "
-"al límite (1)"
-msgstr ""
-"E - Subvenciones, auxilios y ayudas satisfechas por Ad. Públicas superiores "
-"al límite (1)"
-
-#. module: l10n_es_aeat_mod347
-#: sql_constraint:account.journal:0
-msgid "The name of the journal must be unique per company !"
-msgstr "¡El nombre del diaro debe ser único por compañía!"
+msgid "E - Subvenciones, auxilios y ayudas satisfechas por Ad. Públicas superiores al límite (1)"
+msgstr "E - Subvenciones, auxilios y ayudas satisfechas por Ad. Públicas superiores al límite (1)"
 
 #. module: l10n_es_aeat_mod347
 #: selection:account.period,quarter:0
@@ -969,74 +961,22 @@
 msgid "Journal"
 msgstr "Diario"
 
-#~ msgid "Real state Situation"
-#~ msgstr "Situación de inmuebles"
-
-#~ msgid "Real State Record"
-#~ msgstr "Registros de inmuebles"
-
-#~ msgid "Real State Records"
-#~ msgstr "Registros de inmuebles"
-
-#~ msgid "Real State records"
-#~ msgstr "Registros de inmuebles"
-
-#~ msgid "Bussiness Real State Rent"
-#~ msgstr "Arrendamiento local negocio"
-
-#~ msgid "Real State Transmisions amount"
-#~ msgstr "Importe transmisión inmueble"
+#~ msgid "Error ! The duration of the Period(s) is/are invalid. "
+#~ msgstr "¡Error! La duración del periodo(s) no es válida. "
+
+#~ msgid "The code of the journal must be unique per company !"
+#~ msgstr "¡El código del diario debe ser único por compañía!"
+
+#~ msgid "Create and query AEAT Model 347 Reports"
+#~ msgstr ""
+#~ "Permite crear y consultar las declaraciones sobre el modelo AEAT 347"
 
 #~ msgid ""
-#~ "Set to identify real state rent operations aside from the rest. You'll need "
-#~ "to fill in the real state info only when you are the one that receives the "
-#~ "money."
-#~ msgstr ""
-#~ "(Sólo arrendadores y arrendatarios de Locales de Negocio). Marcarán esta "
-#~ "casilla para identificar las operaciones de arrendamiento de locales de "
-#~ "negocio, debiendo consignarlas separadamente del resto. Además los "
-#~ "arrendadores deberán cumplimentar los campos que componen el REGISTRO DE "
-#~ "INMUEBLE, consignando el Importe Total de cada arrendamiento correspondiente "
-#~ "al año natural al que se refiere la declaración, con independencia de que "
-#~ "éste ya haya sido incluido en la clave 'B' (ventas)."
-
-#~ msgid "Real state address"
-#~ msgstr "Dirección del inmueble"
-
-#~ msgid "Real State Transmissions Amount"
-#~ msgstr "Importe transmisión inmueble"
-
-#~ msgid "Real State Amount"
-#~ msgstr "Importe inmuebles"
-
-#~ msgid "Real state records"
-#~ msgstr "Registros de inmuebles"
-
-#, python-format
-#~ msgid "All real state records state code field must be filled."
-#~ msgstr ""
-#~ "El código de provincia de todos los registros de inmuebles debe estar "
-#~ "rellenado."
-
-#~ msgid "Fourth Quarter Real State Transmossion Amount"
-#~ msgstr "Importe transmisión inmueble (T4)"
-
-#~ msgid "Real state info"
-#~ msgstr "Información de inmuebles"
-
-#~ msgid "Third Quarter Real State Transmission Amount"
-#~ msgstr "Importe transmisión inmueble (T3)"
-
-#~ msgid "Real State Transmission (Q1|Q2|Q3|Q4)"
-#~ msgstr "Importe transmisión inmueble (T1|T2|T3|T4)"
-
-#~ msgid "First Quarter Real State Transmission Amount"
-#~ msgstr "Importe transmisión inmueble (T1)"
-
-#~ msgid "Second Quarter Real State Transmission Amount"
-#~ msgstr "Importe transmisión inmueble (T2)"
-
-#, python-format
-#~ msgid "The type 2-I record (real state) must be 502 characters long"
-#~ msgstr ""
-#~ "El tipo de registro 2-I (inmuebles) debe ser de 502 caracteres de largo"
+#~ "Invalid period ! Some periods overlap or the date period is not in the "
+#~ "scope of the fiscal year. "
+#~ msgstr ""
+#~ "¡Periodo no válido! Algunos periodos se sobreponen o las fechas del "
+#~ "periodo no están dentro del ejercicio fiscal. "
+
+#~ msgid "The name of the journal must be unique per company !"
+#~ msgstr "¡El nombre del diaro debe ser único por compañía!"

=== modified file 'l10n_es_aeat_mod347/i18n/l10n_es_aeat_mod347.pot'
--- l10n_es_aeat_mod347/i18n/l10n_es_aeat_mod347.pot	2013-11-23 01:47:07 +0000
+++ l10n_es_aeat_mod347/i18n/l10n_es_aeat_mod347.pot	2013-12-27 10:08:05 +0000
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.3\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-03-20 17:21+0000\n"
-"PO-Revision-Date: 2012-03-20 17:21+0000\n"
+"Project-Id-Version: OpenERP Server 7.0-20130927-231103\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-11-18 11:54+0000\n"
+"PO-Revision-Date: 2013-11-18 11:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,166 +16,171 @@
 "Plural-Forms: \n"
 
 #. module: l10n_es_aeat_mod347
-#: code:addons/l10n_es_aeat_mod347/wizard/export_mod347_to_boe.py:157
+#: view:l10n.es.aeat.mod347.report:0
+msgid "Confirmed models"
+msgstr "Confirmed models"
+
+#. module: l10n_es_aeat_mod347
+#: code:addons/l10n_es_aeat_mod347/wizard/export_mod347_to_boe.py:202
 #, python-format
 msgid "The type 2-D record (partner) must be 502 characters long"
-msgstr ""
+msgstr "The type 2-D record (partner) must be 502 characters long"
 
 #. module: l10n_es_aeat_mod347
 #: model:ir.model,name:l10n_es_aeat_mod347.model_l10n_es_aeat_mod347_partner_record
 #: view:l10n.es.aeat.mod347.partner_record:0
 msgid "Partner Record"
-msgstr ""
+msgstr "Partner Record"
 
 #. module: l10n_es_aeat_mod347
-#: code:addons/l10n_es_aeat_mod347/mod347.py:142
+#: code:addons/l10n_es_aeat_mod347/mod347.py:199
 #, python-format
-msgid "All real estate records state code field must be filled."
-msgstr ""
+msgid "All real state records state code field must be filled."
+msgstr "All real state records state code field must be filled."
 
 #. module: l10n_es_aeat_mod347
 #: report:report_l10n_es_aeat_mod347.report:0
 msgid "Key Oper."
-msgstr ""
+msgstr "Key Oper."
+
+#. module: l10n_es_aeat_mod347
+#: view:l10n.es.aeat.mod347.report:0
+msgid "Group By..."
+msgstr "Group By..."
 
 #. module: l10n_es_aeat_mod347
 #: selection:account.period,quarter:0
 msgid "Fourth"
-msgstr ""
+msgstr "Fourth"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
 msgid "Calculate"
-msgstr ""
+msgstr "Calculate"
 
 #. module: l10n_es_aeat_mod347
 #: field:res.partner,include_in_mod347:0
 msgid "Include in 347 Report"
-msgstr ""
+msgstr "Include in 347 Report"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,real_state_record_ids:0
 #: view:l10n.es.aeat.mod347.real_state_record:0
 #: field:l10n.es.aeat.mod347.report,real_state_record_ids:0
-msgid "Real Estate Records"
-msgstr ""
+msgid "Real State Records"
+msgstr "Real State Records"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,fourth_quarter_real_state_transmission_amount:0
-msgid "Fourth Quarter Real Estate Transmossion Amount"
-msgstr ""
+msgid "Fourth Quarter Real State Transmossion Amount"
+msgstr "Fourth Quarter Real State Transmossion Amount"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.partner_record:0
 #: field:l10n.es.aeat.mod347.report,partner_record_ids:0
 msgid "Partner Records"
-msgstr ""
+msgstr "Partner Records"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,township_code:0
 msgid "Township Code"
-msgstr ""
+msgstr "Township Code"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
 #: field:l10n.es.aeat.mod347.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Company"
 
 #. module: l10n_es_aeat_mod347
 #: model:ir.model,name:l10n_es_aeat_mod347.model_l10n_es_aeat_mod347_real_state_record
 #: view:l10n.es.aeat.mod347.real_state_record:0
-msgid "Real Estate Record"
-msgstr ""
+msgid "Real State Record"
+msgstr "Real State Record"
 
 #. module: l10n_es_aeat_mod347
 #: help:l10n.es.aeat.mod347.report,operations_limit:0
 msgid "The declaration will include partners with the total of operations over this limit"
-msgstr ""
+msgstr "The declaration will include partners with the total of operations over this limit"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,number_calification:0
 msgid "Number calification"
-msgstr ""
+msgstr "Number calification"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.report,type:0
 msgid "Substitutive"
-msgstr ""
+msgstr "Substitutive"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,total_cash_amount:0
 msgid "Cash Amount"
-msgstr ""
-
-#. module: l10n_es_aeat_mod347
-#: constraint:account.period:0
-msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr ""
+msgstr "Cash Amount"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,total_real_state_amount:0
-msgid "Real Estate Amount"
-msgstr ""
+msgid "Real State Amount"
+msgstr "Real State Amount"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.real_state_record,number_calification:0
 msgid "Bis"
-msgstr ""
+msgstr "Bis"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.real_state_record,situation:0
 msgid "4 - Foreign"
-msgstr ""
+msgstr "4 - Foreign"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.real_state_record,number_calification:0
 msgid "Mod"
-msgstr ""
+msgstr "Mod"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
 msgid "AEAT 347 Reports"
-msgstr ""
+msgstr "AEAT 347 Reports"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,group_by_cif:0
 msgid "Group by cif"
-msgstr ""
+msgstr "Group by cif"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.real_state_record,situation:0
 msgid "1 - Spain but Basque Country and Navarra"
-msgstr ""
+msgstr "1 - Spain but Basque Country and Navarra"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.partner_record:0
 msgid "Invoice record"
-msgstr ""
+msgstr "Invoice record"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
 msgid "Partner records"
-msgstr ""
+msgstr "Partner records"
 
 #. module: l10n_es_aeat_mod347
-#: code:addons/l10n_es_aeat_mod347/wizard/export_mod347_to_boe.py:88
+#: code:addons/l10n_es_aeat_mod347/wizard/export_mod347_to_boe.py:106
 #, python-format
 msgid "The type 1 record must be 502 characters long"
-msgstr ""
+msgstr "The type 1 record must be 502 characters long"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,support_type:0
 msgid "Support Type"
-msgstr ""
+msgstr "Support Type"
 
 #. module: l10n_es_aeat_mod347
-#: code:addons/l10n_es_aeat_mod347/mod347.py:136
-#: code:addons/l10n_es_aeat_mod347/mod347.py:138
-#: code:addons/l10n_es_aeat_mod347/mod347.py:142
+#: code:addons/l10n_es_aeat_mod347/mod347.py:184
+#: code:addons/l10n_es_aeat_mod347/mod347.py:190
+#: code:addons/l10n_es_aeat_mod347/mod347.py:198
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Error!"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.cash_record,amount:0
@@ -183,148 +188,153 @@
 #: field:l10n.es.aeat.mod347.real_state_record,amount:0
 #: field:l10n.es.aeat.mod347.report,total_amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Amount"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.cash_record,move_line_id:0
 msgid "Account move line"
-msgstr ""
+msgstr "Account move line"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.partner_record:0
 #: field:l10n.es.aeat.mod347.partner_record,invoice_record_ids:0
 msgid "Invoice records"
-msgstr ""
+msgstr "Invoice records"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelled"
 
 #. module: l10n_es_aeat_mod347
 #: field:account.period,quarter:0
 msgid "Quarter"
-msgstr ""
+msgstr "Quarter"
 
 #. module: l10n_es_aeat_mod347
 #: report:report_l10n_es_aeat_mod347.report:0
 msgid "VAT"
-msgstr ""
+msgstr "VAT"
+
+#. module: l10n_es_aeat_mod347
+#: help:account.journal,cash_journal:0
+msgid "Payments of this journal will be considered as cash(used on the 347 report)"
+msgstr "Payments of this journal will be considered as cash(used on the 347 report)"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
 msgid "Calculation"
-msgstr ""
+msgstr "Calculation"
 
 #. module: l10n_es_aeat_mod347
-#: code:addons/l10n_es_aeat_mod347/wizard/export_mod347_to_boe.py:232
+#: code:addons/l10n_es_aeat_mod347/wizard/export_mod347_to_boe.py:306
 #, python-format
-msgid "The type 2-I record (real estate) must be 502 characters long"
-msgstr ""
-
-#. module: l10n_es_aeat_mod347
-#: sql_constraint:account.journal:0
-msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgid "The type 2-I record (real state) must be 502 characters long"
+msgstr "The type 2-I record (real state) must be 502 characters long"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
 #: selection:l10n.es.aeat.mod347.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Draft"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
-msgid "Real Estate records"
-msgstr ""
+msgid "Real State records"
+msgstr "Real State records"
 
 #. module: l10n_es_aeat_mod347
 #: model:ir.model,name:l10n_es_aeat_mod347.model_l10n_es_aeat_mod347_invoice_record
 msgid "Invoice Record"
-msgstr ""
+msgstr "Invoice Record"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
 msgid "Confirm"
-msgstr ""
+msgstr "Confirm"
+
+#. module: l10n_es_aeat_mod347
+#: view:l10n.es.aeat.mod347.report:0
+msgid "Cancelled models"
+msgstr "Cancelled models"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,origin_fiscalyear_id:0
 msgid "Origin fiscal year"
-msgstr ""
+msgstr "Origin fiscal year"
 
 #. module: l10n_es_aeat_mod347
 #: help:l10n.es.aeat.mod347.report,charges_obtp_limit:0
 msgid "The declaration will include partners from which we received payments, on behalf of third parties, over this limit"
-msgstr ""
+msgstr "The declaration will include partners from which we received payments, on behalf of third parties, over this limit"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,operations_limit:0
 msgid "Invoiced Limit (1)"
-msgstr ""
+msgstr "Invoiced Limit (1)"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.real_state_record,situation:0
 msgid "3 - Spain, without catastral reference"
-msgstr ""
+msgstr "3 - Spain, without catastral reference"
 
 #. module: l10n_es_aeat_mod347
-#: code:addons/l10n_es_aeat_mod347/mod347.py:138
+#: code:addons/l10n_es_aeat_mod347/mod347.py:191
 #, python-format
 msgid "All partner vat number field must be filled.\n"
 "Partner: %s (%s)"
-msgstr ""
+msgstr "All partner vat number field must be filled.\n"
 "Partner: %s (%s)"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,bussiness_real_state_rent:0
-msgid "Bussiness Real Estate Rent"
-msgstr ""
+msgid "Bussiness Real State Rent"
+msgstr "Bussiness Real State Rent"
 
 #. module: l10n_es_aeat_mod347
-#: code:addons/l10n_es_aeat_mod347/mod347.py:136
+#: code:addons/l10n_es_aeat_mod347/mod347.py:185
 #, python-format
 msgid "All partner state code field must be filled.\n"
 "Partner: %s (%s)"
-msgstr ""
+msgstr "All partner state code field must be filled.\n"
 "Partner: %s (%s)"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.partner_record,operation_key:0
 msgid "F - Ventas agencia viaje"
-msgstr ""
+msgstr "F - Ventas agencia viaje"
 
 #. module: l10n_es_aeat_mod347
 #: help:l10n.es.aeat.mod347.partner_record,origin_fiscalyear_id:0
 msgid "Origin cash operation fiscal year"
-msgstr ""
+msgstr "Origin cash operation fiscal year"
 
 #. module: l10n_es_aeat_mod347
 #: help:l10n.es.aeat.mod347.partner_record,representative_vat:0
 #: help:l10n.es.aeat.mod347.real_state_record,representative_vat:0
 msgid "Legal Representative VAT number"
-msgstr ""
+msgstr "Legal Representative VAT number"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,fourth_quarter:0
 msgid "Fourth Quarter"
-msgstr ""
+msgstr "Fourth Quarter"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,door:0
 msgid "Door"
-msgstr ""
+msgstr "Door"
 
 #. module: l10n_es_aeat_mod347
 #: selection:account.period,quarter:0
 msgid "Third"
-msgstr ""
+msgstr "Third"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.cash_record,partner_record_id:0
 #: field:l10n.es.aeat.mod347.invoice_record,partner_record_id:0
 msgid "Partner record"
-msgstr ""
+msgstr "Partner record"
 
 #. module: l10n_es_aeat_mod347
 #: model:ir.model,name:l10n_es_aeat_mod347.model_l10n_es_aeat_mod347_report
@@ -332,75 +342,80 @@
 #: field:l10n.es.aeat.mod347.real_state_record,report_id:0
 #: view:l10n.es.aeat.mod347.report:0
 msgid "AEAT 347 Report"
-msgstr ""
+msgstr "AEAT 347 Report"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.partner_record,operation_key:0
 msgid "C - Cobros por cuenta de terceros superiores al límite (3)"
-msgstr ""
+msgstr "C - Cobros por cuenta de terceros superiores al límite (3)"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
 msgid "Export to BOE"
-msgstr ""
+msgstr "Export to BOE"
 
 #. module: l10n_es_aeat_mod347
 #: report:report_l10n_es_aeat_mod347.report:0
 msgid "AEAT 347 MODEL"
-msgstr ""
+msgstr "AEAT 347 MODEL"
 
 #. module: l10n_es_aeat_mod347
 #: model:ir.actions.report.xml,name:l10n_es_aeat_mod347.report_l10n_es_aeat_mod347
 msgid "AEAT 347 Model report"
-msgstr ""
+msgstr "AEAT 347 Model report"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,partner_vat:0
 #: field:l10n.es.aeat.mod347.real_state_record,partner_vat:0
 #: field:l10n.es.aeat.mod347.report,company_vat:0
 msgid "VAT number"
-msgstr ""
+msgstr "VAT number"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,insurance_operation:0
 msgid "Insurance Operation"
-msgstr ""
+msgstr "Insurance Operation"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,state:0
 msgid "State"
-msgstr ""
+msgstr "State"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,partner_state_code:0
 #: field:l10n.es.aeat.mod347.real_state_record,state_code:0
 msgid "State Code"
-msgstr ""
+msgstr "State Code"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,stairway:0
 msgid "Stairway"
-msgstr ""
+msgstr "Stairway"
+
+#. module: l10n_es_aeat_mod347
+#: field:l10n.es.aeat.mod347.report,only_supplier:0
+msgid "Only Suppliers"
+msgstr "Only Suppliers"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,third_quarter:0
 msgid "Third Quarter"
-msgstr ""
+msgstr "Third Quarter"
 
 #. module: l10n_es_aeat_mod347
 #: model:ir.ui.menu,name:l10n_es_aeat_mod347.menu_aeat_mod347_report
 msgid "AEAT 347 Model"
-msgstr ""
+msgstr "AEAT 347 Model"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,total_partner_records:0
 msgid "Partners records"
-msgstr ""
+msgstr "Partners records"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,calculation_date:0
 msgid "Calculation date"
-msgstr ""
+msgstr "Calculation date"
 
 #. module: l10n_es_aeat_mod347
 #: model:ir.model,name:l10n_es_aeat_mod347.model_res_partner
@@ -408,513 +423,527 @@
 #: field:l10n.es.aeat.mod347.real_state_record,partner_id:0
 #: report:report_l10n_es_aeat_mod347.report:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: l10n_es_aeat_mod347
 #: report:report_l10n_es_aeat_mod347.report:0
 msgid "Amount (Q1|Q2|Q3|Q4)"
-msgstr ""
+msgstr "Amount (Q1|Q2|Q3|Q4)"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,block:0
 msgid "Block"
-msgstr ""
+msgstr "Block"
 
 #. module: l10n_es_aeat_mod347
 #: selection:account.period,quarter:0
 msgid "First"
-msgstr ""
+msgstr "First"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,situation:0
-msgid "Real estate Situation"
-msgstr ""
+msgid "Real state Situation"
+msgstr "Real state Situation"
 
 #. module: l10n_es_aeat_mod347
 #: report:report_l10n_es_aeat_mod347.report:0
 msgid "Ins. Oper"
-msgstr ""
+msgstr "Ins. Oper"
 
 #. module: l10n_es_aeat_mod347
 #: report:report_l10n_es_aeat_mod347.report:0
 msgid "Invoiced amount"
-msgstr ""
+msgstr "Invoiced amount"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,reference:0
 msgid "Catastral Reference"
-msgstr ""
+msgstr "Catastral Reference"
 
 #. module: l10n_es_aeat_mod347
 #: report:report_l10n_es_aeat_mod347.report:0
 msgid "Support type:"
-msgstr ""
+msgstr "Support type:"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,number:0
 msgid "Declaration Number"
-msgstr ""
+msgstr "Declaration Number"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.report,state:0
 msgid "Canceled"
-msgstr ""
+msgstr "Canceled"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.real_state_record,situation:0
 msgid "2 - Basque Country and Navarra"
-msgstr ""
+msgstr "2 - Basque Country and Navarra"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,postal_code:0
 msgid "Postal code"
-msgstr ""
+msgstr "Postal code"
 
 #. module: l10n_es_aeat_mod347
 #: model:ir.model,name:l10n_es_aeat_mod347.model_l10n_es_aeat_mod347_cash_record
 msgid "Cash Record"
-msgstr ""
+msgstr "Cash Record"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.partner_record:0
 #: view:l10n.es.aeat.mod347.real_state_record:0
-msgid "Real estate info"
-msgstr ""
+msgid "Real state info"
+msgstr "Real state info"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,real_state_transmissions_amount:0
-msgid "Real Estate Transmisions amount"
-msgstr ""
+msgid "Real State Transmisions amount"
+msgstr "Real State Transmisions amount"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.partner_record,operation_key:0
 msgid "A - Adquisiciones de bienes y servicios superiores al límite (1)"
-msgstr ""
+msgstr "A - Adquisiciones de bienes y servicios superiores al límite (1)"
 
 #. module: l10n_es_aeat_mod347
 #: model:ir.model,name:l10n_es_aeat_mod347.model_l10n_es_aeat_mod347_calculate_records
 msgid "AEAT Model 347 Wizard - Calculate Records"
-msgstr ""
+msgstr "AEAT Model 347 Wizard - Calculate Records"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,second_quarter:0
 msgid "Second Quarter"
-msgstr ""
+msgstr "Second Quarter"
 
 #. module: l10n_es_aeat_mod347
 #: report:report_l10n_es_aeat_mod347.report:0
 msgid "RS Rent"
-msgstr ""
+msgstr "RS Rent"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.report,support_type:0
 msgid "DVD"
-msgstr ""
+msgstr "DVD"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
 msgid "In process"
-msgstr ""
+msgstr "In process"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
 msgid "Identification"
-msgstr ""
+msgstr "Identification"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.real_state_record,number_calification:0
 msgid "Dup"
-msgstr ""
+msgstr "Dup"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,number_type:0
 msgid "Number type"
-msgstr ""
+msgstr "Number type"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.report,type:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,complement:0
 msgid "Complement"
-msgstr ""
+msgstr "Complement"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.report,state:0
 msgid "Processing"
-msgstr ""
+msgstr "Processing"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,contact_name:0
 msgid "Full Name"
-msgstr ""
+msgstr "Full Name"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,contact_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Phone"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,portal:0
 msgid "Portal"
-msgstr ""
+msgstr "Portal"
 
 #. module: l10n_es_aeat_mod347
 #: help:l10n.es.aeat.mod347.partner_record,bussiness_real_state_rent:0
-msgid "Set to identify real estate rent operations aside from the rest. You'll need to fill in the real estate info only when you are the one that receives the money."
-msgstr ""
+msgid "Set to identify real state rent operations aside from the rest. You'll need to fill in the real state info only when you are the one that receives the money."
+msgstr "Set to identify real state rent operations aside from the rest. You'll need to fill in the real state info only when you are the one that receives the money."
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
 msgid "Declaration"
-msgstr ""
+msgstr "Declaration"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.cash_record,date:0
 #: field:l10n.es.aeat.mod347.invoice_record,date:0
 msgid "Date"
-msgstr ""
+msgstr "Date"
 
 #. module: l10n_es_aeat_mod347
 #: report:report_l10n_es_aeat_mod347.report:0
 msgid "Number:"
-msgstr ""
+msgstr "Number:"
 
 #. module: l10n_es_aeat_mod347
-#: help:l10n.es.aeat.mod347.report,received_cash_limit:0
-msgid "The declaration will show the total of cash operations over this limit"
-msgstr ""
+#: model:ir.actions.act_window,help:l10n_es_aeat_mod347.action_l10n_es_aeat_mod347_report
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a AEAT Model 347 Reports.\n"
+"                \n"
+"              </p><p>\n"
+"                Basado en la Orden EHA/3012/2008, de 20 de Octubre, por el que se aprueban \n"
+"                los diseños físicos y lógicos del 347.\n"
+"              </p>\n"
+"              "
+msgstr "<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a AEAT Model 347 Reports.\n"
+"                \n"
+"              </p><p>\n"
+"                Basado en la Orden EHA/3012/2008, de 20 de Octubre, por el que se aprueban \n"
+"                los diseños físicos y lógicos del 347.\n"
+"              </p>\n"
+"              "
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,cash_record_ids:0
 msgid "Payment records"
-msgstr ""
+msgstr "Payment records"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,address_type:0
 msgid "Address type"
-msgstr ""
+msgstr "Address type"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.real_state_record,number_type:0
 msgid "Without number"
-msgstr ""
+msgstr "Without number"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,charges_obtp_limit:0
 msgid "Charges on behalf of third parties Limit (3)"
-msgstr ""
+msgstr "Charges on behalf of third parties Limit (3)"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,partner_country_code:0
 msgid "Country Code"
-msgstr ""
+msgstr "Country Code"
 
 #. module: l10n_es_aeat_mod347
 #: field:account.journal,cash_journal:0
 msgid "Cash payments journal"
-msgstr ""
+msgstr "Cash payments journal"
 
 #. module: l10n_es_aeat_mod347
 #: help:l10n.es.aeat.mod347.real_state_record,complement:0
 msgid "Complement (urbanization, industrial park...)"
-msgstr ""
+msgstr "Complement (urbanization, industrial park...)"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.report,state:0
 msgid "Processed"
-msgstr ""
+msgstr "Processed"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,representative_vat:0
 #: field:l10n.es.aeat.mod347.real_state_record,representative_vat:0
 #: field:l10n.es.aeat.mod347.report,representative_vat:0
 msgid "L.R. VAT number"
-msgstr ""
+msgstr "L.R. VAT number"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.partner_record:0
 msgid "Cash record"
-msgstr ""
+msgstr "Cash record"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
 msgid "Susbtitutive/complementary declaration"
-msgstr ""
+msgstr "Susbtitutive/complementary declaration"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.partner_record,operation_key:0
 msgid "G - Compras agencia viaje"
-msgstr ""
+msgstr "G - Compras agencia viaje"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.partner_record,operation_key:0
 msgid "D - Adquisiciones efectuadas por Entidades Públicas (...) superiores al límite (1)"
-msgstr ""
+msgstr "D - Adquisiciones efectuadas por Entidades Públicas (...) superiores al límite (1)"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,third_quarter_real_state_transmission_amount:0
-msgid "Third Quarter Real Estate Transmission Amount"
-msgstr ""
+msgid "Third Quarter Real State Transmission Amount"
+msgstr "Third Quarter Real State Transmission Amount"
 
 #. module: l10n_es_aeat_mod347
-#: model:ir.actions.act_window,help:l10n_es_aeat_mod347.action_l10n_es_aeat_mod347_report
-msgid "Create and query AEAT Model 347 Reports"
-msgstr ""
+#: help:l10n.es.aeat.mod347.report,received_cash_limit:0
+msgid "The declaration will showthe total of cash operations over this limit"
+msgstr "The declaration will showthe total of cash operations over this limit"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,type:0
 msgid "Statement Type"
-msgstr ""
-
-#. module: l10n_es_aeat_mod347
-#: constraint:account.period:0
-msgid "Invalid period ! Some periods overlap or the date period is not in the scope of the fiscal year. "
-msgstr ""
+msgstr "Statement Type"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,number:0
 #: selection:l10n.es.aeat.mod347.real_state_record,number_type:0
 msgid "Number"
-msgstr ""
+msgstr "Number"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
 msgid "General"
-msgstr ""
+msgstr "General"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.real_state_record,number_calification:0
 msgid "Ant"
-msgstr ""
+msgstr "Ant"
+
+#. module: l10n_es_aeat_mod347
+#: view:l10n.es.aeat.mod347.report:0
+msgid "In process models"
+msgstr "In process models"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,first_quarter:0
 msgid "First Quarter"
-msgstr ""
+msgstr "First Quarter"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
 #: selection:l10n.es.aeat.mod347.report,state:0
 msgid "Done"
-msgstr ""
+msgstr "Done"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.invoice_record,invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Invoice"
 
 #. module: l10n_es_aeat_mod347
 #: report:report_l10n_es_aeat_mod347.report:0
-msgid "Real Estate Transmission (Q1|Q2|Q3|Q4)"
-msgstr ""
+msgid "Real State Transmission (Q1|Q2|Q3|Q4)"
+msgstr "Real State Transmission (Q1|Q2|Q3|Q4)"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancel"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
 msgid "Recalculate"
-msgstr ""
+msgstr "Recalculate"
 
 #. module: l10n_es_aeat_mod347
 #: help:l10n.es.aeat.mod347.partner_record,insurance_operation:0
 msgid "Only for insurance companies. Set to identify insurance operations aside from the rest."
-msgstr ""
+msgstr "Only for insurance companies. Set to identify insurance operations aside from the rest."
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,city:0
 msgid "City"
-msgstr ""
-
-#. module: l10n_es_aeat_mod347
-#: help:account.journal,cash_journal:0
-msgid "Payments of this journal will be considered as cash (used on the 347 report)"
-msgstr ""
+msgstr "City"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,floor:0
 msgid "Floor"
-msgstr ""
+msgstr "Floor"
 
 #. module: l10n_es_aeat_mod347
 #: model:ir.model,name:l10n_es_aeat_mod347.model_l10n_es_aeat_mod347_export_to_boe
 msgid "Export AEAT Model 347 to BOE format"
-msgstr ""
+msgstr "Export AEAT Model 347 to BOE format"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.partner_record,operation_key:0
 msgid "B - Entregas de bienes y servicios superiores al límite (1)"
-msgstr ""
+msgstr "B - Entregas de bienes y servicios superiores al límite (1)"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
 msgid "AEAT 347"
-msgstr ""
+msgstr "AEAT 347"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.partner_record:0
 msgid "Cash records"
-msgstr ""
+msgstr "Cash records"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.real_state_record,number_type:0
 msgid "Kilometer"
-msgstr ""
+msgstr "Kilometer"
 
 #. module: l10n_es_aeat_mod347
 #: report:report_l10n_es_aeat_mod347.report:0
 msgid "Cash amount"
-msgstr ""
+msgstr "Cash amount"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.partner_record:0
 msgid "Details"
-msgstr ""
+msgstr "Details"
 
 #. module: l10n_es_aeat_mod347
 #: model:ir.actions.act_window,name:l10n_es_aeat_mod347.action_l10n_es_aeat_mod347_report
 msgid "AEAT Model 347"
-msgstr ""
+msgstr "AEAT Model 347"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.real_state_record:0
-msgid "Real estate address"
-msgstr ""
+msgid "Real state address"
+msgstr "Real state address"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,cash_amount:0
 msgid "Received cash amount"
-msgstr ""
+msgstr "Received cash amount"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.report,type:0
 msgid "Complementary"
-msgstr ""
+msgstr "Complementary"
 
 #. module: l10n_es_aeat_mod347
 #: model:ir.model,name:l10n_es_aeat_mod347.model_account_period
 msgid "Account period"
-msgstr ""
+msgstr "Account period"
 
 #. module: l10n_es_aeat_mod347
 #: report:report_l10n_es_aeat_mod347.report:0
 msgid "PARTNER RECORD LINES"
-msgstr ""
+msgstr "PARTNER RECORD LINES"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,first_quarter_real_state_transmission_amount:0
-msgid "First Quarter Real Estate Transmission Amount"
-msgstr ""
+msgid "First Quarter Real State Transmission Amount"
+msgstr "First Quarter Real State Transmission Amount"
 
 #. module: l10n_es_aeat_mod347
 #: help:l10n.es.aeat.mod347.report,representative_vat:0
 msgid "Legal Representative VAT number."
-msgstr ""
+msgstr "Legal Representative VAT number."
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,previous_number:0
 msgid "Previous Declaration Number"
-msgstr ""
+msgstr "Previous Declaration Number"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,second_quarter_real_state_transmission_amount:0
-msgid "Second Quarter Real Estate Transmission Amount"
-msgstr ""
+msgid "Second Quarter Real State Transmission Amount"
+msgstr "Second Quarter Real State Transmission Amount"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,address:0
 msgid "Address"
-msgstr ""
+msgstr "Address"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.real_state_record,township:0
 msgid "Township"
-msgstr ""
+msgstr "Township"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,operation_key:0
 msgid "Operation Key"
-msgstr ""
+msgstr "Operation Key"
 
 #. module: l10n_es_aeat_mod347
 #: help:res.partner,include_in_mod347:0
 msgid "Include in AEAT 347 Model report"
-msgstr ""
+msgstr "Include in AEAT 347 Model report"
 
 #. module: l10n_es_aeat_mod347
 #: report:report_l10n_es_aeat_mod347.report:0
 msgid "Fiscal year:"
-msgstr ""
+msgstr "Fiscal year:"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.partner_record,amount:0
 msgid "Operations amount"
-msgstr ""
+msgstr "Operations amount"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,total_real_state_transmissions_amount:0
-msgid "Real Estate Transmissions Amount"
-msgstr ""
+msgid "Real State Transmissions Amount"
+msgstr "Real State Transmissions Amount"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.partner_record:0
 #: view:l10n.es.aeat.mod347.real_state_record:0
 msgid "Partner info"
-msgstr ""
+msgstr "Partner info"
 
 #. module: l10n_es_aeat_mod347
 #: report:report_l10n_es_aeat_mod347.report:0
 msgid "RST amount"
-msgstr ""
+msgstr "RST amount"
+
+#. module: l10n_es_aeat_mod347
+#: field:l10n.es.aeat.mod347.report,attach_id:0
+msgid "BOE file"
+msgstr "BOE file"
+
+#. module: l10n_es_aeat_mod347
+#: view:l10n.es.aeat.mod347.report:0
+msgid "Draft models"
+msgstr "Draft models"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
 #: field:l10n.es.aeat.mod347.report,fiscalyear_id:0
 msgid "Fiscal Year"
-msgstr ""
+msgstr "Fiscal Year"
 
 #. module: l10n_es_aeat_mod347
 #: view:l10n.es.aeat.mod347.report:0
 msgid "Summary"
-msgstr ""
+msgstr "Summary"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,total_real_state_records:0
-msgid "Real estate records"
-msgstr ""
+msgid "Real state records"
+msgstr "Real state records"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.report,support_type:0
 msgid "Telematics"
-msgstr ""
+msgstr "Telematics"
 
 #. module: l10n_es_aeat_mod347
 #: field:l10n.es.aeat.mod347.report,received_cash_limit:0
 msgid "Received cash Limit (2)"
-msgstr ""
+msgstr "Received cash Limit (2)"
 
 #. module: l10n_es_aeat_mod347
 #: selection:l10n.es.aeat.mod347.partner_record,operation_key:0
 msgid "E - Subvenciones, auxilios y ayudas satisfechas por Ad. Públicas superiores al límite (1)"
-msgstr ""
-
-#. module: l10n_es_aeat_mod347
-#: sql_constraint:account.journal:0
-msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "E - Subvenciones, auxilios y ayudas satisfechas por Ad. Públicas superiores al límite (1)"
 
 #. module: l10n_es_aeat_mod347
 #: selection:account.period,quarter:0
 msgid "Second"
-msgstr ""
+msgstr "Second"
 
 #. module: l10n_es_aeat_mod347
 #: model:ir.model,name:l10n_es_aeat_mod347.model_account_journal
 msgid "Journal"
-msgstr ""
+msgstr "Journal"
 

=== added directory 'l10n_es_aeat_mod347/images'
=== added file 'l10n_es_aeat_mod347/images/l10n_es_aeat_mod347.png'
Binary files l10n_es_aeat_mod347/images/l10n_es_aeat_mod347.png	1970-01-01 00:00:00 +0000 and l10n_es_aeat_mod347/images/l10n_es_aeat_mod347.png	2013-12-27 10:08:05 +0000 differ
=== modified file 'l10n_es_aeat_mod347/mod347.py' (properties changed: -x to +x)
--- l10n_es_aeat_mod347/mod347.py	2013-11-23 01:47:07 +0000
+++ l10n_es_aeat_mod347/mod347.py	2013-12-27 10:08:05 +0000
@@ -22,22 +22,28 @@
 #
 ##############################################################################
 
-__author__ = "Luis Manuel Angueira Blanco (Pexego)"
 
+from openerp.osv import fields
+from openerp.osv import orm
+from openerp.tools.translate import _
 import re
-from osv import osv, fields
-from tools.translate import _
-
-class account_period(osv.osv):
+
+
+class account_period(orm.Model):
     _inherit = "account.period"
 
     _columns = {
-        'quarter':fields.selection( [('first','First'),('second','Second'),('third','Third'),('fourth','Fourth')], 'Quarter'),
+        'quarter': fields.selection([
+                                    ('first', 'First'),
+                                    ('second', 'Second'),
+                                    ('third', 'Third'),
+                                    ('fourth', 'Fourth')
+                                    ], 'Quarter'),
     }
 account_period()
 
 
-class l10n_es_aeat_mod347_report(osv.osv):
+class l10n_es_aeat_mod347_report(orm.Model):
 
     _inherit = "l10n.es.aeat.report"
     _name = "l10n.es.aeat.mod347.report"
@@ -67,8 +73,9 @@
             context = {}
 
         export_obj = self.pool.get("l10n.es.aeat.mod347.export_to_boe")
-        export_obj._export_boe_file(cr, uid, ids, self.browse(cr, uid, ids and ids[0]))
-
+        export_obj._export_boe_file(cr, uid, ids, self.browse(cr,
+                                                              uid,
+                                                              ids and ids[0]))
         return True
 
     def _get_totals(self, cr, uid, ids, name, args, context=None):
@@ -77,17 +84,27 @@
         """
         if context is None:
             context = {}
-      
         res = {}
-
         for report in self.browse(cr, uid, ids, context=context):
             res[report.id] = {
                 'total_partner_records': len(report.partner_record_ids),
-                'total_amount' : sum([record.amount for record in report.partner_record_ids]) or 0.0,
-                'total_cash_amount' : sum([record.cash_amount for record in report.partner_record_ids]) or 0.0,
-                'total_real_state_transmissions_amount' : sum([record.real_state_transmissions_amount for record in report.partner_record_ids]) or 0.,
-                'total_real_state_records' : len(report.real_state_record_ids),
-                'total_real_state_amount' : sum([record.amount for record in report.real_state_record_ids]) or 0,
+                'total_amount': sum([
+                                     record.amount for
+                                     record in
+                                     report.partner_record_ids]) or 0.0,
+                'total_cash_amount': sum([
+                                     record.cash_amount for
+                                     record in
+                                     report.partner_record_ids]) or 0.0,
+                'total_real_state_transmissions_amount': sum([
+                                     record.real_state_transmissions_amount for
+                                     record in
+                                     report.partner_record_ids]) or 0.,
+                'total_real_state_amount': sum([
+                                     record.amount for
+                                     record in
+                                     report.real_state_record_ids]) or 0,
+                'total_real_state_records': len(report.real_state_record_ids),
             }
 
         return res
@@ -95,57 +112,98 @@
     _columns = {
         'contact_name': fields.char("Full Name", size=40),
         'contact_phone': fields.char("Phone", size=9),
-        'group_by_cif': fields.boolean('Group by cif', states={'done':[('readonly',True)]}),
-
-        ##
-        ## Limits
-        'operations_limit': fields.float('Invoiced Limit (1)', digits=(13,2), help="The declaration will include partners with the total of operations over this limit"),
-        'received_cash_limit': fields.float('Received cash Limit (2)', digits=(13,2), help="The declaration will show the total of cash operations over this limit"),
-        'charges_obtp_limit': fields.float('Charges on behalf of third parties Limit (3)', digits=(13,2), help="The declaration will include partners from which we received payments, on behalf of third parties, over this limit"),
-
-        ##
-        ## Totals
-        'total_partner_records': fields.function(_get_totals, string="Partners records", method=True, type='integer', multi="totals_multi"),
-        'total_amount': fields.function(_get_totals, string="Amount", method=True, type='float', multi="totals_multi"),
-        'total_cash_amount': fields.function(_get_totals, string="Cash Amount", method=True, type='float', multi="totals_multi"),
-        'total_real_state_transmissions_amount': fields.function(_get_totals, string="Real Estate Transmissions Amount", method=True, type='float', multi="totals_multi"),
-        'total_real_state_records': fields.function(_get_totals, string="Real estate records", method=True, type='integer', multi="totals_multi"),
-        'total_real_state_amount': fields.function(_get_totals, string="Real Estate Amount", method=True, type='float', multi="totals_multi"),
-
-    }
+        'group_by_cif': fields.boolean('Group by cif'),
+        'only_supplier': fields.boolean('Only Suppliers'),
+        'operations_limit': fields.float('Invoiced Limit (1)',
+                                         digits=(13, 2),
+                                         help="The declaration will include "\
+                                         "partners with the total of "\
+                                         "operations over this limit"),
+        'received_cash_limit': fields.float('Received cash Limit (2)',
+                                            digits=(13, 2),
+                                            help="The declaration will show" \
+                                            "the total of cash operations"\
+                                            " over this limit"),
+        'charges_obtp_limit': fields.float('Charges on behalf of third parties Limit (3)',
+                                           digits=(13, 2),
+                                           help="The declaration will include"\
+                                           " partners from which we received"\
+                                           " payments, on behalf of third "\
+                                           "parties, over this limit"),
+        'total_partner_records': fields.function(_get_totals,
+                                                 string="Partners records",
+                                                 method=True,
+                                                 type='integer',
+                                                 multi="totals_multi"),
+        'total_amount': fields.function(_get_totals,
+                                        string="Amount",
+                                        method=True,
+                                        type='float',
+                                        multi="totals_multi"),
+        'total_cash_amount': fields.function(_get_totals,
+                                             string="Cash Amount",
+                                             method=True,
+                                             type='float',
+                                             multi="totals_multi"),
+        'total_real_state_transmissions_amount': fields.function(_get_totals,
+                                                                 string="Real State Transmissions Amount",
+                                                                 method=True,
+                                                                 type='float',
+                                                                 multi="totals_multi"),
+        'total_real_state_records': fields.function(_get_totals,
+                                                    string="Real state records",
+                                                    method=True,
+                                                    type='integer',
+                                                    multi="totals_multi"),
+        'total_real_state_amount': fields.function(_get_totals,
+                                                   string="Real State Amount",
+                                                   method=True,
+                                                   type='float',
+                                                   multi="totals_multi"),
+        }
+
     _defaults = {
-        ##
-        ## Default limits
-        'operations_limit': lambda *args: 3005.06,
-        'charges_obtp_limit': lambda *args: 300.51,
-        'received_cash_limit': lambda *args: 6000.00,
-
-        ##
-        ## AEAT brings number (previous number), so take defautl value as 349 (need to be changed)
-        'number' : lambda *a: '347'
+                 ## Default limits
+                 'operations_limit': lambda *args: 3005.06,
+                 'charges_obtp_limit': lambda *args: 300.51,
+                 'received_cash_limit': lambda *args: 6000.00,
+                 ## AEAT brings number (previous number), so take default value as 349 (need to be changed)
+                 'number': lambda *a: '347'
     }
 
     def _check_report_lines(self, cr, uid, ids, context=None):
         """checks report lines"""
-        if context is None: context = {}
+        if context is None:
+            context = {}
 
         for item in self.browse(cr, uid, ids, context):
             ## Browse partner record lines to check if all are correct (all fields filled)
             for partner_record in item.partner_record_ids:
                 if not partner_record.partner_state_code:
-                    raise osv.except_osv(_('Error!'), _("All partner state code field must be filled.\nPartner: %s (%s)") % ( partner_record.partner_id.name, partner_record.partner_id.id ) )
+                    raise orm.except_orm(
+                                         _('Error!'), 
+                                         _("All partner state code field must be filled.\nPartner: %s (%s)") %
+                                         (partner_record.partner_id.name,
+                                           partner_record.partner_id.id))
                 if not partner_record.partner_vat:
-                    raise osv.except_osv(_('Error!'), _("All partner vat number field must be filled.\nPartner: %s (%s)") % ( partner_record.partner_id.name, partner_record.partner_id.id ) )
+                    raise orm.except_orm(
+                                         _('Error!'), 
+                                         _("All partner vat number field must be filled.\nPartner: %s (%s)") %
+                                         (partner_record.partner_id.name,
+                                          partner_record.partner_id.id))
 
             for real_state_record in item.real_state_record_ids:
                 if not real_state_record.state_code:
-                    raise osv.except_osv(_('Error!'), _("All real estate records state code field must be filled."))
+                    raise orm.except_orm(
+                                         _('Error!'), 
+                                         _("All real state records state code field must be filled."))
 
         return True
 
     def check_report(self, cr, uid, ids, context=None):
         """Different check out in report"""
-        if context is None: context = {}
+        if context is None:
+            context = {}
 
         self._check_report_lines(cr, uid, ids, context)
 
@@ -153,7 +211,8 @@
 
     def action_confirm(self, cr, uid, ids, context=None):
         """set to done the report and check its records"""
-        if context is None: context = {}
+        if context is None:
+            context = {}
 
         self.check_report(cr, uid, ids, context)
         self.write(cr, uid, ids, {'state': 'done'})
@@ -163,7 +222,7 @@
 l10n_es_aeat_mod347_report()
 
 
-class l10n_es_aeat_mod347_partner_record(osv.osv):
+class l10n_es_aeat_mod347_partner_record(orm.Model):
     """
     Represents a partner record for the 347 model.
     """
@@ -171,22 +230,21 @@
     _description = 'Partner Record'
     _rec_name = "partner_vat"
 
-    def _get_quarter_totals(self, cr, uid, ids, field_name, arg, context = None):
-        
+    def _get_quarter_totals(self, cr, uid, ids, field_name, arg, context=None):
+
         if context is None:
-            context={}
-
+            context = {}
         result = {}
         for record  in self.browse(cr, uid, ids, context):
-            result[record.id] ={
-            'first_quarter':0,
-            'first_quarter_real_state_transmission_amount':0,
+            result[record.id] = {
+            'first_quarter': 0,
+            'first_quarter_real_state_transmission_amount': 0,
             'second_quarter': 0,
-            'second_quarter_real_state_transmission_amount':0,
+            'second_quarter_real_state_transmission_amount': 0,
             'third_quarter': 0,
-            'third_quarter_real_state_transmission_amount':0,
+            'third_quarter_real_state_transmission_amount': 0,
             'fourth_quarter': 0,
-            'fourth_quarter_real_state_transmission_amount':0,
+            'fourth_quarter_real_state_transmission_amount': 0,
             }
             for invoice in record.invoice_record_ids:
                 if invoice.invoice_id.period_id.quarter == 'first':
@@ -198,19 +256,20 @@
                 elif invoice.invoice_id.period_id.quarter == 'fourth':
                     result[record.id]['fourth_quarter'] += invoice.amount
 
-        return result                                        
+        return result
 
-    def _get_lines( self, cr, uid, ids, context ):
+    def _get_lines(self, cr, uid, ids, context):
         invoice_record_obj = self.pool.get('l10n.es.aeat.mod347.invoice_record')
-
-        res = []        
+        res = []
         for invoice_record in invoice_record_obj.browse(cr, uid, ids, context):
-            res.append( invoice_record.partner_record_id.id )
+            res.append(invoice_record.partner_record_id.id)
         return list(set(res))
-                        
-        
+
     _columns = {
-        'report_id': fields.many2one('l10n.es.aeat.mod347.report', 'AEAT 347 Report', ondelete="cascade", select=1),
+        'report_id': fields.many2one('l10n.es.aeat.mod347.report',
+                                     'AEAT 347 Report',
+                                     ondelete="cascade",
+                                     select=1),
         'operation_key': fields.selection([
                     ('A', u'A - Adquisiciones de bienes y servicios superiores al límite (1)'),
                     ('B', u'B - Entregas de bienes y servicios superiores al límite (1)'),
@@ -222,55 +281,85 @@
                 ], 'Operation Key'),
         'partner_id': fields.many2one('res.partner', 'Partner', required=True),
         'partner_vat': fields.char('VAT number', size=9),
-        'representative_vat': fields.char('L.R. VAT number', size=9, help="Legal Representative VAT number"),
+        'representative_vat': fields.char('L.R. VAT number', size=9,
+                                          help="Legal Representative VAT number"),
         'partner_country_code': fields.char('Country Code', size=2),
-        'partner_state_code': fields.char('State Code', size=2),        
-        'first_quarter': fields.function(_get_quarter_totals, string="First Quarter",
-                method=True, type='float', multi="quarter_multi",digits=(13,2),
-                store= { 
-                    'l10n.es.aeat.mod347.invoice_record': (_get_lines, ['amount'] , 10 )
-                }),
-        'first_quarter_real_state_transmission_amount':fields.function(_get_quarter_totals, string="First Quarter Real Estate Transmission Amount",
-                method=True, type='float', multi="quarter_multi" ,digits=(13,2),
-                store= { 
-                    'l10n.es.aeat.mod347.invoice_record': (_get_lines, ['amount'] , 10 )
-                }
-                ),
-        'second_quarter': fields.function(_get_quarter_totals, string="Second Quarter", method=True,
-                type='float', multi="quarter_multi", digits=(13,2), 
-                store= { 
-                    'l10n.es.aeat.mod347.invoice_record': (_get_lines, ['amount'] , 10 )
-                }),
-        'second_quarter_real_state_transmission_amount':fields.function(_get_quarter_totals, string="Second Quarter Real Estate Transmission Amount",
-                method=True, type='float', multi="quarter_multi",digits=(13,2), store= { 
-                    'l10n.es.aeat.mod347.invoice_record': (_get_lines, ['amount'] , 10 )
-                }),
-        'third_quarter': fields.function(_get_quarter_totals, string="Third Quarter", method=True, type='float',
-                multi="quarter_multi",digits=(13,2), store= { 
-                    'l10n.es.aeat.mod347.invoice_record': (_get_lines, ['amount'] , 10 )
-                }),
-        'third_quarter_real_state_transmission_amount':fields.function(_get_quarter_totals, string="Third Quarter Real Estate Transmission Amount",
-                method=True, type='float', multi="quarter_multi",digits=(13,2), store= { 
-                    'l10n.es.aeat.mod347.invoice_record': (_get_lines, ['amount'] , 10 )
-                } ),
-        'fourth_quarter': fields.function(_get_quarter_totals, string="Fourth Quarter",
-                method=True, type='float', multi="quarter_multi",digits=(13,2), store= { 
-                    'l10n.es.aeat.mod347.invoice_record': (_get_lines, ['amount'] , 10 )
-                }),
-        'fourth_quarter_real_state_transmission_amount':fields.function(_get_quarter_totals, string="Fourth Quarter Real Estate Transmossion Amount",
-                method=True, type='float', multi="quarter_multi",digits=(13,2), store= { 
-                    'l10n.es.aeat.mod347.invoice_record': (_get_lines, ['amount'] , 10 )
-                }),        
+        'partner_state_code': fields.char('State Code', size=2),
+        'first_quarter': fields.function(_get_quarter_totals,
+                string="First Quarter",
+                method=True, type='float', 
+                multi="quarter_multi", digits=(13, 2),
+                store={
+                    'l10n.es.aeat.mod347.invoice_record': (_get_lines, ['amount'], 10)
+                    }),
+        'first_quarter_real_state_transmission_amount': fields.function(_get_quarter_totals,
+                string="First Quarter Real State Transmission Amount",
+                method=True, type='float',
+                multi="quarter_multi", digits=(13, 2),
+                store={
+                    'l10n.es.aeat.mod347.invoice_record': (_get_lines, ['amount'], 10)
+                    }),
+        'second_quarter': fields.function(_get_quarter_totals,
+                string="Second Quarter",
+                method=True, type='float',
+                multi="quarter_multi", digits=(13, 2),
+                store={
+                    'l10n.es.aeat.mod347.invoice_record': (_get_lines, ['amount'], 10)
+                    }),
+        'second_quarter_real_state_transmission_amount': fields.function(_get_quarter_totals,
+                string="Second Quarter Real State Transmission Amount",
+                method=True, type='float', multi="quarter_multi", digits=(13, 2),
+                store={
+                    'l10n.es.aeat.mod347.invoice_record': (_get_lines, ['amount'], 10)
+                    }),
+        'third_quarter': fields.function(_get_quarter_totals,
+                string="Third Quarter",
+                method=True, type='float',
+                multi="quarter_multi", digits=(13, 2),
+                store={
+                    'l10n.es.aeat.mod347.invoice_record': (_get_lines, ['amount'], 10)
+                    }),
+        'third_quarter_real_state_transmission_amount': fields.function(_get_quarter_totals,
+                string="Third Quarter Real State Transmission Amount",
+                method=True, type='float',
+                multi="quarter_multi", digits=(13, 2),
+                store={
+                    'l10n.es.aeat.mod347.invoice_record': (_get_lines, ['amount'], 10)
+                    }),
+        'fourth_quarter': fields.function(_get_quarter_totals,
+                string="Fourth Quarter",
+                method=True, type='float',
+                multi="quarter_multi", digits=(13, 2),
+                store={
+                    'l10n.es.aeat.mod347.invoice_record': (_get_lines, ['amount'], 10)
+                    }),
+        'fourth_quarter_real_state_transmission_amount': fields.function(_get_quarter_totals,
+                string="Fourth Quarter Real State Transmossion Amount",
+                method=True, type='float',
+                multi="quarter_multi", digits=(13, 2),
+                store={
+                    'l10n.es.aeat.mod347.invoice_record': (_get_lines, ['amount'], 10)
+                    }),
         'amount': fields.float('Operations amount', digits=(13,2)),
         'cash_amount': fields.float('Received cash amount', digits=(13,2)),
-        'real_state_transmissions_amount': fields.float('Real Estate Transmisions amount', digits=(13,2)),
-
-        'insurance_operation': fields.boolean('Insurance Operation', help="Only for insurance companies. Set to identify insurance operations aside from the rest."),
-        'bussiness_real_state_rent': fields.boolean('Bussiness Real Estate Rent', help="Set to identify real estate rent operations aside from the rest. You'll need to fill in the real estate info only when you are the one that receives the money."),
-        'origin_fiscalyear_id': fields.many2one('account.fiscalyear', 'Origin fiscal year', help="Origin cash operation fiscal year"),
-        'invoice_record_ids': fields.one2many('l10n.es.aeat.mod347.invoice_record', 'partner_record_id', 'Invoice records',
-                                                      states = {'done': [('readonly', True)]}),
-        
+        'real_state_transmissions_amount': fields.float('Real State Transmisions amount',
+                                                        digits=(13, 2)),
+
+        'insurance_operation': fields.boolean('Insurance Operation',
+                        help="Only for insurance companies. Set to identify"\
+                             " insurance operations aside from the rest."),
+        'bussiness_real_state_rent': fields.boolean('Bussiness Real State Rent',
+                        help="Set to identify real state rent operations"\
+                                " aside from the rest. You'll need to fill"\
+                                " in the real state info only when you are"\
+                                " the one that receives the money."),
+        'origin_fiscalyear_id': fields.many2one('account.fiscalyear',
+                                                'Origin fiscal year',
+                                help="Origin cash operation fiscal year"),
+        'invoice_record_ids': fields.one2many('l10n.es.aeat.mod347.invoice_record',
+                                              'partner_record_id',
+                                              'Invoice records'),
+
     }
     _defaults = {
         'report_id': lambda self, cr, uid, context: context.get('report_id', None),
@@ -278,25 +367,32 @@
 
     def on_change_partner_id(self, cr, uid, ids, partner_id):
         """
-        Loads some partner data (country and vat) when the selected partner changes.
+        Loads some partner data (country and vat)
+        when the selected partner changes.
         """
         partner_vat = ''
         partner_country_code = ''
         partner_state_code = ''
         if partner_id:
             partner = self.pool.get('res.partner').browse(cr, uid, partner_id)
-
-            #
             # Get the default invoice address of the partner
-            #
             address = None
-            address_ids = self.pool.get('res.partner').address_get(cr, uid, [partner.id], ['invoice', 'default'])
+            address_ids = self.pool.get('res.partner').address_get(cr,
+                                                                uid,
+                                                                [partner.id],
+                                                                ['invoice', 'default'])
             if address_ids.get('invoice'):
-                address = self.pool.get('res.partner.address').browse(cr, uid, address_ids.get('invoice'))
+                address = self.pool.get('res.partner.address').browse(cr,
+                                                                uid,
+                                                                address_ids.get('invoice'))
             elif address_ids.get('default'):
-                address = self.pool.get('res.partner.address').browse(cr, uid, address_ids.get('default'))
+                address = self.pool.get('res.partner.address').browse(
+                                                                cr,
+                                                                uid,
+                                                                address_ids.get('default'))
 
-            partner_vat = partner.vat and re.match("(ES){0,1}(.*)", partner.vat).groups()[1]
+            partner_vat = partner.vat and re.match("(ES){0,1}(.*)",
+                                                   partner.vat).groups()[1]
             partner_state_code = address.state_id and address.state_id.code or ''
             partner_country_code = address.country_id and address.country_id.code or ''
 
@@ -310,40 +406,43 @@
 l10n_es_aeat_mod347_partner_record()
 
 
-class l10n_es_aeat_mod347_report_add_partner_records(osv.osv):
+class l10n_es_aeat_mod347_report_add_partner_records(orm.Model):
     """
     Extends the report to add the partner records
     """
     _inherit = 'l10n.es.aeat.mod347.report'
     _columns = {
-        'partner_record_ids': fields.one2many('l10n.es.aeat.mod347.partner_record', 'report_id', 'Partner Records',
-                            states = {'done': [('readonly', True)]}),
+        'partner_record_ids': fields.one2many('l10n.es.aeat.mod347.partner_record',
+                                              'report_id', 'Partner Records'),
     }
 l10n_es_aeat_mod347_report_add_partner_records()
 
 
-class l10n_es_aeat_mod347_real_state_record(osv.osv):
+class l10n_es_aeat_mod347_real_state_record(orm.Model):
     """
-    Represents a real estate record for the 347 model.
+    Represents a real state record for the 347 model.
     """
     _name = 'l10n.es.aeat.mod347.real_state_record'
-    _description = 'Real Estate Record'
+    _description = 'Real State Record'
     _rec_name = "reference"
 
     _columns = {
-        'report_id': fields.many2one('l10n.es.aeat.mod347.report', 'AEAT 347 Report', ondelete="cascade", select=1),
+        'report_id': fields.many2one('l10n.es.aeat.mod347.report',
+                                     'AEAT 347 Report', ondelete="cascade",
+                                     select=1),
 
         'partner_id': fields.many2one('res.partner', 'Partner', required=True),
         'partner_vat': fields.char('VAT number', size=32),
-        'representative_vat': fields.char('L.R. VAT number', size=32, help="Legal Representative VAT number"),
+        'representative_vat': fields.char('L.R. VAT number', size=32,
+                                    help="Legal Representative VAT number"),
 
-        'amount': fields.float('Amount', digits=(13,2)),
+        'amount': fields.float('Amount', digits=(13, 2)),
         'situation': fields.selection([
                     ('1', '1 - Spain but Basque Country and Navarra'),
                     ('2', '2 - Basque Country and Navarra'),
                     ('3', '3 - Spain, without catastral reference'),
                     ('4', '4 - Foreign'),
-                ], 'Real estate Situation'),
+                ], 'Real state Situation'),
         'reference': fields.char('Catastral Reference', size=25),
         # 'address_id': fields.many2one('res.partner.address', 'Address'),
         'address_type': fields.char('Address type', size=5),
@@ -365,7 +464,8 @@
         'stairway': fields.char('Stairway', size=3),
         'floor': fields.char('Floor', size=3),
         'door': fields.char('Door', size=3),
-        'complement': fields.char('Complement', size=40, help="Complement (urbanization, industrial park...)"),
+        'complement': fields.char('Complement', size=40,
+                        help="Complement (urbanization, industrial park...)"),
         'city': fields.char('City', size=30),
         'township': fields.char('Township', size=30),
         'township_code': fields.char('Township Code', size=5),
@@ -373,51 +473,55 @@
         'postal_code': fields.char('Postal code', size=5),
     }
     _defaults = {
-        'report_id': lambda self, cr, uid, context: context.get('report_id', None),
-        'partner_id': lambda self, cr, uid, context: context.get('partner_id', None),
-        'partner_vat': lambda self, cr, uid, context: context.get('partner_vat', None),
-        'representative_vat': lambda self, cr, uid, context: context.get('representative_vat', None),
+        'report_id': lambda self, cr, uid, context: context.get('report_id',
+                                                                None),
+        'partner_id': lambda self, cr, uid, context: context.get('partner_id',
+                                                                 None),
+        'partner_vat': lambda self, cr, uid, context: context.get('partner_vat',
+                                                                  None),
+        'representative_vat': lambda self, cr, uid, context: context.get('representative_vat',
+                                                                         None),
     }
 
     def on_change_partner_id(self, cr, uid, ids, partner_id):
         """
-        Loads some partner data (country and vat) when the selected partner changes.
+        Loads some partner data (country and vat)
+        when the selected partner changes.
         """
         partner_vat = ''
         if partner_id:
             partner = self.pool.get('res.partner').browse(cr, uid, partner_id)
-            partner_vat = partner.vat and re.match("(ES){0,1}(.*)", partner.vat).groups()[1]
+            partner_vat = partner.vat and re.match("(ES){0,1}(.*)",
+                                                   partner.vat).groups()[1]
 
         return  {
-            'value': {
-                    'partner_vat': partner_vat
+            'value': {'partner_vat': partner_vat}
             }
-        }
 l10n_es_aeat_mod347_real_state_record()
 
 
-class l10n_es_aeat_mod347_report_add_real_state_records(osv.osv):
+class l10n_es_aeat_mod347_report_add_real_state_records(orm.Model):
     """
-    Extends the report to add the real estate records.
+    Extends the report to add the real state records.
     """
     _inherit = 'l10n.es.aeat.mod347.report'
     _columns = {
-        'real_state_record_ids': fields.one2many('l10n.es.aeat.mod347.real_state_record', 'report_id', 'Real Estate Records',
-                            states = {'done': [('readonly', True)]}),
+        'real_state_record_ids': fields.one2many('l10n.es.aeat.mod347.real_state_record',
+                                                 'report_id', 'Real State Records'),
     }
 l10n_es_aeat_mod347_report_add_real_state_records()
 
 
-class l10n_es_aeat_mod347_partner_record_add_real_state_records(osv.osv):
+class l10n_es_aeat_mod347_partner_record_add_real_state_records(orm.Model):
     """
-    Extends the partner_records to add the real estate records.
+    Extends the partner_records to add the real state records.
     """
     _inherit = 'l10n.es.aeat.mod347.partner_record'
 
-
     def _get_real_state_record_ids(self, cr, uid, ids, field_name, args, context=None):
         """
-        Get the real estate records from this record parent report for this partner.
+        Get the real state records from this record
+        parent report for this partner.
         """
         if context is None:
             context = {}
@@ -429,12 +533,14 @@
                 res[partner_record.id] = real_state_record_obj.search(cr, uid, [
                             ('report_id', '=', partner_record.report_id.id),
                             ('partner_id', '=', partner_record.partner_id.id),
-                        ])
+                            ])
         return res
 
-    def _set_real_state_record_ids(self, cr, uid, id, field_name, values, args=None, context=None):
+    def _set_real_state_record_ids(self, cr, uid, field_name, values,
+                                   args=None, context=None):
         """
-        Set the real estate records from this record parent report for this partner.
+        Set the real state records from this record 
+        parent report for this partner.
         """
         if context is None:
             context = {}
@@ -454,12 +560,12 @@
         'real_state_record_ids': fields.function(_get_real_state_record_ids,
                     fnct_inv=_set_real_state_record_ids, method=True,
                     obj="l10n.es.aeat.mod347.real_state_record",
-                    type="one2many", string='Real Estate Records', store=False),
+                    type="one2many", string='Real State Records', store=False),
     }
 l10n_es_aeat_mod347_partner_record_add_real_state_records()
 
 
-class l10n_es_aeat_mod347_invoice_record(osv.osv):
+class l10n_es_aeat_mod347_invoice_record(orm.Model):
     """
     Represents an invoice record.
     """
@@ -467,18 +573,24 @@
     _description = 'Invoice Record'
 
     _columns = {
-        'partner_record_id': fields.many2one('l10n.es.aeat.mod347.partner_record', 'Partner record', required=True, ondelete="cascade", select=1),
-        'invoice_id': fields.many2one('account.invoice', 'Invoice', required=True, ondelete="cascade"),
+        'partner_record_id': fields.many2one('l10n.es.aeat.mod347.partner_record',
+                                             'Partner record',
+                                             required=True, ondelete="cascade",
+                                             select=1),
+        'invoice_id': fields.many2one('account.invoice',
+                                      'Invoice',
+                                      required=True, ondelete="cascade"),
         'date': fields.date('Date'),
         'amount': fields.float('Amount'),
     }
     _defaults = {
-        'partner_record_id': lambda self, cr, uid, context: context.get('partner_record_id', None),
+        'partner_record_id': lambda self, cr, uid, context: context.get('partner_record_id',
+                                                                        None),
     }
 l10n_es_aeat_mod347_invoice_record()
 
 
-class l10n_es_aeat_mod347_cash_record(osv.osv):
+class l10n_es_aeat_mod347_cash_record(orm.Model):
     """
     Represents a payment record.
     """
@@ -486,28 +598,34 @@
     _description = 'Cash Record'
 
     _columns = {
-        'partner_record_id': fields.many2one('l10n.es.aeat.mod347.partner_record', 'Partner record', required=True , ondelete="cascade", select=1),
-        'move_line_id': fields.many2one('account.move.line', 'Account move line', required=True, ondelete="cascade"),
+        'partner_record_id': fields.many2one('l10n.es.aeat.mod347.partner_record',
+                                             'Partner record',
+                                             required=True,
+                                             ondelete="cascade", select=1),
+        'move_line_id': fields.many2one('account.move.line',
+                                        'Account move line',
+                                        required=True, ondelete="cascade"),
         'date': fields.date('Date'),
         'amount': fields.float('Amount'),
     }
     _defaults = {
-        'partner_record_id': lambda self, cr, uid, context: context.get('partner_record_id', None),
+        'partner_record_id': lambda self, cr, uid, context: context.get('partner_record_id',
+                                                                        None),
     }
 l10n_es_aeat_mod347_cash_record()
 
 
-class l10n_es_aeat_mod347_partner_record_add_cash_records(osv.osv):
+class l10n_es_aeat_mod347_partner_record_add_cash_records(orm.Model):
     """
     Extends the partner record to add the detail of invoices
     """
     _inherit = 'l10n.es.aeat.mod347.partner_record'
 
     _columns = {
-        'cash_record_ids': fields.one2many('l10n.es.aeat.mod347.cash_record', 'partner_record_id', 'Payment records',
-                            states = {'done': [('readonly', True)]}),
+        'cash_record_ids': fields.one2many('l10n.es.aeat.mod347.cash_record',
+                                           'partner_record_id',
+                                           'Payment records'),
     }
 l10n_es_aeat_mod347_partner_record_add_cash_records()
 
-
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_es_aeat_mod347/mod347_view.xml' (properties changed: -x to +x)
--- l10n_es_aeat_mod347/mod347_view.xml	2013-11-23 01:47:07 +0000
+++ l10n_es_aeat_mod347/mod347_view.xml	2013-12-27 10:08:05 +0000
@@ -2,9 +2,9 @@
 <openerp>
     <data>
 
-        <!-- ################################
-        ### AEAT MODEL 347 PARTNER RECORD ###
-        ################################# -->
+        <!-- ##########################################
+                   AEAT MODEL 347 PARTNER RECORD 
+             ########################################## -->
         <!-- Tree view -->
         <record model="ir.ui.view" id="view_l10n_es_aeat_mod347_partner_record_tree">
             <field name="name">l10n.es.aeat.mod347.partner_record.tree</field>
@@ -30,66 +30,90 @@
             <field name="model">l10n.es.aeat.mod347.partner_record</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Partner Record">
+                <form string="Partner Record" version="7.0">
                     <field name="report_id" invisible="1"/>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Partner info">
-                            <group colspan="4">
-                                <field name="partner_id" on_change="on_change_partner_id(partner_id)" required="1" select="1" colspan="4"/>
-                                <field name="partner_vat" select="1"/>
-                                <field name="representative_vat" select="2"/>
-                                <field name="partner_state_code"/>
-                                <field name="partner_country_code"/>
-                                <field name="operation_key" select="2" colspan="4"/>
-                            </group>
-                            <group colspan="4" col="6">
-                                <field name="amount"/>
-                                <field name="cash_amount"/>
-                                <field name="origin_fiscalyear_id"/>
-                                <field name="real_state_transmissions_amount" />
-                            </group>
-                            <group colspan="4" col="4">
-                                <field name="first_quarter"/>
-                                <field name="first_quarter_real_state_transmission_amount"/>
-                                <field name="second_quarter"/>
-                                <field name="second_quarter_real_state_transmission_amount"/>
-                                <field name="third_quarter"/>
-                                <field name="third_quarter_real_state_transmission_amount"/>
-                                <field name="fourth_quarter"/>
-                                <field name="fourth_quarter_real_state_transmission_amount"/>
+                            <group>
+                                <group>
+                                	<field name="partner_id" on_change="on_change_partner_id(partner_id)" required="1" select="1"/>
+                                	<field name="partner_vat" select="1"/>
+                                	<field name="representative_vat" select="2"/>
+                                </group>
+                                <group>
+                                	<field name="partner_state_code"/>
+                                	<field name="partner_country_code"/>
+                                	<field name="operation_key" select="2"/>
+                                </group>
+                            </group>
+                            <group>
+                            	<group>
+                                	<field name="origin_fiscalyear_id"/>
+                                	<field name="amount"/>
+                                </group>
+                                <group>
+                                	<field name="cash_amount"/>
+                                	<field name="real_state_transmissions_amount"/>
+                                </group>
+                            </group>
+                            <group >
+                            	<group>
+                                	<field name="first_quarter"/>
+                                	<field name="second_quarter"/>
+                                	<field name="third_quarter"/>
+                                	<field name="fourth_quarter"/>
+                                </group>
+                                <group>
+                                	<field name="first_quarter_real_state_transmission_amount"/>
+                                	<field name="second_quarter_real_state_transmission_amount"/>
+                                	<field name="third_quarter_real_state_transmission_amount"/>
+                                	<field name="fourth_quarter_real_state_transmission_amount"/>
+                                </group>
                             </group>
 
-                            <group colspan="4">
-                                <field name="insurance_operation"/>
-                                <field name="bussiness_real_state_rent"/>
+                            <group>
+                            	<group>
+                                	<field name="insurance_operation"/>
+                                </group>
+                                <group>
+                                	<field name="bussiness_real_state_rent"/>
+                                </group>
                             </group>
                         </page>
-                        <page string="Real estate info" attrs="{'invisible': [('bussiness_real_state_rent','=',False)]}">
+                        <page string="Real state info" attrs="{'invisible': [('bussiness_real_state_rent','=',False)]}">
                             <field name="real_state_record_ids" nolabel="1" context="{'report_id': report_id, 'partner_id': partner_id, 'partner_vat': partner_vat, 'representative_vat': representative_vat}"/>
                         </page>
                         <page string="Details">
-                            <field name="invoice_record_ids" nolabel="1" context="{'partner_record_id': active_id}" readonly="True">
+                            <field name="invoice_record_ids" context="{'partner_record_id': active_id}" readonly="True">
                                 <tree string="Invoice records">
                                     <field name="invoice_id" select="1"/>
                                     <field name="date" select="1"/>
                                     <field name="amount" select="1"/>
                                 </tree>
-                                <form string="Invoice record">
-                                    <field name="invoice_id" select="1" readonly="True"/>
-                                    <field name="date" select="1" readonly="True"/>
-                                    <field name="amount" select="1" readonly="True"/>
+                                <form string="Invoice record" version="7.0">
+                                	<group>
+                                    	<field name="invoice_id" select="1" readonly="True"/>
+                                    	<field name="date" select="1" readonly="True"/>
+                                    </group>
+                                    <group>
+                                    	<field name="amount" select="1" readonly="True"/>
+                                    </group>
                                 </form>
                             </field>
-                            <field name="cash_record_ids" nolabel="1" context="{'partner_record_id': active_id}" readonly="True">
+                            <field name="cash_record_ids" context="{'partner_record_id': active_id}" readonly="True">
                                 <tree string="Cash records">
                                     <field name="move_line_id" select="1"/>
                                     <field name="date" select="1"/>
                                     <field name="amount" select="1"/>
                                 </tree>
-                                <form string="Cash record">
-                                    <field name="move_line_id" select="1" readonly="True"/>
-                                    <field name="date" select="1" readonly="True"/>
-                                    <field name="amount" select="1" readonly="True"/>
+                                <form string="Cash record" version="7.0">
+                                	<group>
+                                    	<field name="move_line_id" select="1" readonly="True"/>
+                                    	<field name="date" select="1" readonly="True"/>
+                                    </group>
+                                    <group>
+                                    	<field name="amount" select="1" readonly="True"/>
+                                    </group>
                                 </form>
                             </field>
                         </page>
@@ -109,7 +133,7 @@
             <field name="model">l10n.es.aeat.mod347.real_state_record</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Real Estate Records" colors="">
+                <tree string="Real State Records" colors="">
                     <field name="partner_vat" select="1"/>
                     <field name="partner_id" select="1"/>
                     <field name="reference" select="2"/>
@@ -128,47 +152,62 @@
             <field name="model">l10n.es.aeat.mod347.real_state_record</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Real Estate Record">
+                <form string="Real State Record" version="7.0">
                     <field name="report_id" invisible="1"/>
-                    <group string="Partner info" colspan="4">
-                        <field name="partner_id" on_change="on_change_partner_id(partner_id)" required="1" select="1" colspan="4"/>
-                        <field name="partner_vat" select="1"/>
-                        <field name="representative_vat" select="2"/>
-                    </group>
-                    <group string="Real estate info" colspan="4">
-                        <field name="amount"/>
-                        <newline/>
-                        <field name="situation" colspan="4"/>
-                        <field name="reference"/>
-                    </group>
-                    <group string="Real estate address" colspan="4">
-                        <group colspan="4" col="6">
+                    <group string="Partner info">
+                    	<group>
+                        	<field name="partner_id" on_change="on_change_partner_id(partner_id)" required="1" select="1"/>
+                        </group>
+                        <group>
+                        	<field name="partner_vat" select="1"/>
+                        	<field name="representative_vat" select="2"/>
+                        </group>
+                    </group>
+                    <group string="Real state info">
+                    	<group>
+                        	<field name="situation"/>
+                        	<field name="reference"/>
+                        </group>
+                        <group>
+                        	<field name="amount"/>
+                        </group>
+                    </group>
+                    <group string="Real state address">
+                        <group>
                             <field name="address_type"/>
                             <field name="address"/>
                         </group>
-                        <group colspan="4" col="6">
+                        <group>
                             <field name="number_type"/>
                             <field name="number"/>
                             <field name="number_calification"/>
                         </group>
-                        <group colspan="4" col="10">
-                            <field name="block"/>
-                            <field name="portal"/>
-                            <field name="stairway"/>
-                            <field name="floor"/>
-                            <field name="door"/>
+                        <group>
+                        	<group>
+                            	<field name="block"/>
+                            	<field name="floor"/>
+                            	<field name="stairway"/>
+                            </group>
+                            <group>
+                            	<field name="portal"/>
+                            	<field name="door"/>
+                            </group>
+                           
                         </group>
-                        <group colspan="4">
+                        <group>
                             <field name="complement"/>
-                            <field name="city"/>
-                        </group>
-                        <group colspan="4" col="8">
-                            <field name="township"/>
-                            <field name="township_code"/>
-                            <field name="state_code"/>
                             <field name="postal_code"/>
                         </group>
-                    </group>
+                        	<group>
+                            	<field name="city"/>
+                            	<field name="state_code"/>
+                            	
+                            </group>
+                            <group>
+                            	<field name="township"/>
+                            	<field name="township_code"/>
+                            </group>
+                        </group>
                 </form>
             </field>
         </record>
@@ -179,126 +218,145 @@
         ### AEAT MODEL 347 ###
         ################## -->
         <!-- Tree view -->
+
+
         <record id="view_l10n_es_aeat_mod347_report_tree" model="ir.ui.view">
             <field name="name">AEAT Model 347 (tree)</field>
             <field name="model">l10n.es.aeat.mod347.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="AEAT 347 Reports">
-                    <field name="number"/>
+                	<field name="number"/>
                     <field name="company_id"/>
                     <field name="fiscalyear_id"/>
                     <field name="type"/>
                     <field name="previous_number"/>
                     <field name="support_type"/>
+                    <field name="state"/>
+                    
                 </tree>
             </field>
         </record>
-
         <!-- Form view -->
         <record id="view_l10n_es_aeat_mod347_report_form" model="ir.ui.view">
             <field name="name">AEAT Model 347 (form)</field>
             <field name="model">l10n.es.aeat.mod347.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="AEAT 347 Report">
-                    <group string="Declaration" colspan="4">
-                        <field name="company_id" on_change="on_change_company_id(company_id)" required="1" select="1"/>
-                        <field name="fiscalyear_id" select="1"/>
-                        <field name="number"/>
-                        <field name="support_type"/>
+                <form string="AEAT 347 Report" version="7.0">
+                    <header>
+                    	<button name="button_calculate" type="object" string="Calculate" states="draft"/>
+                        <button name="button_recalculate" type="object" string="Recalculate" states="calculating,calculated"/>
+                        <button name="button_export" type="object" string="Export to BOE" states="done"/>
+                        <button name="confirm" string="Confirm" type="workflow" states="calculated" />
+                        <button name="cancel" string="Cancel" type="workflow" states="calculated,done" />
+                        <button name="action_recover" string="Draft" type="object" states="canceled" />
+                        <field name="state" select="2" widget="statusbar"
+                            statusbar_visible="draft,calculated,done" statusbar_colors='{"canceled":"red","draft,calculated":"blue"}' />
+                     </header>
+                   <sheet> 
+                    <group string="Declaration">
+                    	<group>
+                        	<group>
+                        		<field name="company_id" on_change="on_change_company_id(company_id)" required="1" select="1"/>
+                        		<field name="fiscalyear_id" select="1"/>
+                        	</group>
+                        	<group>
+                        		<field name="number"/>
+                        		<field name="support_type"/>
+                        	</group>
+                        </group>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="General">
-                            <group string="Identification" colspan="4">
-                                <field name="company_vat" required="1"/>
-                                <field name="contact_phone"/>
-                                <field name="contact_name" colspan="4"/>
-                                <field name="representative_vat"/>
-                            </group>
-                            <group string="Susbtitutive/complementary declaration" colspan="4">
-                                <field name="type"/>
-                                <field name="previous_number"/>
-                            </group>
-                            <group string="Summary" colspan="4">
-                                <field name="total_partner_records"/>
-                                <field name="total_amount"/>
-                                <field name="total_real_state_records"/>
-                                <field name="total_real_state_amount"/>
-                            </group>
-                            <group string="Calculation" colspan="4">
-                                <field name="operations_limit"/>
-                                <field name="received_cash_limit"/>
-                                <field name="charges_obtp_limit"/>
-                                <field name="group_by_cif"/>
-                            </group>
-                            <group colspan="4">
-                                <field name="state" select="2" readonly="1"/>
+                            <group>
+                            	<group string="Identification" >
+                                	<field name="company_vat" required="1"/>
+                                	<field name="contact_phone"/>
+                                	<field name="contact_name" />
+                                	<field name="representative_vat"/>
+                            	</group>
+                            	<group string="Calculation" >
+                                	<field name="operations_limit" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                	<field name="received_cash_limit" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                	<field name="charges_obtp_limit" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                	<field name="group_by_cif" attrs="{'readonly':[('state','!=','draft')]}" />
+                                	<field name="only_supplier" attrs="{'readonly':[('state','!=','draft')]}" />
+                            	</group>
+
+                            </group>
+                                <group>	
+                                <group string="Susbtitutive/complementary declaration">
+                                	<field name="type"/>
+                                	<field name="previous_number"/>
+                            	</group>
+                            
+                            	<group string="Summary">
+                                	<field name="total_partner_records"/>
+                                	<field name="total_amount"/>
+                                	<field name="total_real_state_records"/>
+                                	<field name="total_real_state_amount"/>
+                            	</group>
+
+                            </group>
+                            
+                            <group>
                                 <field name="calculation_date" select="2" readonly="1"/>
                             </group>
-                            <group colspan="4" col="10">
-                                <button name="button_calculate"
-                                        type="object"
-                                        string="Calculate"
-                                        states="draft"
-                                        icon="gtk-execute"/>
-                                <button name="button_recalculate"
-                                        type="object"
-                                        string="Recalculate"
-                                        states="calculating,calculated"
-                                        icon="gtk-execute"/>
-                                <button name="button_export"
-                                        type="object"
-                                        string="Export to BOE"
-                                        states="done"
-                                        icon="gtk-execute"/>
-                                <button name="confirm" string="Confirm" type="workflow" states="calculated" icon="gtk-ok"/>
-                                <button name="cancel" string="Cancel" type="workflow" states="calculated,done" icon="gtk-cancel"/>
-                                <button name="action_recover" string="Draft" type="object" states="canceled" icon="gtk-undo"/>
-                            </group>
                         </page>
                         <page string="Partner records">
-                            <field name="partner_record_ids" nolabel="1" context="{'report_id': active_id}"/>
+                            <field name="partner_record_ids" nolabel="1" context="{'report_id': active_id}"
+                            	   attrs="{'readonly':[('state','!=','draft')]}"/>
                         </page>
-                        <page string="Real Estate records">
-                            <field name="real_state_record_ids" nolabel="1" context="{'report_id': active_id}"/>
+                        <page string="Real State records">
+                            <field name="real_state_record_ids" nolabel="1" context="{'report_id': active_id}"
+                                   attrs="{'readonly':[('state','!=','draft')]}"/>
                         </page>
                     </notebook>
+                   </sheet>
                 </form>
             </field>
         </record>
 
+ 
         <record id="view_l10n_es_aeat_mod347_report_search" model="ir.ui.view">
             <field name="name">AEAT Model 347 (search)</field>
             <field name="model">l10n.es.aeat.mod347.report</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="AEAT 347">
-                    <group col="8" colspan="4">
-                        <filter icon="terp-gtk-media-pause" string="Draft" domain="[('state','=','draft')]" help="Draft models"/>
-                        <filter icon="gtk-execute" string="In process" domain="[('state','in',('calculating', 'calculated'))]" help="In process models"/>
-                        <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]" help="Confirmed models"/>
-                        <filter icon="gtk-cancel" string="Cancelled" domain="[('state', '=', 'canceled')]" help="Cancelled models"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Fiscal Year" icon="terp-folder-orange" domain="[]" context="{'group_by':'fiscalyear_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}"/>
+                	<field name="number"/>
+                    <field name="type"/>
+                    <field name="support_type"/>
+                    <field name="fiscalyear_id"/>
+                    <filter string="Draft" domain="[('state','=','draft')]" help="Draft models"/>
+                    <filter string="In process" domain="[('state','in',('calculating', 'calculated'))]" help="In process models"/>
+                    <filter string="Done" domain="[('state','=','done')]" help="Confirmed models"/>
+                    <filter string="Cancelled" domain="[('state', '=', 'canceled')]" help="Cancelled models"/>
+                    <group expand="0" string="Group By...">
+                    	<filter string="Fiscal Year" domain="[]" context="{'group_by':'fiscalyear_id'}"/>
+                        <filter string="Company" domain="[]" context="{'group_by':'company_id'}"/>
                     </group>
+                    
                     <newline/>
-                    <field name="number"/>
-                    <field name="type"/>
-                    <field name="support_type"/>
                 </search>
             </field>
         </record>
-
         <!-- Window action -->
         <record id="action_l10n_es_aeat_mod347_report" model="ir.actions.act_window">
             <field name="name">AEAT Model 347</field>
             <field name="res_model">l10n.es.aeat.mod347.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="help">Create and query AEAT Model 347 Reports</field>
+            <field name="help" type="html">
+            <p class="oe_view_nocontent_create">
+                Click to create a AEAT Model 347 Reports.
+                
+              </p><p>
+                Basado en la Orden EHA/3012/2008, de 20 de Octubre, por el que se aprueban 
+                los diseños físicos y lógicos del 347.
+              </p>
+              </field>
         </record>
         
 

=== modified file 'l10n_es_aeat_mod347/mod347_workflow.xml'
--- l10n_es_aeat_mod347/mod347_workflow.xml	2011-03-22 13:13:05 +0000
+++ l10n_es_aeat_mod347/mod347_workflow.xml	2013-12-27 10:08:05 +0000
@@ -10,7 +10,7 @@
 
 
         <!--
-        ### NODES ###
+        		### NODES ###
         -->
         <record id="act_draft" model="workflow.activity">
             <field name="wkf_id" ref="wkf_l10n_es_aeat_mod347_report"/>
@@ -42,7 +42,7 @@
 
 
         <!--
-        ### TRANSITIONS ###
+        	### TRANSITIONS ###
         -->
         <record id="trans_draft_calculate" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>

=== modified file 'l10n_es_aeat_mod347/report/mod347_report.rml'
--- l10n_es_aeat_mod347/report/mod347_report.rml	2013-11-23 01:47:07 +0000
+++ l10n_es_aeat_mod347/report/mod347_report.rml	2013-12-27 10:08:05 +0000
@@ -173,7 +173,7 @@
                  <td><para style="DataLine">[[partner_record.fourth_quarter]]</para></td>
                </tr>
                <tr>
-                 <td><para style="DataLineRight"> Real Estate Transmission (Q1|Q2|Q3|Q4)  </para></td>
+                 <td><para style="DataLineRight"> Real State Transmission (Q1|Q2|Q3|Q4)  </para></td>
                  <td><para style="DataLine">[[partner_record.first_quarter_real_state_transmission_amount]]</para></td>
                  <td><para style="DataLine">[[partner_record.second_quarter_real_state_transmission_amount]]</para></td>
                  <td><para style="DataLine">[[partner_record.third_quarter_real_state_transmission_amount]]</para></td>

=== modified file 'l10n_es_aeat_mod347/res_partner.py' (properties changed: -x to +x)
--- l10n_es_aeat_mod347/res_partner.py	2013-11-22 23:44:11 +0000
+++ l10n_es_aeat_mod347/res_partner.py	2013-12-27 10:08:05 +0000
@@ -19,27 +19,21 @@
 #
 ##############################################################################
 
-__author__ = "Luis Manuel Angueira Blanco (Pexego)"
-
-"""
-Extends the account journals to add fields used by the 347 report.
-"""
-
-from osv import osv, fields
-
-class res_partner(osv.osv):
-    """
-    Extends the partners to add the include_in_mod347 field
-    """
+
+from openerp.osv import fields
+from openerp.osv import orm
+
+
+class res_partner(orm.Model):
     _inherit = "res.partner"
-    
     _columns = {
-        'include_in_mod347' : fields.boolean(u"Include in 347 Report",
+        'include_in_mod347': fields.boolean(u"Include in 347 Report",
             help="Include in AEAT 347 Model report"),
-    }
-
+        }
     _defaults = {
-        'include_in_mod347' : lambda *a: True,
-    }
-
-res_partner()
\ No newline at end of file
+        'include_in_mod347': lambda *a: True,
+        }
+
+res_partner()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_es_aeat_mod347/res_partner_view.xml' (properties changed: -x to +x)
--- l10n_es_aeat_mod347/res_partner_view.xml	2013-11-22 23:44:11 +0000
+++ l10n_es_aeat_mod347/res_partner_view.xml	2013-12-27 10:08:05 +0000
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-        <!-- ###########
-        ### PARTNERS ###
-        ############ -->
+        <!-- PARTNERS -->
         <record id="view_partner_form_mod347" model="ir.ui.view">
             <field name="name">Partners - Add 'include in 347'</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base_vat.view_partner_form"/>
             <field name="arch" type="xml">
                 <field name="vat_subjected" position="after">
-                    <field name="include_in_mod347"/>
+                	<label for="include_in_mod347"/>
+                    	<field name="include_in_mod347"/>
                 </field>
             </field>
         </record>
-                
     </data>
 </openerp>

=== modified file 'l10n_es_aeat_mod347/security/ir.model.access.csv'
--- l10n_es_aeat_mod347/security/ir.model.access.csv	2010-03-15 01:44:45 +0000
+++ l10n_es_aeat_mod347/security/ir.model.access.csv	2013-12-27 10:08:05 +0000
@@ -9,3 +9,7 @@
 "access_l10n_es_aeat_mod347_invoice_manager","l10n_es_aeat_mod347_invoice manager","model_l10n_es_aeat_mod347_invoice_record","account.group_account_manager",1,1,1,1
 "access_l10n_es_aeat_mod347_cash","l10n_es_aeat_mod347_cash","model_l10n_es_aeat_mod347_cash_record","account.group_account_user",1,0,0,0
 "access_l10n_es_aeat_mod347_cash_manager","l10n_es_aeat_mod347_cash manager","model_l10n_es_aeat_mod347_cash_record","account.group_account_manager",1,1,1,1
+"access_l10n_es_aeat_mod347_calculate_records","l10n_es_aeat_mod347_calculate_records","model_l10n_es_aeat_mod347_calculate_records","account.group_account_user",1,0,0,0
+"access_l10n_es_aeat_mod347_calculate_records_manager","l10n_es_aeat_mod347_calculate_record manager","model_l10n_es_aeat_mod347_calculate_records","account.group_account_manager",1,1,1,1
+"access_l10n_es_aeat_mod347_export_to_boe","l10n_es_aeat_mod347_export_to_boe","model_l10n_es_aeat_mod347_export_to_boe","account.group_account_user",1,0,0,0
+"access_l10n_es_aeat_mod347_export_to_boe_manager","l10n_es_aeat_mod347_export_to_boe manager","model_l10n_es_aeat_mod347_export_to_boe","account.group_account_manager",1,1,1,1

=== added directory 'l10n_es_aeat_mod347/static'
=== added directory 'l10n_es_aeat_mod347/static/src'
=== added directory 'l10n_es_aeat_mod347/static/src/img'
=== added file 'l10n_es_aeat_mod347/static/src/img/icon.png'
Binary files l10n_es_aeat_mod347/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and l10n_es_aeat_mod347/static/src/img/icon.png	2013-12-27 10:08:05 +0000 differ
=== added file 'l10n_es_aeat_mod347/static/src/img/icon_source.svg'
--- l10n_es_aeat_mod347/static/src/img/icon_source.svg	1970-01-01 00:00:00 +0000
+++ l10n_es_aeat_mod347/static/src/img/icon_source.svg	2013-12-27 10:08:05 +0000
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   width="128"
+   height="128"
+   sodipodi:docname="AEAT 347.svg">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1855"
+     inkscape:window-height="1176"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="4.6451612"
+     inkscape:cx="27.621455"
+     inkscape:cy="101.70379"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <g
+     id="g3003"
+     transform="translate(-0.07356158,0)">
+    <g
+       transform="translate(0,-3.31149)"
+       id="g2998">
+      <rect
+         style="color:#000000;fill:#0060b2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.51812077;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect2998"
+         width="51.523285"
+         height="118.80513"
+         x="13.910543"
+         y="3.8516259"
+         ry="0"
+         transform="matrix(1,0,0.51069126,0.85976417,0,0)" />
+      <path
+         style="fill:#ffd715;fill-opacity:1;stroke:none"
+         d="M 8.3819299,96.350865 C 15.28056,97.754835 21.012791,96.867186 27.616708,95.369146 62.09419,84.971119 95.837094,59.943837 111.39019,30.987651 c 3.18661,-6.108384 5.44624,-13.663422 7.03447,-20.85088 l 6.46605,10.776762 C 125.69568,40.01481 102.39016,63.273776 86.603152,76.12262 73.967981,86.300307 59.506348,95.700246 46.777865,100.17543 c -9.415431,3.18415 -23.576115,5.76306 -32.88781,5.87454 z"
+         id="path3000"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="fill:#db2f34;fill-opacity:1;stroke:none"
+         d="m 24.427332,35.162809 6.945024,10.297799 C 12.399362,62.416498 10.934918,76.019681 6.2265773,90.24404 L 0,79.467276 C 3.2831165,59.062301 13.253472,46.414525 24.427332,35.162809 z"
+         id="path3021"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+    </g>
+  </g>
+  <text
+     xml:space="preserve"
+     style="font-size:42.27203751px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial Bold"
+     x="33.706173"
+     y="127.48399"
+     id="text3023"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan3025"
+       x="33.706173"
+       y="127.48399">347</tspan></text>
+</svg>

=== modified file 'l10n_es_aeat_mod347/wizard/__init__.py' (properties changed: -x to +x)
--- l10n_es_aeat_mod347/wizard/__init__.py	2013-11-22 23:44:11 +0000
+++ l10n_es_aeat_mod347/wizard/__init__.py	2013-12-27 10:08:05 +0000
@@ -19,10 +19,8 @@
 #
 ##############################################################################
 
-__author__ = "Luis Manuel Angueira Blanco (Pexego)"
-
 
 import calculate_mod347_records
 import export_mod347_to_boe
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_es_aeat_mod347/wizard/calculate_mod347_records.py' (properties changed: -x to +x)
--- l10n_es_aeat_mod347/wizard/calculate_mod347_records.py	2013-11-22 23:44:11 +0000
+++ l10n_es_aeat_mod347/wizard/calculate_mod347_records.py	2013-12-27 10:08:05 +0000
@@ -23,15 +23,16 @@
 #
 ##############################################################################
 
-__author__ = "Luis Manuel Angueira Blanco (Pexego)"
 
 import threading
 import netsvc
 import time
 import re
-from osv import osv
-
-class l10n_es_aeat_mod347_calculate_records(osv.osv_memory):
+from openerp.osv import orm
+from openerp.osv import fields
+
+
+class l10n_es_aeat_mod347_calculate_records(orm.AbstractModel):
     _name = "l10n.es.aeat.mod347.calculate_records"
     _description = u"AEAT Model 347 Wizard - Calculate Records"
 
@@ -42,11 +43,18 @@
         self._calculate_records(cr, uid, ids, context, recalculate=False)
 
         wf_service = netsvc.LocalService("workflow")
-        wf_service.trg_validate(uid, 'l10n.es.aeat.mod347.report', ids and ids[0], 'calculate', cr)
+        wf_service.trg_validate(uid,
+                                'l10n.es.aeat.mod347.report',
+                                ids and ids[0],
+                                'calculate',
+                                cr)
 
     # Calculate total invoice without IRPF
     def _calculate_total_invoice(self, cr, uid, ids, context=None):
-        invoice = self.pool.get('account.invoice').browse(cr,uid,ids,context)
+        invoice = self.pool.get('account.invoice').browse(cr,
+                                                          uid,
+                                                          ids,
+                                                          context)
         amount = invoice.cc_amount_untaxed
         for tax_line in invoice.tax_line:
             if tax_line.name.find('IRPF') == -1:
@@ -60,64 +68,94 @@
         try:
 
             partner_obj = self.pool.get('res.partner')
-            partner_address_obj = self.pool.get('res.partner.address')
-            
+            partner_address_obj = self.pool.get('res.partner')
+
             invoice_obj = self.pool.get('account.invoice')
 
             report_obj = self.pool.get('l10n.es.aeat.mod347.report')
-            partner_record_obj = self.pool.get('l10n.es.aeat.mod347.partner_record')
-            invoice_record_obj = self.pool.get('l10n.es.aeat.mod347.invoice_record')
+            partner_record_obj = self.pool.get(
+                                        'l10n.es.aeat.mod347.partner_record'
+                                        )
+            invoice_record_obj = self.pool.get(
+                                        'l10n.es.aeat.mod347.invoice_record'
+                                        )
 
             report_obj = report_obj.browse(cr, uid, ids and ids[0])
 
-            ##
             ## Change status to 'calculated' and set current calculate date
             report_obj.write({
-                'state' : 'calculating',
-                'calculation_date' : time.strftime('%Y-%m-%d %H:%M:%S')
+                'state': 'calculating',
+                'calculation_date': time.strftime('%Y-%m-%d %H:%M:%S')
             })
 
-            ##
-            ## Delete previous partner records
-            partner_record_obj.unlink(cr, uid, [r.id for r in report_obj.partner_record_ids])
-    
-            ##
-            ## Get the cash journals (moves on this journals will be considered cash)
-            cash_journal_ids = self.pool.get('account.journal').search(cr, uid, [('cash_journal', '=', True)])
-
-            ## Get the fiscal year period ids of the non-special periods
-            ## (to ignore closing/opening entries)
-            period_ids = [period.id for period in report_obj.fiscalyear_id.period_ids if not period.special]
-
-            ##
-            ## We will check every partner with include_in_mod347
+            # Delete previous partner records
+            partner_record_obj.unlink(cr, uid, [r.id for
+                                                r in
+                                                report_obj.partner_record_ids])
+
+            # Get the cash journals(moves on this journals will be considered cash)
+            cash_journal_ids = self.pool.get(
+                                    'account.journal'
+                                    ).search(cr, uid, [('cash_journal',
+                                                        '=',
+                                                        True)])
+
+            # Get the fiscal year period ids of the non-special periods
+            # (to ignore closing/opening entries)
+            period_ids = [period.id for
+                          period in
+                          report_obj.fiscalyear_id.period_ids if not
+                          period.special]
+
+            # We will check every partner with include_in_mod347
             visited_partners = []
-            partner_ids = partner_obj.search(cr, uid, [('include_in_mod347', '=', True)])
+            if report_obj.only_supplier == True:
+                partner_ids = partner_obj.search(
+                                            cr,
+                                            uid,
+                                            [('include_in_mod347', '=', True),
+                                            ('supplier', '=', True)
+                                            ])
+            else:
+                partner_ids = partner_obj.search(
+                                            cr,
+                                            uid,
+                                            [('include_in_mod347', '=', True)])
             for partner in partner_obj.browse(cr, uid, partner_ids):
                 if partner.id not in visited_partners:
                     receivable_partner_record = False
                     partner_grouped_cif = []
 
                     if partner.vat and report_obj.group_by_cif:
-                        partner_grouped_cif = partner_obj.search(cr, uid, [('vat','=',partner.vat),('include_in_mod347', '=', True)])
+                        if report_obj.only_supplier == True:
+                            partner_grouped_cif = partner_obj.search(
+                                                cr,
+                                                uid,
+                                                [('vat', '=', partner.vat),
+                                                ('include_in_mod347', '=', True),
+                                                ('supplier', '=', True)
+                                                ])
+                        else:
+                            partner_grouped_cif = partner_obj.search(
+                                                cr,
+                                                uid,
+                                                [('vat', '=', partner.vat),
+                                                ('include_in_mod347', '=', True)])
                     else:
                         partner_grouped_cif.append(partner.id)
 
                     visited_partners.extend(partner_grouped_cif)
 
-                    ##
                     ## Search for invoices
-                    #
                     # We will repeat the process for sales and purchases:
-                    for invoice_type, refund_type in zip(('out_invoice', 'in_invoice'), ('out_refund', 'in_refund')):
+                    for invoice_type, refund_type in zip(('out_invoice',
+                                                          'in_invoice'),
+                                                         ('out_refund', 'in_refund')):
                         #
-                        # CHECK THE SALE/PURCHASES INVOICE LIMIT -------------------
+                        # CHECK THE SALE/PURCHASES INVOICE LIMIT -------------
                         # (A and B operation keys)
-                        #
 
-                        #
                         # Search for invoices to this partner (with account moves).
-                        #
                         invoice_ids = invoice_obj.search(cr, uid, [
                                     ('partner_id', 'in', partner_grouped_cif),
                                     ('type', '=', invoice_type),
@@ -133,16 +171,21 @@
                         invoices = invoice_obj.browse(cr, uid, invoice_ids)
                         refunds = invoice_obj.browse(cr, uid, refund_ids)
 
-                        ##
                         ## Calculate the invoiced amount
                         ## Remove IRPF tax for invoice amount
                         invoice_amount = 0
                         for invoice in invoices:
-                            invoice_amount += self._calculate_total_invoice(cr, uid, invoice.id, context)
+                            invoice_amount += self._calculate_total_invoice(cr,
+                                                                            uid,
+                                                                            invoice.id,
+                                                                            context)
 
                         refund_amount = 0
                         for invoice in refunds:
-                            refund_amount += self._calculate_total_invoice(cr, uid, invoice.id, context)
+                            refund_amount += self._calculate_total_invoice(cr,
+                                                                           uid,
+                                                                           invoice.id,
+                                                                           context)
 
                         total_amount = invoice_amount - refund_amount
 
@@ -151,24 +194,25 @@
                         ## we will add an partner record to the report.
                         if total_amount > report_obj.operations_limit:
                             if invoice_type == 'out_invoice':
-                                operation_key = 'B' # Note: B = Sale operations
+                                operation_key = 'B'  # Note: B = Sale operations
                             else:
                                 assert invoice_type == 'in_invoice'
-                                operation_key = 'A' # Note: A = Purchase operations
-
-                            #
+                                operation_key = 'A'  # Note: A = Purchase operations
                             # Get the default invoice address of the partner
-                            #
                             address = None
-                            address_ids = partner_obj.address_get(cr, uid, [partner.id], ['invoice', 'default'])
+                            address_ids = partner_obj.address_get(cr,
+                                                                  uid,
+                                                                  [partner.id],
+                                                                  ['invoice',
+                                                                   'default'])
                             if address_ids.get('invoice'):
                                 address = partner_address_obj.browse(cr, uid, address_ids.get('invoice'))
                             elif address_ids.get('default'):
-                                address = partner_address_obj.browse(cr, uid, address_ids.get('default'))
+                                address = partner_address_obj.browse(cr,
+                                                                     uid,
+                                                                     address_ids.get('default'))
 
-                            #
                             # Get the partner data
-                            #
                             partner_vat = partner.vat and re.match(r"([A-Z]{0,2})(.*)", partner.vat).groups()[1]
                             partner_state_code = address.state_id and address.state_id.code or ''
                             partner_country_code = address.country_id and address.country_id.code or ''
@@ -177,44 +221,50 @@
 
                             # Create the partner record
                             partner_record = partner_record_obj.create(cr, uid, {
-                                    'report_id': report_obj.id ,
-                                    'operation_key' : operation_key,
+                                    'report_id': report_obj.id,
+                                    'operation_key': operation_key,
                                     'partner_id': partner.id,
                                     'partner_vat': partner_vat,
                                     'representative_vat': '',
                                     'partner_state_code': partner_state_code,
-                                    'partner_country_code' : partner_country_code,
+                                    'partner_country_code': partner_country_code,
                                     'amount': total_amount,
                                 })
 
                             if invoice_type == 'out_invoice':
                                 receivable_partner_record = partner_record
 
-                            #
                             # Add the invoices detail to the partner record
-                            #
                             for invoice in invoices:
-                                amount = self._calculate_total_invoice(cr, uid, invoice.id, context)
+                                amount = self._calculate_total_invoice(cr,
+                                                                       uid,
+                                                                       invoice.id,
+                                                                       context)
                                 invoice_record_obj.create(cr, uid, {
-                                    'partner_record_id' : partner_record,
+                                    'partner_record_id': partner_record,
                                     'invoice_id': invoice.id,
                                     'date': invoice.date_invoice,
                                     'amount': amount,
                                 })
                             for invoice in refunds:
-                                amount = self._calculate_total_invoice(cr, uid, invoice.id, context)
+                                amount = self._calculate_total_invoice(
+                                                                    cr,
+                                                                    uid,
+                                                                    invoice.id,
+                                                                    context)
                                 invoice_record_obj.create(cr, uid, {
-                                    'partner_record_id' : partner_record,
+                                    'partner_record_id': partner_record,
                                     'invoice_id': invoice.id,
                                     'date': invoice.date_invoice,
                                     'amount': -amount,
                                 })
 
-                    #
                     # Search for payments received in cash from this partner.
-                    #
                     if cash_journal_ids:
-                        cash_account_move_line_ids = self.pool.get('account.move.line').search(cr, uid, [
+                        cash_account_move_line_ids = self.pool.get('account.move.line').search(
+                                                                    cr,
+                                                                    uid,
+                                    [
                                     ('partner_id', 'in', partner_grouped_cif),
                                     ('account_id', '=', partner.property_account_receivable.id),
                                     ('journal_id', 'in', cash_journal_ids),
@@ -228,9 +278,7 @@
                         cash_account_move_lines = []
                         received_cash_amount = 0.0
 
-                    #
                     # Add the cash detail to the partner record if over limit
-                    #
                     if received_cash_amount > report_obj.received_cash_limit:
                         cash_moves = {}
 
@@ -289,32 +337,35 @@
 
                                     for line in cash_moves[record]:
                                         self.pool.get('l10n.es.aeat.mod347.cash_record').create(cr, uid, {
-                                            'partner_record_id' : partner_rec,
-                                            'move_line_id' : line.id,
+                                            'partner_record_id': partner_rec,
+                                            'move_line_id': line.id,
                                             'date': line.date,
                                             'amount': line.credit,
                                         })
 
             if recalculate:
                 report_obj.write({
-                    'state' : 'calculated',
-                    'calculation_date' : time.strftime('%Y-%m-%d %H:%M:%S')
+                    'state': 'calculated',
+                    'calculation_date': time.strftime('%Y-%m-%d %H:%M:%S')
                 })
-        
+
         except Exception, ex:
             raise
 
         return True
 
-
     def calculation_threading(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
 
-        threaded_calculation = threading.Thread(target=self._calculate_records, args=(cr, uid, ids, context))
+        threaded_calculation = threading.Thread(target=self._calculate_records, args=(cr,
+                                                                                      uid,
+                                                                                      ids,
+                                                                                      context))
         threaded_calculation.start()
 
         return {}
 
 l10n_es_aeat_mod347_calculate_records()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_es_aeat_mod347/wizard/export_mod347_to_boe.py' (properties changed: -x to +x)
--- l10n_es_aeat_mod347/wizard/export_mod347_to_boe.py	2013-11-22 23:44:11 +0000
+++ l10n_es_aeat_mod347/wizard/export_mod347_to_boe.py	2013-12-27 10:08:05 +0000
@@ -21,14 +21,13 @@
 #
 ##############################################################################
 
-__author__ = "Luis Manuel Angueira Blanco (Pexego)"
-
-
-from osv import osv
-from tools.translate import _
-
-
-class l10n_es_aeat_mod347_export_to_boe(osv.osv_memory):
+
+from openerp.osv import orm
+from openerp.osv import fields
+from openerp.tools.translate import _
+
+
+class l10n_es_aeat_mod347_export_to_boe(orm.AbstractModel):
 
     _inherit = "l10n.es.aeat.report.export_to_boe"
     _name = "l10n.es.aeat.mod347.export_to_boe"
@@ -40,14 +39,15 @@
 
         Format of the record:
             Tipo registro 1 – Registro de declarante:
+
             Posiciones 	Descripción
             1           Tipo de Registro
-            2-4 	Modelo Declaración
-            5-8 	Ejercicio
-            9-17 	NIF del declarante
-            18-57 	Apellidos y nombre o razón social del declarante
+            2-4 	    Modelo Declaración
+            5-8 	    Ejercicio
+            9-17 	    NIF del declarante
+            18-57 	    Apellidos y nombre o razón social del declarante
             58          Tipo de soporte
-            59-67 	Teléfono contacto
+            59-67 	    Teléfono contacto
             68-107      Apellidos y nombre contacto
             108-120 	Número identificativo de la declaración
             121-122 	Declaración complementaria o substitutiva
@@ -63,51 +63,70 @@
         """
         text = ''
 
-        text += '1'                                           # Tipo de Registro
-        text += '347'                                         # Modelo Declaración
-        text += self._formatString(report.fiscalyear_id.code, 4)   # Ejercicio
-        text += self._formatString(report.company_vat, 9)          # NIF del declarante
-        text += self._formatString(report.company_id.name, 40)     # Apellidos y nombre o razón social del declarante
-        text += self._formatString(report.support_type, 1)         # Tipo de soporte
-        text += self._formatString(report.contact_phone, 9)       # Persona de contacto (Teléfono)
-        text += self._formatString(report.contact_name, 40)        # Persona de contacto (Apellidos y nombre)
-        text += self._formatNumber(report.number, 13)              # Número identificativo de la declaración
-        text += self._formatString(report.type, 2).replace('N', ' ')                # Declaración complementaria o substitutiva
-        text += self._formatNumber(report.previous_number, 13)     # Número identificativo de la declaración anterior
-        text += self._formatNumber(report.total_partner_records, 9)          # Número total de personas y entidades
-        text += self._formatNumber(report.total_amount, 13, 2,True)               # Importe total de las operaciones
-        text += self._formatNumber(report.total_real_state_records, 9)       # Número total de inmuebles
-        text += self._formatNumber(report.total_real_state_amount, 13, 2)    # Importe total de las operaciones de arrendamiento
-        text += 206*' '                                       # Blancos
-        text += self._formatString(report.representative_vat, 9)   # NIF del representante legal
-        text += 88*' '                                        # Blancos
-        text += 13*' '                                        # Sello electrónico
+        # Tipo de Registro
+        text += '1'
+        # Modelo Declaración
+        text += '347'
+        # Ejercicio
+        text += self._formatString(report.fiscalyear_id.code, 4)
+        # NIF del declarante
+        text += self._formatString(report.company_vat, 9)
+        # Apellidos y nombre o razón social del declarante
+        text += self._formatString(report.company_id.name, 40)
+        # Tipo de soporte
+        text += self._formatString(report.support_type, 1)
+        # Persona de contacto (Teléfono)
+        text += self._formatString(report.contact_phone, 9)
+        # Persona de contacto (Apellidos y nombre)
+        text += self._formatString(report.contact_name, 40)
+        # Número identificativo de la declaración
+        text += self._formatNumber(report.number, 13)
+        # Declaración complementaria o substitutiva
+        text += self._formatString(report.type, 2).replace('N', ' ')
+        # Número identificativo de la declaración anterior
+        text += self._formatNumber(report.previous_number, 13)
+        # Número total de personas y entidades
+        text += self._formatNumber(report.total_partner_records, 9)
+        # Importe total de las operaciones
+        text += self._formatNumber(report.total_amount, 13, 2, True)
+        # Número total de inmuebles
+        text += self._formatNumber(report.total_real_state_records, 9)
+        # Importe total de las operaciones de arrendamiento
+        text += self._formatNumber(report.total_real_state_amount, 13, 2)
+        # Blancos
+        text += 206 * ' '
+        # NIF del representante legal
+        text += self._formatString(report.representative_vat, 9)
+        # Blancos
+        text += 88 * ' '
+        # Sello electrónico
+        text += 13 * ' '
         text += '\r\n'
 
-
-        assert len(text) == 502, _("The type 1 record must be 502 characters long")
+        assert len(text) == 502, _(
+                    "The type 1 record must be 502 characters long")
         return text
 
-
     def _get_formated_partner_record(self, report, partner_record):
         """
         Returns a type 2, partner, formated record
 
         Format of the record:
             Tipo de Registro 2 – Registro de declarado
+
             Posiciones 	Descripción
             1           Tipo de Registro
-            2-4 	Modelo Declaración
-            5-8 	Ejercicio
-            9-17 	NIF del declarante
-            18-26 	NIF del declarado
-            27-35 	NIF del representante legal
-            36-75 	Apellidos y nombre, razón social o denominación del declarado
+            2-4 	    Modelo Declaración
+            5-8 	    Ejercicio
+            9-17 	    NIF del declarante
+            18-26 	    NIF del declarado
+            27-35 	    NIF del representante legal
+            36-75 	    Apellidos y nombre, razón social o denominación del declarado
             76          Tipo de hoja
-            77-80 	Código provincia/país
+            77-80 	    Código provincia/país
             81          Blancos
             82          Clave de operación
-            83-98 	Importe de las operaciones
+            83-98 	    Importe de las operaciones
             98          Operación de seguro
             99          Arrendamiento local negocio
             100-114 	Importe percibido en metálico
@@ -125,124 +144,183 @@
             488-500 	Sello electrónico
         """
         text = ''
-
-        text += '2'                                                     # Tipo de Registro
-        text += '347'                                                   # Modelo Declaración
-        text += self._formatString(report.fiscalyear_id.code, 4)             # Ejercicio
-        text += self._formatString(report.company_vat, 9)                    # NIF del declarante
-        text += self._formatString(partner_record.partner_vat, 9)            # NIF del declarado
-        text += self._formatString(partner_record.representative_vat, 9)     # NIF del representante legal
-        text += self._formatString(partner_record.partner_id.name, 40)       # Apellidos y nombre, razón social o denominación del declarado
-        text += 'D'                                                     # Tipo de hoja: Constante ‘D’.
-        text += self._formatNumber(partner_record.partner_state_code, 2)     # Código provincia
-        text += 3*' '                                                     # Blancos
-        text += self._formatString(partner_record.operation_key, 1)          # Clave de operación
-        text += self._formatNumber(partner_record.amount, 13, 2,True)             # Importe de las operaciones
-        text += self._formatBoolean(partner_record.insurance_operation)                      # Operación de seguro
-        text += self._formatBoolean(partner_record.bussiness_real_state_rent)                # Arrendamiento local negocio
-        text += self._formatNumber(partner_record.cash_amount, 13, 2)                        # Importe percibido en metálico
-        text += self._formatNumber(partner_record.real_state_transmissions_amount, 13, 2,True)    # Importe percibido por transmisiones de inmuebles sujetas a IVA
-        text += partner_record.origin_fiscalyear_id and self._formatString(partner_record.origin_fiscalyear_id.code, 4) or 4*'0' #Año de devengo de las operaciones en efectivo
-        text += self._formatNumber(partner_record.first_quarter,13,2,True)
-        text += self._formatNumber(partner_record.first_quarter_real_state_transmission_amount,13,2,True)
-        text += self._formatNumber(partner_record.second_quarter,13,2,True)
-        text += self._formatNumber(partner_record.second_quarter_real_state_transmission_amount,13,2,True)
-        text += self._formatNumber(partner_record.third_quarter,13,2,True)
-        text += self._formatNumber(partner_record.third_quarter_real_state_transmission_amount,13,2,True)
-        text += self._formatNumber(partner_record.fourth_quarter,13,2,True)
-        text += self._formatNumber(partner_record.fourth_quarter_real_state_transmission_amount,13,2,True)        
-        text += 237*' '                                                 # Blancos
-        text += '\r\n'                                                  # Sello electrónico
-
-        assert len(text) == 502, _("The type 2-D record (partner) must be 502 characters long")
+        # Tipo de Registro
+        text += '2'
+        # Modelo Declaración
+        text += '347'
+        # Ejercicio
+        text += self._formatString(report.fiscalyear_id.code, 4)
+        # NIF del declarante
+        text += self._formatString(report.company_vat, 9)
+        # NIF del declarado
+        text += self._formatString(partner_record.partner_vat, 9)
+        # NIF del representante legal
+        text += self._formatString(partner_record.representative_vat, 9)
+        # Apellidos y nombre, razón social o denominación del declarado
+        text += self._formatString(partner_record.partner_id.name, 40)
+        # Tipo de hoja: Constante ‘D’.
+        text += 'D'
+        # Código provincia
+        text += self._formatNumber(partner_record.partner_state_code, 2)
+        # Blancos
+        text += 3 * ' '
+        # Clave de operación
+        text += self._formatString(partner_record.operation_key, 1)
+        # Importe de las operaciones
+        text += self._formatNumber(partner_record.amount, 13, 2, True)
+        # Operación de seguro
+        text += self._formatBoolean(partner_record.insurance_operation)
+        # Arrendamiento local negocio
+        text += self._formatBoolean(partner_record.bussiness_real_state_rent)
+        # Importe percibido en metálico
+        text += self._formatNumber(partner_record.cash_amount, 13, 2)
+        # Importe percibido por transmisiones de inmuebles sujetas a IVA
+        text += self._formatNumber(partner_record.real_state_transmissions_amount, 13, 2, True)
+        # Año de devengo de las operaciones en efectivo
+        text += partner_record.origin_fiscalyear_id and self._formatString(partner_record.origin_fiscalyear_id.code, 4) or 4*'0'
+        # Importe de las operaciones del primer trimestre
+        text += self._formatNumber(partner_record.first_quarter, 13, 2, True)
+        # Importe percibido por transmisiones de inmuebles sujates a Iva Primer Trimestre
+        text += self._formatNumber(partner_record.first_quarter_real_state_transmission_amount, 13, 2, True)
+        # Importe de las operaciones del segundo trimestre
+        text += self._formatNumber(partner_record.second_quarter, 13, 2, True)
+        # Importe percibido por transmisiones de inmuebles sujates a Iva Segundo Trimestre
+        text += self._formatNumber(partner_record.second_quarter_real_state_transmission_amount, 13, 2, True)
+        # Importe de las operaciones del tercer trimestre
+        text += self._formatNumber(partner_record.third_quarter, 13, 2, True)
+        # Importe percibido por transmisiones de inmuebles sujates a Iva Tercer Trimestre
+        text += self._formatNumber(partner_record.third_quarter_real_state_transmission_amount, 13, 2, True)
+        # Importe de las operaciones del cuarto trimestre
+        text += self._formatNumber(partner_record.fourth_quarter, 13, 2, True)
+        # Importe percibido por transmisiones de inmuebles sujates a Iva Cuarto Trimestre
+        text += self._formatNumber(partner_record.fourth_quarter_real_state_transmission_amount, 13, 2, True)        
+        # Blancos
+        text += 237 * ' '
+        # Sello electrónico
+        text += '\r\n'
+
+        assert len(text) == 502, _(
+                "The type 2-D record (partner) must be 502 characters long")
         return text
 
-
     def _get_formated_real_state_record(self, report, partner_record):
         """
-        Returns a type 2, real estate, formated record
-
+        Returns a type 2, real state, formated record
         Format of the record:
             Tipo de Registro 2 – Registro de inmueble
+
             Posiciones 	Descripción
-            1           Tipo de Registro
-            2-4 	Modelo Declaración
-            5-8 	Ejercicio
-            9-17 	NIF del declarante
-            18-26 	NIF del arrendatario
-            27-35 	NIF del representante legal
-            36-75 	Apellidos y nombre, razón social o denominación del declarado
-            76          Tipo de hoja
-            77-99 	Blancos
-            100-114 	Importe de la operación
-            115 	Situación del inmueble
-            116-140 	Referencia catastral
-            141-333 	Dirección y datos del inmueble
-                141–145 TIPO DE VÍA
-                146–195 NOMBRE VÍA PUBLICA
-                196–198 TIPO DE NUMERACIÓN
-                199–203 NUMERO DE CASA
-                204-206 CALIFICADOR DEL NUMERO
-                207–209 BLOQUE
-                210–212 PORTAL
-                213–215 ESCALERA
-                216–218 PLANTA O PISO
-                219–221 PUERTA
-                222–261 COMPLEMENTO.
-                262–291 LOCALIDAD O POBLACIÓN.
-                292–321 MUNICIPIO
-                322–326 CODIGO DE MUNICIPIO
-                327-328 CODIGO PROVINCIA
-                329-333 CODIGO POSTAL
-            334-500 	Blancos
+            1          Tipo de Registro
+            2-4        Modelo Declaración
+            5-8        Ejercicio
+            9-17       NIF del declarante
+            18-26      NIF del arrendatario
+            27-35      NIF del representante legal
+            36-75      Apellidos y nombre, razón social o denominación del declarado
+            76         Tipo de hoja
+            77-99 	   Blancos
+            100-114    Importe de la operación
+            115 	   Situación del inmueble
+            116-140    Referencia catastral
+            141-333    Dirección y datos del inmueble
+            141–145    TIPO DE VÍA
+            146–195    NOMBRE VÍA PUBLICA
+            196–198    TIPO DE NUMERACIÓN
+            199–203    NUMERO DE CASA
+            204-206    CALIFICADOR DEL NUMERO
+            207–209    BLOQUE
+            210–212    PORTAL
+            213–215    ESCALERA
+            216–218    PLANTA O PISO
+            219–221    PUERTA
+            222–261    COMPLEMENTO.
+            262–291    LOCALIDAD O POBLACIÓN.
+            292–321    MUNICIPIO
+            322–326    CODIGO DE MUNICIPIO
+            327-328    CODIGO PROVINCIA
+            329-333    CODIGO POSTAL
+            334-500    Blancos
         """
         text = ''
-
-        text += '2'                                                     # Tipo de Registro
-        text += '347'                                                   # Modelo Declaración
-        text += self._formatString(report.fiscalyear_id.code, 4)             # Ejercicio
-        text += self._formatString(report.company_vat, 9)                    # NIF del declarante
-        text += self._formatString(partner_record.partner_vat, 9)            # NIF del declarado
-        text += self._formatString(partner_record.representative_vat, 9)     # NIF del representante legal
-        text += self._formatString(partner_record.partner_id.name, 40)       # Apellidos y nombre, razón social o denominación del declarado
-        text += 'I'                                                     # Tipo de hoja: Constante ‘I’.
-        text += 23*' '                                                   # Blancos
-        text += self._formatNumber(partner_record.amount, 13, 2)  # Importe de las operaciones
-        text += self._formatNumber(partner_record.situation, 1)   # Situación del inmueble
-        text += self._formatString(partner_record.reference, 25)  # Referencia catastral
-        text += self._formatString(partner_record.address_type, 5)        # TIPO DE VÍA
-        text += self._formatString(partner_record.address, 50)            # NOMBRE VÍA PUBLICA
-        text += self._formatString(partner_record.number_type, 3)         # TIPO DE NUMERACIÓN
-        text += self._formatNumber(partner_record.number, 5)              # NUMERO DE CASA
-        text += self._formatString(partner_record.number_calification, 3) # CALIFICADOR DEL NUMERO
-        text += self._formatString(partner_record.block, 3)               # BLOQUE
-        text += self._formatString(partner_record.portal, 3)              # PORTAL
-        text += self._formatString(partner_record.stairway, 3)            # ESCALERA
-        text += self._formatString(partner_record.floor, 3)               # PLANTA O PISO
-        text += self._formatString(partner_record.door, 3)                # PUERTA
-        text += self._formatString(partner_record.complement, 40)         # COMPLEMENTO
-        text += self._formatString(partner_record.city, 30)               # LOCALIDAD O POBLACIÓN
-        text += self._formatString(partner_record.township, 30)           # MUNICIPIO
-        text += self._formatString(partner_record.township_code, 5)       # CODIGO DE MUNICIPIO
-        text += self._formatString(partner_record.state_code, 2)          # CODIGO PROVINCIA
-        text += self._formatString(partner_record.postal_code, 5)         # CODIGO POSTAL
-        text += 167*' '                                                 # Blancos
-        text += '\r\n'                                                  # Sello electrónico
-
-        assert len(text) == 502, _("The type 2-I record (real estate) must be 502 characters long")
+        # Tipo de Registro
+        text += '2'
+        # Modelo Declaración
+        text += '347'
+        # Ejercicio
+        text += self._formatString(report.fiscalyear_id.code, 4)
+        # NIF del declarante
+        text += self._formatString(report.company_vat, 9)
+        # NIF del declarado
+        text += self._formatString(partner_record.partner_vat, 9)
+        # NIF del representante legal
+        text += self._formatString(partner_record.representative_vat, 9)
+        # Apellidos y nombre, razón social o denominación del declarado
+        text += self._formatString(partner_record.partner_id.name, 40)
+        # Tipo de hoja: Constante ‘I’.
+        text += 'I'
+        # Blancos
+        text += 23 * ' '
+        # Importe de las operaciones
+        text += self._formatNumber(partner_record.amount, 13, 2)
+        # Situación del inmueble
+        text += self._formatNumber(partner_record.situation, 1)
+        # Referencia catastral
+        text += self._formatString(partner_record.reference, 25)
+        # TIPO DE VÍA
+        text += self._formatString(partner_record.address_type, 5)
+        # NOMBRE VÍA PUBLICA
+        text += self._formatString(partner_record.address, 50)
+        # TIPO DE NUMERACION
+        text += self._formatString(partner_record.number_type, 3)
+        # NUMERO DE CASA
+        text += self._formatNumber(partner_record.number, 5)
+        # CALIFICADOR DEL NUMERO
+        text += self._formatString(partner_record.number_calification, 3)
+        # BLOQUE
+        text += self._formatString(partner_record.block, 3)
+        # PORTAL
+        text += self._formatString(partner_record.portal, 3)
+        # ESCALERA
+        text += self._formatString(partner_record.stairway, 3)
+        # PLANTA O PISO
+        text += self._formatString(partner_record.floor, 3)
+        # PUERTA
+        text += self._formatString(partner_record.door, 3)
+        # COMPLEMENTO
+        text += self._formatString(partner_record.complement, 40)
+        # LOCALIDAD O POBLACIÓN
+        text += self._formatString(partner_record.city, 30)
+        # MUNICIPIO
+        text += self._formatString(partner_record.township, 30)
+        # CODIGO DE MUNICIPIO
+        text += self._formatString(partner_record.township_code, 5)
+        # CODIGO PROVINCIA
+        text += self._formatString(partner_record.state_code, 2)
+        # CODIGO POSTAL
+        text += self._formatString(partner_record.postal_code, 5)
+        # Blancos
+        text += 167 * ' '
+        # Sello electrónico
+        text += '\r\n'
+
+        assert len(text) == 502, _(
+                "The type 2-I record (real state) must be 502 characters long")
         return text
 
-
     def _get_formated_other_records(self, report):
         file_contents = ''
 
         for real_state_record in report.real_state_record_ids:
-            file_contents += self._get_formated_real_state_record(report, real_state_record)
+            file_contents += self._get_formated_real_state_record(report,
+                                                                  real_state_record)
 
         return file_contents
-    
 
     def _export_boe_file(self, cr, uid, ids, object_to_export, model=None, context=None):
-        return super(l10n_es_aeat_mod347_export_to_boe, self)._export_boe_file(cr, uid, ids, object_to_export, model='347')
+        return super(l10n_es_aeat_mod347_export_to_boe, self)._export_boe_file(cr,
+                                                                               uid,
+                                                                               ids,
+                                                                               object_to_export,
+                                                                               model='347')
 
 l10n_es_aeat_mod347_export_to_boe()