Merge lp:~pedro.baeza/openerp-spain/7.0-l10n_es_aeat_mod349 into lp:~openerp-spain-team/openerp-spain/7.0

[Pedro Manuel Baeza]

Diversas mejoras realizadas en el módulo de la AEAT 349:

- Icono del módulo.
- Eliminación del workflow.
- Convenciones de código.
- Herencia de la vista del l10n_es_aeat.
- Traspaso del cálculo de la declaración al propio modelo 349.
- Al instalar el módulo, asignar una clave a todas las facturas ya existentes.

[lp:~pedro.baeza/openerp-spain/7.0-l10n_es_aeat_mod349]

460. By Pedro Manuel Baeza on 2014-04-14

[IMP] l10n_es_aeat_mod_349: Traducciones.

461. By Pedro Manuel Baeza on 2014-04-14

[FIX] l10n_es_aeat_mod_349: Vista del wizard BOE

462. By Pedro Manuel Baeza on 2014-04-14

[IMP] l10n_es_aeat_mod349: Vistas de facturas mejoradas

463. By Pedro Manuel Baeza on 2014-04-14

[IMP] l10n_es_aeat_mod349: Icono

464. By Pedro Manuel Baeza on 2014-04-14

[IMP] l10n_es_aeat_mod349: Asignar una clave a las facturas ya existentes.

465. By Pedro Manuel Baeza on 2014-04-15

[FIX] l10n_es_aeat_mod349: Chequeo del código de país unificado y corregido.
[IMP] l10n_es_aeat_mod349: Resultados agrupados correctamente.

[Pedro Manuel Baeza (pedro.baeza)]

Paso a hacer el merge, ya que no ha habido respuesta en todo este tiempo, y el módulo no es funcional sin este merge.

Un saludo.

=== modified file 'l10n_es_aeat_mod349/__openerp__.py'
--- l10n_es_aeat_mod349/__openerp__.py	2014-04-14 14:36:42 +0000
+++ l10n_es_aeat_mod349/__openerp__.py	2014-04-15 12:47:56 +0000
@@ -1,11 +1,14 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Copyright (C) 2004-2011
-#        Pexego Sistemas Informáticos. (http://pexego.es) All Rights Reserved
+#    Copyright (C)
+#        2004-2011: Pexego Sistemas Informáticos. (http://pexego.es)
+#        2013:      Top Consultant Software Creations S.L.
+#                   (http://www.topconsultant.es/)
 #
-#    Migración OpenERP 7.0. Top Consultant Software Creations S.L. (http://www.topconsultant.es/) 2013
-#        Ignacio Martínez y Miguel López.
+#    Autores originales: Luis Manuel Angueira Blanco (Pexego)
+#                        Omar Castiñeira Saavedra([e-mail])
+#    Migración OpenERP 7.0: Ignacio Martínez y Miguel López.
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -23,46 +26,48 @@
 ##############################################################################
 
 {
-    "name": "AEAT Model 349",
-    "version": "1.0",
+    "name": "AEAT modelo 349",
+    "version": "2.0",
     "author": "Pexego",
     "license": "AGPL-3",
-    'contributors': ['Miguel López(Top Consultant)',
-                      'Ignacio Martínez(Top Consultant)'],
+    'contributors': [
+        'Miguel López (Top Consultant)',
+        'Ignacio Martínez (Top Consultant)',
+        'Pedro M. Baeza <[e-mail]>',
+    ],
     "category": 'Localisation/Accounting',
     "description": """
-Módulo para la presentación del Modelo AEAT 349 (Declaración Recapitulativa
-de Operaciones Intracomunitarias)
-
-Basado en la Orden EHA/769/2010 por el que se aprueban
-los diseños físicos y lógicos del 349.
-
-De acuerdo con la normativa de la Hacienda Española, están
-obligados a presentar el modelo 349:
-
-    * Todos aquellos sujetos pasivos del Impuesto sobre el Valo
-     Añadido que hayan realizado las operaciones previstas en el artículo 79
-     del Reglamento del Impuesto sobre el Valor Añadido, es decir, quienes
-     adquieran o vendan bienes a empresas situadas en países miembros de la
-     UE, sino también aquellos que presten servicios a miembros de la UE y
-     cumplan con las siguientes condiciones:
-
-        - Que conforme a las reglas de la localización aplicables a las
-        mismas, no se entiendan prestadas en
-        el territorio de aplicación del Impuesto.
-
-        - Que estén sometidas efectivamente a gravamen de otro Estado miembro.
-
-        - Que su destinatario sea un empresario o profesional actuando como
-        tal y radique en dicho Estado miembro la sede de su actividad
-        económica, o tenga en el mismo un establecimiento permanente o, en su
-        defecto, el lugar de su domicilio o residencia habitual, o que dicho
-        destinatario sea una persona jurídica que no actúe como empresario o
-        profesional pero tenga asignado un número de identificación a efectos
-        del Impuesto suministrado por ese Estado miembro.
-
-        - Que el sujeto pasivo sea dicho destinatario.
-
+Módulo para la presentación del Modelo AEAT 349 (Declaración Recapitulativa de
+Operaciones Intracomunitarias)
+
+Basado en la Orden EHA/769/2010 por el que se aprueban los diseños físicos y
+lógicos del 349.
+
+De acuerdo con la normativa de la Hacienda Española, están obligados a
+presentar el modelo 349:
+
+ * Todos aquellos sujetos pasivos del Impuesto sobre el Valor Añadido que hayan
+   realizado las operaciones previstas en el artículo 79 del Reglamento del
+   Impuesto sobre el Valor Añadido, es decir, quienes adquieran o vendan bienes
+   a empresas situadas en países miembros de la UE, sino también aquellos que
+   presten servicios a miembros de la UE y cumplan con las siguientes
+   condiciones:
+
+  - Que conforme a las reglas de la localización aplicables a las
+    mismas, no se entiendan prestadas en el territorio de aplicación del
+    impuesto.
+
+  - Que estén sometidas efectivamente a gravamen de otro Estado miembro.
+
+  - Que su destinatario sea un empresario o profesional actuando como
+    tal y radique en dicho Estado miembro la sede de su actividad
+    económica, o tenga en el mismo un establecimiento permanente o, en su
+    defecto, el lugar de su domicilio o residencia habitual, o que dicho
+    destinatario sea una persona jurídica que no actúe como empresario o
+    profesional pero tenga asignado un número de identificación a efectos
+    del Impuesto suministrado por ese Estado miembro.
+
+  - Que el sujeto pasivo sea dicho destinatario.
 
     El período de declaración comprenderá, con carácter general las
     operaciones realizadas en cada mes natural, y se presentará durante los
@@ -70,22 +75,22 @@
     correspondiente período mensual. No obstante, la presentación podrá ser
     bimestral, trimestral o anual en los siguientes supuestos:
 
-    * Bimestral: Si al final del segundo mes de un trimestre natural el
-    importe total de las entregas de bienes y prestaciones de servicios que
-    deban consignarse en la declaración recapitulativa supera 100.000 euros
-    (a partir de 2012, el umbral se fija en 50.000 euros).
-
-    * Trimestral: Cuando ni durante el trimestre de referencia ni en cada uno
-    de los cuatro trimestres naturales anteriores el importe total de las
-    entregas de bienes y prestaciones de servicios que deban consignarse en la
-    declaración recapitulativa sea superior a 100.000 euros.
-
-    * Anual: En los treinta primeros días de enero del año siguiente ( la
-    primera sería en enero de 2011) si el importe total de las entregas de
-    bienes o prestaciones de servicios  del año ( excluido IVA), no supera los
-    35.000 € y el importe total de las entregas de bienes a otro Estado
-    Miembro (salvo medios de transporte nuevos) exentas de IVA no sea superior
-    a 15.000 €.
+ * Bimestral: Si al final del segundo mes de un trimestre natural el
+   importe total de las entregas de bienes y prestaciones de servicios que
+   deban consignarse en la declaración recapitulativa supera 100.000 euros
+   (a partir de 2012, el umbral se fija en 50.000 euros).
+
+ * Trimestral: Cuando ni durante el trimestre de referencia ni en cada uno
+   de los cuatro trimestres naturales anteriores el importe total de las
+   entregas de bienes y prestaciones de servicios que deban consignarse en la
+   declaración recapitulativa sea superior a 100.000 euros.
+
+ * Anual: En los treinta primeros días de enero del año siguiente ( la
+   primera sería en enero de 2011) si el importe total de las entregas de
+   bienes o prestaciones de servicios  del año ( excluido IVA), no supera los
+   35.000 € y el importe total de las entregas de bienes a otro Estado
+   Miembro (salvo medios de transporte nuevos) exentas de IVA no sea superior
+   a 15.000 €.
     """,
     
     'website': 'http://www.pexego.es',
@@ -93,18 +98,19 @@
         "account",
         "account_invoice_currency",
         "account_refund_original",
+        "l10n_es",
         "l10n_es_aeat",
     ],
     'data': [
+        "wizard/export_mod349_to_boe.xml",
         "account_fiscal_position_view.xml",
         "account_invoice_view.xml",
         "mod349_view.xml",
-        "mod349_workflow.xml",
-        "mod349_report.xml",
+        "report/mod349_report.xml",
         "security/ir.model.access.csv",
-        "security/mod_349_security.xml"
+        "security/mod_349_security.xml",
+        "data/assign_invoices_op_keys.xml",
     ],
     'installable': True,
-
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_es_aeat_mod349/account_fiscal_position.py'
--- l10n_es_aeat_mod349/account_fiscal_position.py	2014-04-14 14:36:42 +0000
+++ l10n_es_aeat_mod349/account_fiscal_position.py	2014-04-15 12:47:56 +0000
@@ -1,11 +1,15 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Copyright (C) 2004-2011
-#        Pexego Sistemas Informáticos. (http://pexego.es) All Rights Reserved
+#    Copyright (C)
+#        2004-2011: Pexego Sistemas Informáticos. (http://pexego.es)
+#        2013:      Top Consultant Software Creations S.L.
+#                   (http://www.topconsultant.es/)
+#        2014:      Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com)
+#                   Pedro M. Baeza <[e-mail]> 
 #
-#    Migración OpenERP 7.0. Top Consultant Software Creations S.L. (http://www.topconsultant.es/) 2013
-#        Ignacio Martínez y Miguel López.
+#    Autor original: Luis Manuel Angueira Blanco (Pexego)
+#    Migración OpenERP 7.0: Ignacio Martínez y Miguel López.
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -21,10 +25,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-__author__ = "Luis Manuel Angueira Blanco (Pexego)"
-
-
 from openerp.osv import fields, orm
 
 
@@ -35,9 +35,7 @@
     AEAT 349 Report
     """
     _inherit = 'account.fiscal.position'
-
     _columns = {
-        'intracommunity_operations':\
-        fields.boolean('Intra-Community operations'),
+        'intracommunity_operations': fields.boolean(
+                                                'Intra-Community operations'),
     }
-

=== modified file 'l10n_es_aeat_mod349/account_invoice.py'
--- l10n_es_aeat_mod349/account_invoice.py	2014-04-14 14:36:42 +0000
+++ l10n_es_aeat_mod349/account_invoice.py	2014-04-15 12:47:56 +0000
@@ -1,11 +1,16 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Copyright (C) 2004-2011
-#        Pexego Sistemas Informáticos. (http://pexego.es) All Rights Reserved
+#    Copyright (C)
+#        2004-2011: Pexego Sistemas Informáticos. (http://pexego.es)
+#        2013:      Top Consultant Software Creations S.L.
+#                   (http://www.topconsultant.es/)
+#        2014:      Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com)
+#                   Pedro M. Baeza <[e-mail]> 
 #
-#    Migración OpenERP 7.0. Top Consultant Software Creations S.L. (http://www.topconsultant.es/) 2013
-#        Ignacio Martínez y Miguel López.
+#    Autores originales: Luis Manuel Angueira Blanco (Pexego)
+#                        Omar Castiñeira Saavedra([e-mail])
+#    Migración OpenERP 7.0: Ignacio Martínez y Miguel López.
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -21,14 +26,13 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-__author__ = \
-"Luis Manuel Angueira Blanco (Pexego),Omar Castiñeira Saavedra([e-mail])"
-
 from openerp.tools.translate import _
 from openerp.osv import fields, orm
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
+from datetime import datetime
+import calendar
 
-OPERATION_KEY = [
+OPERATION_KEYS = [
     ('Nothing', ''),
     ('E', 'E - Intra-Community supplies'),
     ('A', 'A - Intra-Community acquisition'),
@@ -40,109 +44,120 @@
      'delivered by legal representative')
 ]
 
-MONTH_DATES_MAPPING = {
-    '01': {'date_start': '%s-01-01', 'date_stop': '%s-01-31'},
-    '02': {'date_start': '%s-02-01', 'date_stop': '%s-02-28'},
-    '03': {'date_start': '%s-03-01', 'date_stop': '%s-03-31'},
-    '04': {'date_start': '%s-04-01', 'date_stop': '%s-04-30'},
-    '05': {'date_start': '%s-05-01', 'date_stop': '%s-05-31'},
-    '06': {'date_start': '%s-06-01', 'date_stop': '%s-06-30'},
-    '07': {'date_start': '%s-07-01', 'date_stop': '%s-07-31'},
-    '08': {'date_start': '%s-08-01', 'date_stop': '%s-08-31'},
-    '09': {'date_start': '%s-09-01', 'date_stop': '%s-09-30'},
-    '10': {'date_start': '%s-10-01', 'date_stop': '%s-10-31'},
-    '11': {'date_start': '%s-11-01', 'date_stop': '%s-11-30'},
-    '12': {'date_start': '%s-12-01', 'date_stop': '%s-12-31'},
-}
-
-
 class account_invoice(orm.Model):
     """
-    Inheritance of account invoce to add some fields
+    Inheritance of account invoce to add some fields:
     - operation_key: Operation key of invoice
     """
     _inherit = 'account.invoice'
-
-    #################
     ### FUNCTIONS ###
-    #################
+    def _assign_invoice_operation_keys(self, cr, uid, ids=None,
+                                       context=None):
+        """On first install of the module, this method is called to
+        assign a default value to invoices and fiscal position"""
+        # Marcar la posición fiscal intracomunitaria
+        fp_obj = self.pool['account.fiscal.position']
+        fp_ids = fp_obj.search(cr, uid, [('name', '=',
+                                          "Régimen Intracomunitario")],
+                                          context=context)
+        if not fp_ids:
+            return
+        fp_obj.write(cr, uid, fp_ids, {'intracommunity_operations': True},
+                     context=context)
+        invoice_ids = self.search(cr, uid, [], context=context)
+        for invoice in self.browse(cr, uid, invoice_ids, context=context):
+            if invoice.fiscal_position:
+                op_key = self._get_operation_key(invoice.fiscal_position,
+                                                 invoice.type)
+                self.write(cr, uid, invoice.id, {'operation_key': op_key},
+                           context=context)
+
+    def _get_operation_key(self, fp, type):
+        if not fp.intracommunity_operations:
+            return False
+        else:
+            # TODO: Ver cómo discernir si son prestación de servicios
+            if type == 'out_invoice' or type == 'out_refund':
+                # Establecer a entrega si es de venta
+                return 'E'
+            else:
+                # Establecer a adquisición si es de compra
+                return 'A'
+
+    def _get_year_from_fy_month(self, fy, month):
+        fy_start = datetime.strptime(fy.date_start,
+                                     DEFAULT_SERVER_DATETIME_FORMAT)
+        fy_stop = datetime.strptime(fy.date_stop,
+                                    DEFAULT_SERVER_DATETIME_FORMAT)
+        if fy_start.month < month:
+            year = fy_start.year
+        elif fy_stop.month > month:
+            year = fy_stop.year
+        else:
+            raise orm.except_orm(_('Error'),
+                _('Cannot get invoices.\nProvided month is not included '
+                  'on selected fiscal year'))
+
     def _get_invoices_by_type(self, cr, uid, partner_id, operation_key,
                               fiscalyear_id=None, period_id=None, month=None,
                               period_selection=None, context=None):
         """
-        Returns invoices ids by type (supplier/customer)
-        for a fiscalyear/period/month
+        Returns invoices ids by type (supplier/customer) for a fiscal
+        year, period or month.
         """
         assert period_selection, 'There is no period selected'
         ## Set type of invoice
         type = ['in_invoice', 'out_invoice', 'in_refund', 'out_refund']
         fy_obj = self.pool['account.fiscalyear']
         fy = fy_obj.browse(cr, uid, fiscalyear_id, context=context)
-        search_dict = [
-            ('partner_id', '=', partner_id),
-            ('state', 'in', ['open', 'paid']),
-            ('type', 'in', type),
-            ('operation_key', '=', operation_key)]
+        domain = [('partner_id', '=', partner_id),
+                  ('state', 'in', ['open', 'paid']),
+                  ('type', 'in', type),
+                  ('operation_key', '=', operation_key)]
         ## Invoices by fiscalyear (Annual)
         if period_selection == '0A':
             if not fiscalyear_id:
                 raise orm.except_orm(_('Error'),
-                                     _('Cannot get invoices.\nThere is no\
-                                     fiscalyear selected'))
-            search_dict.append(('period_id', 'in', [period.id for period in
+                        _('Cannot get invoices.\nThere is no fiscal '
+                          'year selected'))
+            domain.append(('period_id', 'in', [period.id for period in
                                                     fy.period_ids
                                                     if not period.special]))
         ## Invoices by period
         elif period_selection in ['1T', '2T', '3T', '4T']:
             if not period_id:
                 raise orm.except_orm(_('Error'),
-                                     _('Cannot get invoices.\nThere is no \
-                                     period selected'))
-            search_dict.append(('period_id', 'in', period_id))
+                    _('Cannot get invoices.\nThere is no period selected'))
+            domain.append(('period_id', 'in', period_id))
         ## Invoices by month
         else:
-            year = fy.code[:4]
             if not month and not fiscalyear_id:
                 raise orm.except_orm(_('Error'),
-                                     _('Cannot get invoices.\nThere is \
-                                     no month and/or fiscalyear selected'))
-            search_dict.append(('date_invoice', '>=',
-                                MONTH_DATES_MAPPING[month]['date_start'] %
-                                                                        year))
-            if month == '02':
-                #checks if year is leap to can search
-                #by last February date in database
-                if int(year) % 4 == 0 and \
-                (int(year) % 100 != 0 or int(year) % 400 == 0):
-                    search_dict.append(('date_invoice',
-                                        '<=', "%s-02-29" % year))
-                else:
-                    search_dict.append(('date_invoice',
-                                        '<=',
-                                        MONTH_DATES_MAPPING[month]['date' +
-                                                                   '_stop']
-                                                                   % year))
-            else:
-                search_dict.append(('date_invoice',
-                                    '<=',
-                                    MONTH_DATES_MAPPING[month]['date_stop']
-                                    % year))
-
-        return self.search(cr, uid, search_dict, context=context)
+                    _('Cannot get invoices.\nThere is no month and/or '
+                      'fiscal year selected'))
+            month = int(month)
+            year = self._get_year_from_fy_month(fy, month)
+            month_last_day = calendar.monthrange(year, month)[1]
+            date_start = datetime(year=year, month=month, day=1)
+            date_stop = datetime(year=year, month=month, day=month_last_day)
+            domain.append(('date_invoice', '>=',
+                        date_start.strftime(DEFAULT_SERVER_DATETIME_FORMAT)))
+            domain.append(('date_invoice', '<=',
+                        date_stop.strftime(DEFAULT_SERVER_DATETIME_FORMAT)))
+        return self.search(cr, uid, domain, context=context)
 
     def clean_refund_invoices(self, cr, uid, ids, partner_id,
                               fiscalyear_id=None, period_id=None,
                               month=None, period_selection=None, context=None):
-        """separates restitution invoices"""
-        invoice_lines = []
-        restitution_lines = []
-        fiscal_y_obj = self.pool.get('account.fiscalyear')
-        fiscalyear_brw = fiscal_y_obj.browse(cr, uid, fiscalyear_id, context=context)
-
+        """Separate refund invoices"""
+        invoice_ids = []
+        refund_ids = []
+        fy_obj = self.pool['account.fiscalyear']
+        fy = fy_obj.browse(cr, uid, fiscalyear_id, context=context)
         for refund in self.browse(cr, uid, ids, context=context):
             if refund.type in ['in_refund', 'out_refund']:
                 if not refund.origin_invoices_ids:
-                    invoice_lines.append(refund.id)
+                    invoice_ids.append(refund.id)
                     continue
                 for origin_line in refund.origin_invoices_ids:
                     if origin_line.state in ['open', 'paid'] and \
@@ -150,78 +165,38 @@
                         if period_selection == '0A':
                             if origin_line.period_id.id not in \
                                         [period.id for period in
-                                        fiscalyear_brw.period_ids if not \
-                                        period.special]:
-                                restitution_lines.append(refund.id)
-                                break
+                                         fy.period_ids if not period.special]:
+                                refund_ids.append(refund.id)
                             else:
-                                invoice_lines.append(refund.id)
-                                break
+                                invoice_ids.append(refund.id)
                         elif period_selection in ['1T', '2T', '3T', '4T']:
                             if origin_line.period_id.id != period_id:
-                                restitution_lines.append(refund.id)
-                                break
+                                refund_ids.append(refund.id)
                             else:
-                                invoice_lines.append(refund.id)
-                                break
+                                invoice_ids.append(refund.id)
                         else:
-                            if origin_line.date_invoice < \
-                                    MONTH_DATES_MAPPING[month]['date_start'] \
-                                    % fiscalyear_brw.code[:4]:
-                                restitution_lines.append(refund.id)
-                                break
+                            month = int(month)
+                            year = self._get_year_from_fy_month(fy, month)
+                            if datetime.strptime(origin_line.date_invoice,
+                                    DEFAULT_SERVER_DATETIME_FORMAT) < \
+                                    datetime(year=year, month=month, day=1):
+                                refund_ids.append(refund.id)
                             else:
-                                invoice_lines.append(refund.id)
-                                break
+                                invoice_ids.append(refund.id)
+                        break
             else:
-                invoice_lines.append(refund.id)
-
-        return invoice_lines, restitution_lines
-
-    def on_change_fiscal_position(self, cr, uid, ids,
-                                  fiscal_position, type, context=None):
-        """
-        Suggest an operation key when fiscal position changes
-        """
-        res = {'value': {'operation_key': 'Nothing'}}
+                invoice_ids.append(refund.id)
+        return invoice_ids, refund_ids
+
+    def on_change_fiscal_position(self, cr, uid, ids, fiscal_position,
+                                  type, context=None):
+        """Suggest an operation key when fiscal position changes."""
+        res = {'operation_key': 'Nothing'}
         if fiscal_position and type:
-            obj = self.pool.get('account.fiscal.position')
-            if obj.browse(cr, uid, fiscal_position, context=context).intracommunity_operations:
-                if type == 'out_invoice':
-                    # Set to supplies when type is customer invoice
-                    res = {'value': {'operation_key': 'E'}}
-                else:
-                    # Set to acquisition when type is supplier invoice
-                    res = {'value': {'operation_key': 'A'}}
-        return res
-
-    def onchange_partner_id(self, cr, uid, ids,
-                            type, partner_id, date_invoice=False,
-                            payment_term=False, partner_bank_id=False,
-                            company_id=False, context=None):
-        """
-        Inheritance to extend method and return operation key
-        """
-        ## Get original data from onchange method
-        res = super(account_invoice,
-                    self).onchange_partner_id(cr, uid, ids, type, partner_id,
-                                              date_invoice=date_invoice,
-                                              payment_term=payment_term,
-                                              partner_bank_id=partner_bank_id,
-                                              company_id=company_id,
-                                              context=context)
-        ## Get operation key for current record
-        operation_key_dict = self.on_change_fiscal_position(cr, uid, ids,
-            fiscal_position=res['value']['fiscal_position'], type=type,
-            context=context)
-        ## Add operation key to result
-        if operation_key_dict['value'] and \
-                operation_key_dict['value']['operation_key']:
-            res['value']['operation_key'] = (
-                                operation_key_dict['value']['operation_key'])
-        else:
-            res['value']['operation_key'] = False
-        return res
+            fp_obj = self.pool['account.fiscal.position']
+            fp = fp_obj.browse(cr, uid, fiscal_position, context=context)
+            res['operation_key'] = self._get_operation_key(fp, type)
+        return {'value': res}
 
     def create(self, cr, uid, vals, context=None):
         """Writes operation key value, if invoice is created in
@@ -231,13 +206,12 @@
             fp_obj = self.pool['account.fiscal.position']
             if fp_obj.browse(cr, uid, vals.get('fiscal_position'),
                           context=context).intracommunity_operations:
-                if vals.get('type') == 'out_invoice':
-                    vals['operation_key'] = 'E'
-                else:
-                    vals['operation_key'] = 'A'
+                vals['operation_key'] = self._get_operation_key(
+                                                    vals['fiscal_position'],
+                                                    vals['type'])
         return super(account_invoice, self).create(cr, uid, vals,
                                                    context=context)
 
     _columns = {
-        'operation_key': fields.selection(OPERATION_KEY, 'Operation key')
+        'operation_key': fields.selection(OPERATION_KEYS, 'Operation key')
     }

=== modified file 'l10n_es_aeat_mod349/account_invoice_view.xml'
--- l10n_es_aeat_mod349/account_invoice_view.xml	2013-11-22 23:44:11 +0000
+++ l10n_es_aeat_mod349/account_invoice_view.xml	2014-04-15 12:47:56 +0000
@@ -12,8 +12,8 @@
             <field name="model">account.invoice</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
-                <field name="fiscal_position" position="replace">
-                    <field name="fiscal_position" on_change="on_change_fiscal_position(fiscal_position, type)"/>
+                <field name="fiscal_position" position="attributes">
+                    <attribute name="on_change">on_change_fiscal_position(fiscal_position, type)</attribute>
                 </field>
             </field>
         </record>
@@ -38,8 +38,8 @@
             <field name="model">account.invoice</field>
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
-                <field name="fiscal_position" position="replace">
-                    <field name="fiscal_position" on_change="on_change_fiscal_position(fiscal_position, type)"/>
+                <field name="fiscal_position" position="attributes">
+                    <attribute name="on_change">on_change_fiscal_position(fiscal_position, type)</attribute>
                 </field>
             </field>
         </record>

=== added directory 'l10n_es_aeat_mod349/data'
=== added file 'l10n_es_aeat_mod349/data/assign_invoices_op_keys.xml'
--- l10n_es_aeat_mod349/data/assign_invoices_op_keys.xml	1970-01-01 00:00:00 +0000
+++ l10n_es_aeat_mod349/data/assign_invoices_op_keys.xml	2014-04-15 12:47:56 +0000
@@ -0,0 +1,5 @@
+<openerp>
+    <data noupdate="1">
+        <function model="account.invoice" name="_assign_invoice_operation_keys"/>
+    </data>
+</openerp>
\ No newline at end of file

=== modified file 'l10n_es_aeat_mod349/i18n/es.po' (properties changed: +x to -x)
--- l10n_es_aeat_mod349/i18n/es.po	2014-04-15 07:53:51 +0000
+++ l10n_es_aeat_mod349/i18n/es.po	2014-04-15 12:47:56 +0000
@@ -4,15 +4,22 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.1-20130731-233420\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< TREE
 "POT-Creation-Date: 2010-12-13 17:53+0000\n"
 "PO-Revision-Date: 2014-04-14 21:25+0000\n"
 "Last-Translator: Pedro Manuel Baeza <[e-mail]>\n"
+=======
+"POT-Creation-Date: 2014-04-14 18:38+0000\n"
+"PO-Revision-Date: 2014-04-14 20:38+0100\n"
+"Last-Translator: Pedro Manuel Baeza <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-04-15 07:53+0000\n"
 "X-Generator: Launchpad (build 16976)\n"
 
@@ -24,144 +31,100 @@
 #. module: l10n_es_aeat_mod349
 #: selection:l10n.es.aeat.mod349.report,period_selection:0
 #: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
+=======
+"Plural-Forms: \n"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
+#: selection:l10n.es.aeat.mod349.report,period_selection:0
+msgid "0A - Annual"
+msgstr "0A - Anual"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
+#: selection:l10n.es.aeat.mod349.report,period_selection:0
+>>>>>>> MERGE-SOURCE
 msgid "1T - First Quarter"
-msgstr "1T - Primer Trimestre"
-
-#. module: l10n_ES_aeat_mod349
-#: rml:report_l10n_es_aeat_mod349.report:0
-msgid "Year"
-msgstr "Year"
-
-#. module: l10n_ES_aeat_mod349
-#: rml:report_l10n_es_aeat_mod349.report:0
-#: field:l10n.es.aeat.mod349.partner_refund,period_selection:0
-#: field:l10n.es.aeat.mod349.report,period_id:0
-#: field:l10n.es.aeat.mod349.report,period_selection:0
-msgid "Period"
-msgstr "Período"
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/mod349.py:153
-#, python-format
-msgid "All partner refunds fields (country, VAT number) must be filled."
-msgstr ""
-"Todos los campos de las rectificaciones (país, número CIF/NIF) deben estar "
-"rellenados."
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/mod349.py:149
-#, python-format
-msgid "All partner records fields (country, VAT number) must be filled."
-msgstr ""
-"Todos los campos de los registros de empresas (país, número CIF/NIF) deben "
-"estar rellenados."
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_refund,total_origin_amount:0
-msgid "Original amount"
-msgstr "Importe original"
-
-#. module: l10n_es_aeat_mod349
-#: field:account.fiscal.position,intracommunity_operations:0
-msgid "Intra-Community operations"
-msgstr "Operaciones intracomunitarias"
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/mod349.py:192
-#, python-format
-msgid ""
-"Name '%s' have not allowed characters.\n"
-"Please, fix it before confirm the report"
-msgstr ""
-"El nombre '%s' tiene caracteres no permitidos.\n"
-"Por favor, arréglelo antes de confirmar la declaración."
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/wizard/export_mod349_to_boe.py:169
-#: code:addons/l10n_es_aeat_mod349/wizard/export_mod349_to_boe.py:224
-#, python-format
-msgid "The type 2 record must be 502 characters long"
-msgstr "El tipo de registro 2 debe ser de 502 caracteres de largo"
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/mod349.py:149
-#: code:addons/l10n_es_aeat_mod349/mod349.py:153
-#: code:addons/l10n_es_aeat_mod349/mod349.py:179
-#: code:addons/l10n_es_aeat_mod349/mod349.py:191
-#: code:addons/l10n_es_aeat_mod349/mod349.py:198
-#: code:addons/l10n_es_aeat_mod349/mod349.py:205
-#, python-format
-msgid "Error!"
-msgstr "¡Error!"
-
-#. module: l10n_es_aeat_mod349
-#: help:l10n.es.aeat.mod349.partner_record,partner_record_ok:0
-msgid "Checked if Partner record is OK"
-msgstr "Marcado si el registro de empresa es correcto."
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,partner_refund_ids:0
-msgid "Partner refund IDS"
-msgstr "IDs de rectificaciones"
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,total_partner_refunds_amount:0
-msgid "Partners refunds amount"
-msgstr "Importe rectificaciones"
-
-#. module: l10n_es_aeat_mod349
-#: help:l10n.es.aeat.mod349.report,contact_name:0
-msgid "Must have name and surname."
-msgstr "Debe contener nombre y apellidos"
-
-#. module: l10n_es_aeat_mod349
-#: selection:account.invoice,operation_key:0
-#: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
-#: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
-msgid " "
-msgstr " "
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
-msgid "March"
-msgstr "Marzo"
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,period_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
+msgstr "1T - Primer trimestre"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
+#: selection:l10n.es.aeat.mod349.report,period_selection:0
+msgid "2T - Second Quarter"
+msgstr "2T - Segundo trimestre"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
+#: selection:l10n.es.aeat.mod349.report,period_selection:0
+msgid "3T - Third Quarter"
+msgstr "3T - Tercer trimestre"
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.report:0
+msgid "413"
+msgstr "413"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
+#: selection:l10n.es.aeat.mod349.report,period_selection:0
 msgid "4T - Fourth Quarter"
-msgstr "4T - Cuarto Trimestre"
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-#: field:l10n.es.aeat.mod349.report,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-#: selection:l10n.es.aeat.mod349.report,state:0
-msgid "Done"
-msgstr "Realizada"
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "In process"
-msgstr "En proceso"
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,type:0
-msgid "Substitutive"
-msgstr "Sustitutiva"
+msgstr "4T - Cuarto trimestre"
 
 #. module: l10n_es_aeat_mod349
 #: selection:account.invoice,operation_key:0
 #: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
 #: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
 #: report:report_l10n_es_aeat_mod349.report:0
-msgid "E - Intra-Community supplies"
-msgstr "E - Entregas intracomunitarias"
+msgid "A - Intra-Community acquisition"
+msgstr "A - Adquisición intracomunitaria"
+
+#. module: l10n_es_aeat_mod349
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "AEAT 349 MODEL"
+msgstr "MODELO 349"
+
+#. module: l10n_es_aeat_mod349
+#: model:ir.ui.menu,name:l10n_es_aeat_mod349.menu_aeat_mod349_report
+msgid "AEAT 349 Model"
+msgstr "Modelo AEAT 349"
+
+#. module: l10n_es_aeat_mod349
+#: code:_description:0
+#: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349_partner_record
+#, python-format
+msgid "AEAT 349 Model - Partner record"
+msgstr "Modelo 349 - Registro de empresa"
+
+#. module: l10n_es_aeat_mod349
+#: code:_description:0
+#: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349_partner_record_detail
+#, python-format
+msgid "AEAT 349 Model - Partner record detail"
+msgstr "Modelo 349 - Detalle de registro de empresa"
+
+#. module: l10n_es_aeat_mod349
+#: code:_description:0
+#: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349_partner_refund
+#, python-format
+msgid "AEAT 349 Model - Partner refund"
+msgstr "Modelo 349 - Rectificativa de empresa"
+
+#. module: l10n_es_aeat_mod349
+#: code:_description:0
+#: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349_partner_refund_detail
+#, python-format
+msgid "AEAT 349 Model - Partner refund detail"
+msgstr "Modelo 349  - Detalle de rectificación"
+
+#. module: l10n_es_aeat_mod349
+#: model:ir.actions.report.xml,name:l10n_es_aeat_mod349.report_l10n_es_aeat_mod349
+msgid "AEAT 349 Model report"
+msgstr "Declaración modelo 349"
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.partner_record_detail:0
+msgid "AEAT 349 Partner record"
+msgstr "Registro de empresa modelo 349"
 
 #. module: l10n_es_aeat_mod349
 #: view:l10n.es.aeat.mod349.partner_record_detail:0
@@ -169,21 +132,24 @@
 msgstr "Detalle de Registro de Empresa AEAT 349"
 
 #. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,fiscalyear_id:0
-#: view:l10n.es.aeat.mod349.report:0
-msgid "Fiscal Year"
-msgstr "Ejercicio fiscal"
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,previous_number:0
-msgid "Previous Declaration Number"
-msgstr "Numero de declaración anterior"
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-#: field:l10n.es.aeat.mod349.report,partner_record_ids:0
-msgid "Partner records"
-msgstr "Registros de empresas"
+#: view:l10n.es.aeat.mod349.partner_record:0
+msgid "AEAT 349 Partner records"
+msgstr "Registros de empresa modelo 349"
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.partner_refund_detail:0
+msgid "AEAT 349 Partner refund"
+msgstr "Rectificaciones modelo 349"
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.partner_refund_detail:0
+msgid "AEAT 349 Partner refund detail"
+msgstr "Detalle de rectificación modelo 349"
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.partner_refund:0
+msgid "AEAT 349 Partner refunds"
+msgstr "Rectificaciones modelo 349"
 
 #. module: l10n_es_aeat_mod349
 #: field:l10n.es.aeat.mod349.partner_record,report_id:0
@@ -192,144 +158,46 @@
 msgstr "ID declaración modelo 349"
 
 #. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,type:0
-msgid "Normal"
-msgstr "Normal"
+#: view:l10n.es.aeat.mod349.report:0
+msgid "AEAT 349 reports"
+msgstr "Declaraciones AEAT 349"
 
 #. module: l10n_es_aeat_mod349
+<<<<<<< TREE
 #: model:ir.ui.menu,name:l10n_es_aeat_mod349.menu_aeat_mod349_report
 msgid "AEAT 349 Model"
 msgstr "Declaración AEAT 349"
-
-#. module: l10n_es_aeat_mod349
-#: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349_partner_refund_detail
-msgid "AEAT 349 Model - Partner refund detail"
-msgstr "Modelo 349  - Detalle de rectificación"
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
-msgid "July"
-msgstr "Julio"
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_record,partner_vat:0
-#: field:l10n.es.aeat.mod349.partner_refund,partner_vat:0
-#: report:report_l10n_es_aeat_mod349.report:0
-msgid "VAT"
-msgstr "CIF/NIF"
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_refund_detail,refund_id:0
-msgid "Partner refund ID"
-msgstr "ID Rectificación"
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/account_invoice.py:94
-#, python-format
-msgid ""
-"Cannot get invoices.\n"
-"There is no period selected"
-msgstr ""
-"No se pueden obtener facturas.\n"
-"No hay un periodo seleccionado."
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/account_invoice.py:86
-#, python-format
-msgid ""
-"Cannot get invoices.\n"
-"There is no fiscalyear selected"
-msgstr ""
-"No se pueden obtener facturas.\n"
-"No hay un ejercicio fiscal seleccionado."
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/account_invoice.py:102
-#, python-format
-msgid ""
-"Cannot get invoices.\n"
-"There is no month and/or fiscalyear selected"
-msgstr ""
-"No se pueden obtener facturas.\n"
-"No hay mes y/o ejercicio fiscal seleccionado."
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/wizard/export_mod349_to_boe.py:117
-#, 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"
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/mod349.py:171
-#, python-format
-msgid "Company without Title"
-msgstr "Compañía sin título"
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/mod349.py:179
-#, python-format
-msgid "Contact name (Full name) must have name and surname"
-msgstr ""
-"El nombre del contacto (Nombre completo) debe contener nombre y apellidos"
-
-#. module: l10n_es_aeat_mod349
-#: help:l10n.es.aeat.mod349.partner_refund,total_origin_amount:0
-#: field:l10n.es.aeat.mod349.partner_refund,total_origin_amount:0
-msgid "Refund original amount"
-msgstr "Importe operación original"
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/mod349.py:172
-#, python-format
-msgid ""
-"Company has no company title.\n"
-"This may cause some problems when trying to import on AEAT help program"
-msgstr ""
-"La compañía no tiene un título definido.\n"
-"Esto podría causar algunos problemas intentando importar en el programa de "
-"ayuda de la AEAT."
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/mod349.py:206
-#, python-format
-msgid ""
-"Partner name '%s' in refund lines is not valid due to incorrect characters"
-msgstr ""
-"El nombre de la empresa '%s' en las líneas de rectificaciones no es válido "
-"por contener caracteres incorrectos."
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/mod349.py:199
-#, python-format
-msgid ""
-"Partner name '%s' in partner records is not valid due to incorrect characters"
-msgstr ""
-"El nombre de la empresa '%s' en los registros de empresas no es válido "
-"debido a caracteres incorrectos."
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "Recalculate"
-msgstr "Recalcular"
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "Declaration"
-msgstr "Declaración"
-
-#. module: l10n_es_aeat_mod349
+=======
+#: model:ir.actions.act_window,name:l10n_es_aeat_mod349.action_l10n_es_aeat_mod349_report
+msgid "AEAT Model 349"
+msgstr "Modelo AEAT 349"
+>>>>>>> MERGE-SOURCE
+
+#. module: l10n_es_aeat_mod349
+#: code:_description:0
 #: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349_report
+#, python-format
 msgid "AEAT Model 349 Report"
 msgstr "Declaración modelo AEAT 349"
 
 #. module: l10n_es_aeat_mod349
-#: selection:account.invoice,operation_key:0
-#: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
-#: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
-#: report:report_l10n_es_aeat_mod349.report:0
-msgid "T - Triangular operations"
-msgstr "T - Operaciones triangulares"
+#: code:addons/l10n_es_aeat_mod349/mod349.py:142
+#: code:addons/l10n_es_aeat_mod349/mod349.py:153
+#, python-format
+msgid "All amounts must be positives"
+msgstr "All amounts must be positives"
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/mod349.py:137
+#, python-format
+msgid "All partner records fields (country, VAT number) must be filled."
+msgstr "Todos los campos de los registros de empresas (país, número CIF/NIF) deben estar rellenados."
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/mod349.py:147
+#, python-format
+msgid "All partner refunds fields (country, VAT number) must be filled."
+msgstr "Todos los campos de las rectificaciones (país, número CIF/NIF) deben estar rellenados."
 
 #. module: l10n_es_aeat_mod349
 #: field:l10n.es.aeat.mod349.partner_record_detail,amount_untaxed:0
@@ -338,131 +206,16 @@
 msgstr "Importe sin impuestos"
 
 #. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_record,record_detail_ids:0
-msgid "Partner record detail IDS"
-msgstr "IDs Detalle de registro de empresa"
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "Identification"
-msgstr "Identificación"
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,type:0
-msgid "Statement Type"
-msgstr "Tipo de declaración"
-
-#. module: l10n_es_aeat_mod349
-#: report:report_l10n_es_aeat_mod349.report:0
-msgid "Op. Amount"
-msgstr "Importe op."
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.partner_refund_detail:0
-msgid "AEAT 349 Partner refund"
-msgstr "Rectificaciones modelo 349"
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,state:0
-msgid "State"
-msgstr "Estado"
-
-#. module: l10n_es_aeat_mod349
-#: model:ir.actions.act_window,help:l10n_es_aeat_mod349.action_l10n_es_aeat_mod349_report
-msgid "Create and query AEAT Model 349 Reports"
-msgstr "Permite crear y consultar las declaraciones sobre el modelo AEAT 349"
-
-#. module: l10n_es_aeat_mod349
-#: report:report_l10n_es_aeat_mod349.report:0
-msgid "Fiscal year:"
-msgstr "Ejercicio fiscal:"
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_record,partner_record_ok:0
-msgid "Partner Record OK"
-msgstr "Registro de empresa correcto"
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,period_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
-msgid "MO - Monthly"
-msgstr "MO - Mensual"
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_record_detail,partner_record_id:0
-msgid "Partner record"
-msgstr "Registro de empresa"
-
-#. module: l10n_es_aeat_mod349
-#: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349_calculate_records
-msgid "AEAT Model 349 Wizard - Calculate Records"
-msgstr "Asistente modelo AEAT 349 - Calcular registros"
-
-#. module: l10n_es_aeat_mod349
-#: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349_partner_refund
-msgid "AEAT 349 Model - Partner refund"
-msgstr "Modelo 349 - Rectificativa de empresa"
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,support_type:0
-msgid "Support Type"
-msgstr "Tipo de soporte"
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "Export to BOE"
-msgstr "Exportar a formato BOE"
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.partner_refund_detail:0
-msgid "AEAT 349 Partner refund detail"
-msgstr "Detalle de rectificación modelo 349"
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.partner_record:0
-#: view:l10n.es.aeat.mod349.partner_refund:0
-msgid "Info"
-msgstr "Info"
-
-#. module: l10n_es_aeat_mod349
-#: report:report_l10n_es_aeat_mod349.report:0
-msgid "PARTNER REFUND LINES"
-msgstr "LÍNEAS DE RECTIFICACIONES"
-
-#. module: l10n_es_aeat_mod349
-#: selection:account.invoice,operation_key:0
-#: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
-#: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
-#: report:report_l10n_es_aeat_mod349.report:0
-msgid "A - Intra-Community acquisition"
-msgstr "A - Adquisición intracomunitaria"
-
-#. module: l10n_es_aeat_mod349
-#: report:report_l10n_es_aeat_mod349.report:0
-msgid "Operation key help"
-msgstr "Leyenda llave de operación"
-
-#. module: l10n_es_aeat_mod349
-#: selection:account.invoice,operation_key:0
-#: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
-#: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
-msgid "I - Intra-Community services acquisitions"
-msgstr "I - Adqusiciones intracomunitarias de servicios"
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.partner_record_detail:0
-msgid "AEAT 349 Partner record"
-msgstr "Registro de empresa modelo 349"
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.partner_refund:0
-msgid "AEAT 349 Partner refunds"
-msgstr "Rectificaciones modelo 349"
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: selection:l10n.es.aeat.mod349.report,month_selection:0
+msgid "April"
+msgstr "Abril"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: selection:l10n.es.aeat.mod349.report,month_selection:0
+msgid "August"
+msgstr "Agosto"
 
 #. module: l10n_es_aeat_mod349
 #: field:l10n.es.aeat.mod349.report,calculation_date:0
@@ -470,158 +223,376 @@
 msgstr "Fecha de cálculo"
 
 #. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.partner_record:0
-msgid "Detail lines"
-msgstr "Líneas de detalle"
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_record,partner_id:0
-#: field:l10n.es.aeat.mod349.partner_refund,partner_id:0
+#: selection:l10n.es.aeat.mod349.report,state:0
+msgid "Cancelled"
+msgstr "Cancelled"
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/account_invoice.py:107
+#, python-format
+msgid ""
+"Cannot get invoices.\n"
+"There is                                      no month and/or fiscalyear selected"
+msgstr ""
+"Cannot get invoices.\n"
+"There is                                      no month and/or fiscalyear selected"
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/account_invoice.py:99
+#, python-format
+msgid ""
+"Cannot get invoices.\n"
+"There is no                                      period selected"
+msgstr ""
+"Cannot get invoices.\n"
+"There is no                                      period selected"
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/account_invoice.py:90
+#, python-format
+msgid ""
+"Cannot get invoices.\n"
+"There is no                                     fiscalyear selected"
+msgstr ""
+"Cannot get invoices.\n"
+"There is no                                     fiscalyear selected"
+
+#. module: l10n_es_aeat_mod349
+#: help:l10n.es.aeat.mod349.partner_record,partner_record_ok:0
+msgid "Checked if partner record is OK"
+msgstr "Marcado si el registro de empresa está correcto"
+
+#. module: l10n_es_aeat_mod349
+#: help:l10n.es.aeat.mod349.partner_refund,partner_refund_ok:0
+msgid "Checked if refund record is OK"
+msgstr "Marcado si el registro de factura rectificativa está correcto"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/mod349.py:167
+#, python-format
+msgid ""
+"Company has no company title.\n"
+"This may cause some problems when trying to import on AEAT help program"
+msgstr ""
+"La compañía no tiene un título definido.\n"
+"Esto podría causar algunos problemas intentando importar en el programa de ayuda de la AEAT."
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/mod349.py:166
+#, python-format
+msgid "Company without Title"
+msgstr "Compañía sin título"
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.report:0
+msgid "Complementaria"
+msgstr "Complementaria"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.report,type:0
+msgid "Complementary"
+msgstr "Complementaria"
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/mod349.py:176
+#, python-format
+msgid "Contact name (Full name) must have name and surname"
+msgstr "El nombre del contacto (Nombre completo) debe contener nombre y apellidos"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_record,country_id:0
+#: field:l10n.es.aeat.mod349.partner_refund,country_id:0
 #: report:report_l10n_es_aeat_mod349.report:0
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,contact_name:0
-msgid "Full Name"
-msgstr "Nombre completo"
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
-msgid "September"
-msgstr "Septiembre"
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+msgid "Country"
+msgstr "País"
+
+#. module: l10n_es_aeat_mod349
+#: model:ir.actions.act_window,help:l10n_es_aeat_mod349.action_l10n_es_aeat_mod349_report
+msgid "Create and query AEAT Model 349 reports"
+msgstr "Crea y consulta declaraciones de la AEAT modelo 349"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.report,support_type:0
+msgid "DVD"
+msgstr "DVD"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_record_detail,date:0
+#: field:l10n.es.aeat.mod349.partner_refund_detail,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: selection:l10n.es.aeat.mod349.report,month_selection:0
 msgid "December"
 msgstr "Diciembre"
 
 #. module: l10n_es_aeat_mod349
-#: report:report_l10n_es_aeat_mod349.report:0
-msgid "Support type:"
-msgstr "Tipo de soporte:"
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.partner_record:0
-msgid "AEAT 349 Partner records"
-msgstr "Registros de empresa modelo 349"
+#: view:l10n.es.aeat.mod349.report:0
+msgid "Declaración"
+msgstr "Declaración"
 
 #. module: l10n_es_aeat_mod349
 #: field:l10n.es.aeat.mod349.report,number:0
-msgid "Declaration Number"
-msgstr "Número de declaración"
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,month_selection:0
-#: field:l10n.es.aeat.mod349.partner_refund,month_selection:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,state:0
-msgid "Canceled"
-msgstr "Cancelada"
-
-#. module: l10n_es_aeat_mod349
-#: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349_partner_record_detail
-msgid "AEAT 349 Model - Partner record detail"
-msgstr "Modelo 349 - Detalle de registro de empresa"
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,period_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
-msgid "3T - Third Quarter"
-msgstr "3T - Tercer Trimestre"
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "Calculate"
-msgstr "Calcular"
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,support_type:0
-msgid "DVD"
-msgstr "DVD"
-
-#. module: l10n_es_aeat_mod349
+msgid "Declaration number"
+msgstr "Número declaración"
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.partner_record:0
+msgid "Detail lines"
+msgstr "Líneas de detalle"
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.partner_refund:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.report,state:0
+msgid "Done"
+msgstr "Realizada"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: l10n_es_aeat_mod349
+#: selection:account.invoice,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
 #: report:report_l10n_es_aeat_mod349.report:0
-msgid "AEAT 349 MODEL"
-msgstr "MODELO 349"
-
-#. module: l10n_es_aeat_mod349
+msgid "E - Intra-Community supplies"
+msgstr "E - Entregas intracomunitarias"
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/account_invoice.py:89
+#: code:addons/l10n_es_aeat_mod349/account_invoice.py:98
+#: code:addons/l10n_es_aeat_mod349/account_invoice.py:106
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/mod349.py:136
+#: code:addons/l10n_es_aeat_mod349/mod349.py:141
+#: code:addons/l10n_es_aeat_mod349/mod349.py:146
+#: code:addons/l10n_es_aeat_mod349/mod349.py:152
+#: code:addons/l10n_es_aeat_mod349/mod349.py:175
+#: code:addons/l10n_es_aeat_mod349/mod349.py:185
+#: code:addons/l10n_es_aeat_mod349/mod349.py:191
+#: code:addons/l10n_es_aeat_mod349/mod349.py:198
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: l10n_es_aeat_mod349
+#: model:ir.actions.act_window,name:l10n_es_aeat_mod349.action_wizard_aeat_mod349_export
+msgid "Export AEAT 349 BOE file"
+msgstr "Exportar archivo BOE de la AEAT 349"
+
+#. module: l10n_es_aeat_mod349
+#: code:_description:0
 #: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349_export_to_boe
+#, python-format
 msgid "Export AEAT Model 349 to BOE format"
 msgstr "Exportar modelo AEAT 349 a formato BOE"
 
 #. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-#: selection:l10n.es.aeat.mod349.report,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,company_vat:0
-msgid "VAT number"
-msgstr "CIF/NIF"
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_refund,refund_detail_ids:0
-msgid "Partner refund detail IDS"
-msgstr "IDs Detalles de rectificaciones"
-
-#. module: l10n_es_aeat_mod349
-#: report:report_l10n_es_aeat_mod349.report:0
-msgid "Orig. Amount"
-msgstr "Importe orig."
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: selection:l10n.es.aeat.mod349.report,month_selection:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.export_to_boe,data:0
+msgid "File"
+msgstr "Archivo"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.export_to_boe,name:0
+msgid "File name"
+msgstr "Nombre de archivo"
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/wizard/export_mod349_to_boe.py:91
+#: code:addons/l10n_es_aeat_mod349/wizard/export_mod349_to_boe.py:155
+#, python-format
+msgid "First four characters of fiscal year                                  code must be numeric and contain the fiscal                                  year number. Please, fix it and try again."
+msgstr "First four characters of fiscal year                                  code must be numeric and contain the fiscal                                  year number. Please, fix it and try again."
+
+#. module: l10n_es_aeat_mod349
+#: code:_description:0
+#: model:ir.model,name:l10n_es_aeat_mod349.model_account_fiscal_position
+#, python-format
+msgid "Fiscal Position"
+msgstr "Posición fiscal"
 
 #. module: l10n_es_aeat_mod349
 #: field:l10n.es.aeat.mod349.partner_refund,fiscalyear_id:0
-msgid "Fiscalyear"
+#: field:l10n.es.aeat.mod349.report,fiscalyear_id:0
+msgid "Fiscal year"
 msgstr "Ejercicio fiscal"
 
 #. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_refund_detail,total_origin_amount:0
-msgid "Origin total amount"
-msgstr "Total original"
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,state:0
-msgid "Processing"
-msgstr "Procesando"
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: code:addons/l10n_es_aeat_mod349/wizard/export_mod349_to_boe.py:90
+#: code:addons/l10n_es_aeat_mod349/wizard/export_mod349_to_boe.py:154
+#, python-format
+msgid "Fiscal year code"
+msgstr "Fiscal year code"
+
+#. module: l10n_es_aeat_mod349
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "Fiscal year:"
+msgstr "Ejercicio fiscal:"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,frequency_change:0
+msgid "Frequency change"
+msgstr "Cambio de frecuencia"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,contact_name:0
+msgid "Full Name"
+msgstr "Nombre completo"
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.report:0
+msgid "General"
+msgstr "General"
+
+#. module: l10n_es_aeat_mod349
+#: selection:account.invoice,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
+msgid "H - Intra-Community supplies without taxes delivered by legal representative"
+msgstr "H - Intra-Community supplies without taxes delivered by legal representative"
+
+#. module: l10n_es_aeat_mod349
+#: selection:account.invoice,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
+msgid "I - Intra-Community services acquisitions"
+msgstr "I - Adqusiciones intracomunitarias de servicios"
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.partner_record:0
+#: view:l10n.es.aeat.mod349.partner_refund:0
+msgid "Info"
+msgstr "Info"
+
+#. module: l10n_es_aeat_mod349
+#: field:account.fiscal.position,intracommunity_operations:0
+msgid "Intra-Community operations"
+msgstr "Operaciones intracomunitarias"
+
+#. module: l10n_es_aeat_mod349
+#: code:_description:0
+#: model:ir.model,name:l10n_es_aeat_mod349.model_account_invoice
+#: field:l10n.es.aeat.mod349.partner_record_detail,invoice_id:0
+#, python-format
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_refund_detail,invoice_id:0
+msgid "Invoice ID"
+msgstr "ID Factura"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: selection:l10n.es.aeat.mod349.report,month_selection:0
+msgid "January"
+msgstr "Enero"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: selection:l10n.es.aeat.mod349.report,month_selection:0
+msgid "July"
+msgstr "Julio"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: selection:l10n.es.aeat.mod349.report,month_selection:0
 msgid "June"
 msgstr "Junio"
 
 #. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "Options"
-msgstr "Opciones"
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,contact_phone:0
-msgid "Phone"
-msgstr "Teléfono"
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_record_detail,date:0
-#: field:l10n.es.aeat.mod349.partner_refund_detail,date:0
-msgid "Date"
-msgstr "Fecha"
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: field:l10n.es.aeat.mod349.report,representative_vat:0
+msgid "L.R. VAT number"
+msgstr "CIF/NIF Repr. legal"
+
+#. module: l10n_es_aeat_mod349
+#: help:l10n.es.aeat.mod349.report,representative_vat:0
+msgid "Legal Representative VAT number."
+msgstr "CIF/NIF Reprensentante legal."
+
+#. module: l10n_es_aeat_mod349
+#: selection:account.invoice,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
+msgid "M - Intra-Community supplies without taxes"
+msgstr "M - Intra-Community supplies without taxes"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
+#: selection:l10n.es.aeat.mod349.report,period_selection:0
+msgid "MO - Monthly"
+msgstr "MO - Mensual"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: selection:l10n.es.aeat.mod349.report,month_selection:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: selection:l10n.es.aeat.mod349.report,month_selection:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: field:l10n.es.aeat.mod349.report,month_selection:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: l10n_es_aeat_mod349
+#: help:l10n.es.aeat.mod349.report,contact_name:0
+msgid "Must have name and surname."
+msgstr "Debe contener nombre y apellidos"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_record,name:0
+#: field:l10n.es.aeat.mod349.report,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/mod349.py:186
+#, python-format
+msgid ""
+"Name '%s' have not allowed characters.\n"
+"Please, fix it before confirm the report"
+msgstr ""
+"El nombre '%s' tiene caracteres no permitidos.\n"
+"Por favor, arréglelo antes de confirmar la declaración."
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.report,type:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: selection:l10n.es.aeat.mod349.report,month_selection:0
 msgid "November"
 msgstr "Noviembre"
 
@@ -631,91 +602,20 @@
 msgstr "Número:"
 
 #. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_record,total_operation_amount:0
-#: field:l10n.es.aeat.mod349.partner_refund,total_operation_amount:0
-msgid "Total operation amount"
-msgstr "Importe total operación"
-
-#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
 #: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
 msgid "October"
 msgstr "Octubre"
 
 #. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,period_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
-msgid "2T - Second Quarter"
-msgstr "2T - Segundo Trimestre"
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
-msgid "January"
-msgstr "Enero"
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "Summary"
-msgstr "Resumen"
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,state:0
-msgid "Processed"
-msgstr "Calculada"
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,representative_vat:0
-msgid "L.R. VAT number"
-msgstr "CIF/NIF Repr. legal"
-
-#. module: l10n_es_aeat_mod349
-#: selection:account.invoice,operation_key:0
-#: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
-#: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
-msgid "S - Intra-Community services"
-msgstr "S - Prestaciones de servicios intracomunitarias"
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,total_partner_records:0
-msgid "Partners records"
-msgstr "Registros de empresa"
-
-#. module: l10n_es_aeat_mod349
-#: model:ir.actions.report.xml,name:l10n_es_aeat_mod349.report_l10n_es_aeat_mod349
-msgid "AEAT 349 Model report"
-msgstr "Declaración modelo 349"
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "General"
-msgstr "General"
-
-#. module: l10n_es_aeat_mod349
-#: model:ir.model,name:l10n_es_aeat_mod349.model_account_invoice
-#: field:l10n.es.aeat.mod349.partner_record_detail,invoice_id:0
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "AEAT 349"
-msgstr "AEAT 349"
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "Complementary/Substitutive declaration"
-msgstr "Declaración Complementaria / Sustitutiva"
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.partner_refund:0
-msgid "Details"
-msgstr "Detalles"
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "Op. Amount"
+msgstr "Importe op."
+
+#. module: l10n_es_aeat_mod349
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "Op.Amount"
+msgstr "Importe op."
 
 #. module: l10n_es_aeat_mod349
 #: report:report_l10n_es_aeat_mod349.report:0
@@ -730,20 +630,24 @@
 msgstr "Clave operación"
 
 #. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,type:0
-msgid "Complementary"
-msgstr "Complementaria"
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
-msgid "May"
-msgstr "Mayo"
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,frequency_change:0
-msgid "Frequency change"
-msgstr "Cambio de frecuencia"
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "Operation key help"
+msgstr "Leyenda llave de operación"
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.report:0
+msgid "Options"
+msgstr "Opciones"
+
+#. module: l10n_es_aeat_mod349
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "Orig. Amount"
+msgstr "Importe orig."
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_refund,total_origin_amount:0
+msgid "Original amount"
+msgstr "Importe original"
 
 #. module: l10n_es_aeat_mod349
 #: report:report_l10n_es_aeat_mod349.report:0
@@ -751,44 +655,126 @@
 msgstr "LÍNEAS DE REGISTRO DE EMPRESA"
 
 #. module: l10n_es_aeat_mod349
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "PARTNER REFUND LINES"
+msgstr "LÍNEAS DE RECTIFICACIONES"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_record,partner_id:0
+#: field:l10n.es.aeat.mod349.partner_refund,partner_id:0
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_record,partner_record_ok:0
+msgid "Partner Record OK"
+msgstr "Registro de empresa correcto"
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/mod349.py:192
+#, python-format
+msgid "Partner name '%s' in partner records is not valid due to incorrect characters"
+msgstr "El nombre de la empresa '%s' en los registros de empresas no es válido debido a caracteres incorrectos."
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/mod349.py:199
+#, python-format
+msgid "Partner name '%s' in refund lines is not valid due to incorrect characters"
+msgstr "El nombre de la empresa '%s' en las líneas de rectificaciones no es válido por contener caracteres incorrectos."
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_record_detail,partner_record_id:0
+msgid "Partner record"
+msgstr "Registro de empresa"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_record,record_detail_ids:0
+msgid "Partner record detail IDS"
+msgstr "IDs Detalle de registro de empresa"
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.report:0
+#: field:l10n.es.aeat.mod349.report,partner_record_ids:0
+msgid "Partner records"
+msgstr "Registros de empresas"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_refund_detail,refund_id:0
+msgid "Partner refund ID"
+msgstr "ID Rectificación"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,partner_refund_ids:0
+msgid "Partner refund IDS"
+msgstr "IDs de rectificaciones"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_refund,partner_refund_ok:0
+msgid "Partner refund OK"
+msgstr "Rectificación correcta"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_refund,refund_detail_ids:0
+msgid "Partner refund detail IDS"
+msgstr "IDs Detalles de rectificaciones"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,total_partner_records:0
+msgid "Partners records"
+msgstr "Registros de empresa"
+
+#. module: l10n_es_aeat_mod349
 #: field:l10n.es.aeat.mod349.report,total_partner_records_amount:0
 msgid "Partners records amount"
 msgstr "Importe registros empresas"
 
 #. module: l10n_es_aeat_mod349
-#: model:ir.actions.act_window,name:l10n_es_aeat_mod349.action_l10n_es_aeat_mod349_report
-#: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349
-#: model:ir.module.module,shortdesc:l10n_es_aeat_mod349.module_meta_information
-msgid "AEAT Model 349"
-msgstr "Modelo AEAT 349"
-
-#. module: l10n_es_aeat_mod349
-#: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349_partner_record
-msgid "AEAT 349 Model - Partner record"
-msgstr "Modelo 349 - Registro de empresa"
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,period_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
-msgid "0A - Annual"
-msgstr "0A - Anual"
-
-#. module: l10n_es_aeat_mod349
-#: help:l10n.es.aeat.mod349.report,representative_vat:0
-msgid "Legal Representative VAT number."
-msgstr "CIF/NIF Reprensentante legal."
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
-msgid "February"
-msgstr "Febrero"
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_record,name:0
-#: field:l10n.es.aeat.mod349.report,name:0
-msgid "Name"
-msgstr "Nombre"
+#: field:l10n.es.aeat.mod349.report,total_partner_refunds:0
+msgid "Partners refunds"
+msgstr "Rectificaciones"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,total_partner_refunds_amount:0
+msgid "Partners refunds amount"
+msgstr "Importe rectificaciones"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_refund,period_selection:0
+#: field:l10n.es.aeat.mod349.report,period_selection:0
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "Period"
+msgstr "Período"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,period_ids:0
+msgid "Periods"
+msgstr "Periods"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,contact_phone:0
+msgid "Phone"
+msgstr "Teléfono"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,previous_number:0
+msgid "Previous declaration number"
+msgstr "Previous declaration number"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.report,state:0
+msgid "Processed"
+msgstr "Calculada"
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.partner_refund:0
+msgid "Refund data"
+msgstr "Datos rectificación"
+
+#. module: l10n_es_aeat_mod349
+#: help:l10n.es.aeat.mod349.partner_refund,total_origin_amount:0
+msgid "Refund original amount"
+msgstr "Importe operación original"
 
 #. module: l10n_es_aeat_mod349
 #: view:l10n.es.aeat.mod349.report:0
@@ -796,27 +782,55 @@
 msgstr "Rectificaciones"
 
 #. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_record,country_id:0
-#: field:l10n.es.aeat.mod349.partner_refund,country_id:0
-#: report:report_l10n_es_aeat_mod349.report:0
-msgid "Country"
-msgstr "País"
-
-#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.report:0
+msgid "Resultado"
+msgstr "Resultado"
+
+#. module: l10n_es_aeat_mod349
+#: selection:account.invoice,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
+msgid "S - Intra-Community services"
+msgstr "S - Prestaciones de servicios intracomunitarias"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
 #: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
-msgid "April"
-msgstr "Abril"
-
-#. module: l10n_es_aeat_mod349
-#: help:l10n.es.aeat.mod349.partner_refund,partner_refund_ok:0
-msgid "Checked if Refund record is OK"
-msgstr "Marcado si el registro de rectificación es correcto."
-
-#. module: l10n_es_aeat_mod349
-#: report:report_l10n_es_aeat_mod349.report:0
-msgid "Op.Amount"
-msgstr "Importe op."
+msgid "September"
+msgstr "Septiembre"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,type:0
+msgid "Statement Type"
+msgstr "Tipo de declaración"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.report,type:0
+msgid "Substitutive"
+msgstr "Sustitutiva"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,support_type:0
+msgid "Support Type"
+msgstr "Tipo de soporte"
+
+#. module: l10n_es_aeat_mod349
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "Support type:"
+msgstr "Tipo de soporte:"
+
+#. module: l10n_es_aeat_mod349
+#: selection:account.invoice,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "T - Triangular operations"
+msgstr "T - Operaciones triangulares"
 
 #. module: l10n_es_aeat_mod349
 #: selection:l10n.es.aeat.mod349.report,support_type:0
@@ -824,16 +838,58 @@
 msgstr "Telemática"
 
 #. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_refund,partner_refund_ok:0
-msgid "Partner refund OK"
-msgstr "Rectificación correcta"
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.partner_refund:0
-msgid "Refund data"
-msgstr "Datos rectificación"
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_refund_detail,invoice_id:0
-msgid "Invoice ID"
-msgstr "ID Factura"
+#: code:addons/l10n_es_aeat_mod349/wizard/export_mod349_to_boe.py:122
+#, 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"
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/wizard/export_mod349_to_boe.py:175
+#: code:addons/l10n_es_aeat_mod349/wizard/export_mod349_to_boe.py:227
+#, python-format
+msgid "The type 2 record must be 502 characters long"
+msgstr "El tipo de registro 2 debe ser de 502 caracteres de largo"
+
+#. module: l10n_es_aeat_mod349
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_record,total_operation_amount:0
+#: field:l10n.es.aeat.mod349.partner_refund,total_operation_amount:0
+msgid "Total operation amount"
+msgstr "Importe total operación"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_record,partner_vat:0
+#: field:l10n.es.aeat.mod349.partner_refund,partner_vat:0
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "VAT"
+msgstr "NIF"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,company_vat:0
+msgid "VAT number"
+msgstr "NIF"
+
+#. module: l10n_es_aeat_mod349
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "Year"
+msgstr "Año"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.export_to_boe,state:0
+msgid "get"
+msgstr "get"
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.export_to_boe,state:0
+msgid "open"
+msgstr "open"
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.export_to_boe,state:0
+msgid "unknown"
+msgstr "unknown"
+

=== modified file 'l10n_es_aeat_mod349/i18n/l10n_es_aeat_mod349.pot'
--- l10n_es_aeat_mod349/i18n/l10n_es_aeat_mod349.pot	2013-11-22 23:44:11 +0000
+++ l10n_es_aeat_mod349/i18n/l10n_es_aeat_mod349.pot	2014-04-15 12:47:56 +0000
@@ -4,11 +4,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-12-13 17:53:35+0000\n"
-"PO-Revision-Date: 2010-12-14 10:12+0100\n"
-"Last-Translator: Luis Manuel Angueira Blanco <[e-mail]>\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-04-14 18:35+0000\n"
+"PO-Revision-Date: 2014-04-14 20:35+0100\n"
+"Last-Translator: Pedro Manuel Baeza <[e-mail]>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,143 +16,94 @@
 "Plural-Forms: \n"
 
 #. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,total_partner_refunds:0
-msgid "Partners refunds"
+#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
+#: selection:l10n.es.aeat.mod349.report,period_selection:0
+msgid "0A - Annual"
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
 #: selection:l10n.es.aeat.mod349.report,period_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
 msgid "1T - First Quarter"
 msgstr ""
 
-#. module: l10n_ES_aeat_mod349
-#: rml:report_l10n_es_aeat_mod349.report:0
-msgid "Year"
-msgstr ""
-
-#. module: l10n_ES_aeat_mod349
-#: rml:report_l10n_es_aeat_mod349.report:0
-#: field:l10n.es.aeat.mod349.partner_refund,period_selection:0
-#: field:l10n.es.aeat.mod349.report,period_id:0
-#: field:l10n.es.aeat.mod349.report,period_selection:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/mod349.py:153
-#, python-format
-msgid "All partner refunds fields (country, VAT number) must be filled."
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/mod349.py:149
-#, python-format
-msgid "All partner records fields (country, VAT number) must be filled."
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_refund,total_origin_amount:0
-msgid "Original amount"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:account.fiscal.position,intracommunity_operations:0
-msgid "Intra-Community operations"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/mod349.py:192
-#, python-format
-msgid "Name '%s' have not allowed characters.\n"
-"Please, fix it before confirm the report"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/wizard/export_mod349_to_boe.py:169
-#: code:addons/l10n_es_aeat_mod349/wizard/export_mod349_to_boe.py:224
-#, python-format
-msgid "The type 2 record must be 502 characters long"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/mod349.py:149
-#: code:addons/l10n_es_aeat_mod349/mod349.py:153
-#: code:addons/l10n_es_aeat_mod349/mod349.py:179
-#: code:addons/l10n_es_aeat_mod349/mod349.py:191
-#: code:addons/l10n_es_aeat_mod349/mod349.py:198
-#: code:addons/l10n_es_aeat_mod349/mod349.py:205
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: help:l10n.es.aeat.mod349.partner_record,partner_record_ok:0
-msgid "Checked if Partner record is OK"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,partner_refund_ids:0
-msgid "Partner refund IDS"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,total_partner_refunds_amount:0
-msgid "Partners refunds amount"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: help:l10n.es.aeat.mod349.report,contact_name:0
-msgid "Must have name and surname."
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:account.invoice,operation_key:0
-#: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
-#: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
-msgid " "
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
-msgid "March"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,period_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
+#: selection:l10n.es.aeat.mod349.report,period_selection:0
+msgid "2T - Second Quarter"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
+#: selection:l10n.es.aeat.mod349.report,period_selection:0
+msgid "3T - Third Quarter"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.report:0
+msgid "413"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
+#: selection:l10n.es.aeat.mod349.report,period_selection:0
 msgid "4T - Fourth Quarter"
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-#: field:l10n.es.aeat.mod349.report,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-#: selection:l10n.es.aeat.mod349.report,state:0
-msgid "Done"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "In process"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,type:0
-msgid "Substitutive"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
 #: selection:account.invoice,operation_key:0
 #: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
 #: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
 #: report:report_l10n_es_aeat_mod349.report:0
-msgid "E - Intra-Community supplies"
+msgid "A - Intra-Community acquisition"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "AEAT 349 MODEL"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: model:ir.ui.menu,name:l10n_es_aeat_mod349.menu_aeat_mod349_report
+msgid "AEAT 349 Model"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:_description:0
+#: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349_partner_record
+#, python-format
+msgid "AEAT 349 Model - Partner record"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:_description:0
+#: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349_partner_record_detail
+#, python-format
+msgid "AEAT 349 Model - Partner record detail"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:_description:0
+#: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349_partner_refund
+#, python-format
+msgid "AEAT 349 Model - Partner refund"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:_description:0
+#: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349_partner_refund_detail
+#, python-format
+msgid "AEAT 349 Model - Partner refund detail"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: model:ir.actions.report.xml,name:l10n_es_aeat_mod349.report_l10n_es_aeat_mod349
+msgid "AEAT 349 Model report"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.partner_record_detail:0
+msgid "AEAT 349 Partner record"
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
@@ -161,20 +112,23 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,fiscalyear_id:0
-#: view:l10n.es.aeat.mod349.report:0
-msgid "Fiscal Year"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,previous_number:0
-msgid "Previous Declaration Number"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-#: field:l10n.es.aeat.mod349.report,partner_record_ids:0
-msgid "Partner records"
+#: view:l10n.es.aeat.mod349.partner_record:0
+msgid "AEAT 349 Partner records"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.partner_refund_detail:0
+msgid "AEAT 349 Partner refund"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.partner_refund_detail:0
+msgid "AEAT 349 Partner refund detail"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.partner_refund:0
+msgid "AEAT 349 Partner refunds"
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
@@ -184,123 +138,39 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,type:0
-msgid "Normal"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: model:ir.ui.menu,name:l10n_es_aeat_mod349.menu_aeat_mod349_report
-msgid "AEAT 349 Model"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349_partner_refund_detail
-msgid "AEAT 349 Model - Partner refund detail"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
-msgid "July"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_record,partner_vat:0
-#: field:l10n.es.aeat.mod349.partner_refund,partner_vat:0
-#: report:report_l10n_es_aeat_mod349.report:0
-msgid "VAT"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_refund_detail,refund_id:0
-msgid "Partner refund ID"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/account_invoice.py:94
-#, python-format
-msgid "Cannot get invoices.\n"
-"There is no period selected"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/account_invoice.py:86
-#, python-format
-msgid "Cannot get invoices.\n"
-"There is no fiscalyear selected"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/account_invoice.py:102
-#, python-format
-msgid "Cannot get invoices.\n"
-"There is no month and/or fiscalyear selected"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/wizard/export_mod349_to_boe.py:117
-#, python-format
-msgid "The type 1 record must be 502 characters long"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/mod349.py:171
-#, python-format
-msgid "Company without Title"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/mod349.py:179
-#, python-format
-msgid "Contact name (Full name) must have name and surname"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: help:l10n.es.aeat.mod349.partner_refund,total_origin_amount:0
-#: field:l10n.es.aeat.mod349.partner_refund,total_origin_amount:0
-msgid "Refund original amount"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/mod349.py:172
-#, python-format
-msgid "Company has no company title.\n"
-"This may cause some problems when trying to import on AEAT help program"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/mod349.py:206
-#, python-format
-msgid "Partner name '%s' in refund lines is not valid due to incorrect characters"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: code:addons/l10n_es_aeat_mod349/mod349.py:199
-#, python-format
-msgid "Partner name '%s' in partner records is not valid due to incorrect characters"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "Recalculate"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "Declaration"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.report:0
+msgid "AEAT 349 reports"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: model:ir.actions.act_window,name:l10n_es_aeat_mod349.action_l10n_es_aeat_mod349_report
+msgid "AEAT Model 349"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:_description:0
 #: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349_report
+#, python-format
 msgid "AEAT Model 349 Report"
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
-#: selection:account.invoice,operation_key:0
-#: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
-#: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
-#: report:report_l10n_es_aeat_mod349.report:0
-msgid "T - Triangular operations"
+#: code:addons/l10n_es_aeat_mod349/mod349.py:142
+#: code:addons/l10n_es_aeat_mod349/mod349.py:153
+#, python-format
+msgid "All amounts must be positives"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/mod349.py:137
+#, python-format
+msgid "All partner records fields (country, VAT number) must be filled."
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/mod349.py:147
+#, python-format
+msgid "All partner refunds fields (country, VAT number) must be filled."
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
@@ -310,130 +180,15 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_record,record_detail_ids:0
-msgid "Partner record detail IDS"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "Identification"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,type:0
-msgid "Statement Type"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: report:report_l10n_es_aeat_mod349.report:0
-msgid "Op. Amount"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "Confirm"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.partner_refund_detail:0
-msgid "AEAT 349 Partner refund"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,state:0
-msgid "State"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: model:ir.actions.act_window,help:l10n_es_aeat_mod349.action_l10n_es_aeat_mod349_report
-msgid "Create and query AEAT Model 349 Reports"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: report:report_l10n_es_aeat_mod349.report:0
-msgid "Fiscal year:"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_record,partner_record_ok:0
-msgid "Partner Record OK"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,period_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
-msgid "MO - Monthly"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_record_detail,partner_record_id:0
-msgid "Partner record"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349_calculate_records
-msgid "AEAT Model 349 Wizard - Calculate Records"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349_partner_refund
-msgid "AEAT 349 Model - Partner refund"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,support_type:0
-msgid "Support Type"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "Export to BOE"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.partner_refund_detail:0
-msgid "AEAT 349 Partner refund detail"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.partner_record:0
-#: view:l10n.es.aeat.mod349.partner_refund:0
-msgid "Info"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: report:report_l10n_es_aeat_mod349.report:0
-msgid "PARTNER REFUND LINES"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:account.invoice,operation_key:0
-#: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
-#: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
-#: report:report_l10n_es_aeat_mod349.report:0
-msgid "A - Intra-Community acquisition"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: report:report_l10n_es_aeat_mod349.report:0
-msgid "Operation key help"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:account.invoice,operation_key:0
-#: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
-#: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
-msgid "I - Intra-Community services acquisitions"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.partner_record_detail:0
-msgid "AEAT 349 Partner record"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.partner_refund:0
-msgid "AEAT 349 Partner refunds"
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: selection:l10n.es.aeat.mod349.report,month_selection:0
+msgid "April"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: selection:l10n.es.aeat.mod349.report,month_selection:0
+msgid "August"
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
@@ -442,158 +197,366 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.partner_record:0
-msgid "Detail lines"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_record,partner_id:0
-#: field:l10n.es.aeat.mod349.partner_refund,partner_id:0
+#: selection:l10n.es.aeat.mod349.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/account_invoice.py:107
+#, python-format
+msgid ""
+"Cannot get invoices.\n"
+"There is                                      no month and/or fiscalyear selected"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/account_invoice.py:99
+#, python-format
+msgid ""
+"Cannot get invoices.\n"
+"There is no                                      period selected"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/account_invoice.py:90
+#, python-format
+msgid ""
+"Cannot get invoices.\n"
+"There is no                                     fiscalyear selected"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: help:l10n.es.aeat.mod349.partner_record,partner_record_ok:0
+msgid "Checked if partner record is OK"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: help:l10n.es.aeat.mod349.partner_refund,partner_refund_ok:0
+msgid "Checked if refund record is OK"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/mod349.py:167
+#, python-format
+msgid ""
+"Company has no company title.\n"
+"This may cause some problems when trying to import on AEAT help program"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/mod349.py:166
+#, python-format
+msgid "Company without Title"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.report:0
+msgid "Complementaria"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.report,type:0
+msgid "Complementary"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/mod349.py:176
+#, python-format
+msgid "Contact name (Full name) must have name and surname"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_record,country_id:0
+#: field:l10n.es.aeat.mod349.partner_refund,country_id:0
 #: report:report_l10n_es_aeat_mod349.report:0
-msgid "Partner"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,contact_name:0
-msgid "Full Name"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
-msgid "September"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+msgid "Country"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: model:ir.actions.act_window,help:l10n_es_aeat_mod349.action_l10n_es_aeat_mod349_report
+msgid "Create and query AEAT Model 349 reports"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.report,support_type:0
+msgid "DVD"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_record_detail,date:0
+#: field:l10n.es.aeat.mod349.partner_refund_detail,date:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: selection:l10n.es.aeat.mod349.report,month_selection:0
 msgid "December"
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
-#: report:report_l10n_es_aeat_mod349.report:0
-msgid "Support type:"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.partner_record:0
-msgid "AEAT 349 Partner records"
+#: view:l10n.es.aeat.mod349.report:0
+msgid "Declaración"
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
 #: field:l10n.es.aeat.mod349.report,number:0
-msgid "Declaration Number"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,month_selection:0
-#: field:l10n.es.aeat.mod349.partner_refund,month_selection:0
-msgid "Month"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,state:0
-msgid "Canceled"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349_partner_record_detail
-msgid "AEAT 349 Model - Partner record detail"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,period_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
-msgid "3T - Third Quarter"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "Calculate"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,support_type:0
-msgid "DVD"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
+msgid "Declaration number"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.partner_record:0
+msgid "Detail lines"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.partner_refund:0
+msgid "Details"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:account.invoice,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
 #: report:report_l10n_es_aeat_mod349.report:0
-msgid "AEAT 349 MODEL"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
+msgid "E - Intra-Community supplies"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/account_invoice.py:89
+#: code:addons/l10n_es_aeat_mod349/account_invoice.py:98
+#: code:addons/l10n_es_aeat_mod349/account_invoice.py:106
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/mod349.py:136
+#: code:addons/l10n_es_aeat_mod349/mod349.py:141
+#: code:addons/l10n_es_aeat_mod349/mod349.py:146
+#: code:addons/l10n_es_aeat_mod349/mod349.py:152
+#: code:addons/l10n_es_aeat_mod349/mod349.py:175
+#: code:addons/l10n_es_aeat_mod349/mod349.py:185
+#: code:addons/l10n_es_aeat_mod349/mod349.py:191
+#: code:addons/l10n_es_aeat_mod349/mod349.py:198
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: model:ir.actions.act_window,name:l10n_es_aeat_mod349.action_wizard_aeat_mod349_export
+msgid "Export AEAT 349 BOE file"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:_description:0
 #: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349_export_to_boe
+#, python-format
 msgid "Export AEAT Model 349 to BOE format"
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-#: selection:l10n.es.aeat.mod349.report,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,company_vat:0
-msgid "VAT number"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_refund,refund_detail_ids:0
-msgid "Partner refund detail IDS"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: report:report_l10n_es_aeat_mod349.report:0
-msgid "Orig. Amount"
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: selection:l10n.es.aeat.mod349.report,month_selection:0
+msgid "February"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.export_to_boe,data:0
+msgid "File"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.export_to_boe,name:0
+msgid "File name"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/wizard/export_mod349_to_boe.py:91
+#: code:addons/l10n_es_aeat_mod349/wizard/export_mod349_to_boe.py:155
+#, python-format
+msgid "First four characters of fiscal year                                  code must be numeric and contain the fiscal                                  year number. Please, fix it and try again."
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:_description:0
+#: model:ir.model,name:l10n_es_aeat_mod349.model_account_fiscal_position
+#, python-format
+msgid "Fiscal Position"
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
 #: field:l10n.es.aeat.mod349.partner_refund,fiscalyear_id:0
-msgid "Fiscalyear"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_refund_detail,total_origin_amount:0
-msgid "Origin total amount"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
-msgid "August"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,state:0
-msgid "Processing"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: field:l10n.es.aeat.mod349.report,fiscalyear_id:0
+msgid "Fiscal year"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/wizard/export_mod349_to_boe.py:90
+#: code:addons/l10n_es_aeat_mod349/wizard/export_mod349_to_boe.py:154
+#, python-format
+msgid "Fiscal year code"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "Fiscal year:"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,frequency_change:0
+msgid "Frequency change"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,contact_name:0
+msgid "Full Name"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.report:0
+msgid "General"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:account.invoice,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
+msgid "H - Intra-Community supplies without taxes delivered by legal representative"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:account.invoice,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
+msgid "I - Intra-Community services acquisitions"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.partner_record:0
+#: view:l10n.es.aeat.mod349.partner_refund:0
+msgid "Info"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:account.fiscal.position,intracommunity_operations:0
+msgid "Intra-Community operations"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:_description:0
+#: model:ir.model,name:l10n_es_aeat_mod349.model_account_invoice
+#: field:l10n.es.aeat.mod349.partner_record_detail,invoice_id:0
+#, python-format
+msgid "Invoice"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_refund_detail,invoice_id:0
+msgid "Invoice ID"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: selection:l10n.es.aeat.mod349.report,month_selection:0
+msgid "January"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: selection:l10n.es.aeat.mod349.report,month_selection:0
+msgid "July"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: selection:l10n.es.aeat.mod349.report,month_selection:0
 msgid "June"
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "Options"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,contact_phone:0
-msgid "Phone"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_record_detail,date:0
-#: field:l10n.es.aeat.mod349.partner_refund_detail,date:0
-msgid "Date"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: field:l10n.es.aeat.mod349.report,representative_vat:0
+msgid "L.R. VAT number"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: help:l10n.es.aeat.mod349.report,representative_vat:0
+msgid "Legal Representative VAT number."
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:account.invoice,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
+msgid "M - Intra-Community supplies without taxes"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
+#: selection:l10n.es.aeat.mod349.report,period_selection:0
+msgid "MO - Monthly"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: selection:l10n.es.aeat.mod349.report,month_selection:0
+msgid "March"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: selection:l10n.es.aeat.mod349.report,month_selection:0
+msgid "May"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: field:l10n.es.aeat.mod349.report,month_selection:0
+msgid "Month"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: help:l10n.es.aeat.mod349.report,contact_name:0
+msgid "Must have name and surname."
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_record,name:0
+#: field:l10n.es.aeat.mod349.report,name:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/mod349.py:186
+#, python-format
+msgid ""
+"Name '%s' have not allowed characters.\n"
+"Please, fix it before confirm the report"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.report,type:0
+msgid "Normal"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
+#: selection:l10n.es.aeat.mod349.report,month_selection:0
 msgid "November"
 msgstr ""
 
@@ -603,90 +566,19 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_record,total_operation_amount:0
-#: field:l10n.es.aeat.mod349.partner_refund,total_operation_amount:0
-msgid "Total operation amount"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
 #: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
 msgid "October"
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,period_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
-msgid "2T - Second Quarter"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
-msgid "January"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "Summary"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,state:0
-msgid "Processed"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,representative_vat:0
-msgid "L.R. VAT number"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:account.invoice,operation_key:0
-#: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
-#: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
-msgid "S - Intra-Community services"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,total_partner_records:0
-msgid "Partners records"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: model:ir.actions.report.xml,name:l10n_es_aeat_mod349.report_l10n_es_aeat_mod349
-msgid "AEAT 349 Model report"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "General"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: model:ir.model,name:l10n_es_aeat_mod349.model_account_invoice
-#: field:l10n.es.aeat.mod349.partner_record_detail,invoice_id:0
-msgid "Invoice"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "AEAT 349"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.report:0
-msgid "Complementary/Substitutive declaration"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.partner_refund:0
-msgid "Details"
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "Op. Amount"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "Op.Amount"
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
@@ -702,19 +594,23 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,type:0
-msgid "Complementary"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
-msgid "May"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.report,frequency_change:0
-msgid "Frequency change"
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "Operation key help"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.report:0
+msgid "Options"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "Orig. Amount"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_refund,total_origin_amount:0
+msgid "Original amount"
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
@@ -723,43 +619,125 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "PARTNER REFUND LINES"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_record,partner_id:0
+#: field:l10n.es.aeat.mod349.partner_refund,partner_id:0
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "Partner"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_record,partner_record_ok:0
+msgid "Partner Record OK"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/mod349.py:192
+#, python-format
+msgid "Partner name '%s' in partner records is not valid due to incorrect characters"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/mod349.py:199
+#, python-format
+msgid "Partner name '%s' in refund lines is not valid due to incorrect characters"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_record_detail,partner_record_id:0
+msgid "Partner record"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_record,record_detail_ids:0
+msgid "Partner record detail IDS"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.report:0
+#: field:l10n.es.aeat.mod349.report,partner_record_ids:0
+msgid "Partner records"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_refund_detail,refund_id:0
+msgid "Partner refund ID"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,partner_refund_ids:0
+msgid "Partner refund IDS"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_refund,partner_refund_ok:0
+msgid "Partner refund OK"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_refund,refund_detail_ids:0
+msgid "Partner refund detail IDS"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,total_partner_records:0
+msgid "Partners records"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
 #: field:l10n.es.aeat.mod349.report,total_partner_records_amount:0
 msgid "Partners records amount"
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
-#: model:ir.actions.act_window,name:l10n_es_aeat_mod349.action_l10n_es_aeat_mod349_report
-#: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349
-#: model:ir.module.module,shortdesc:l10n_es_aeat_mod349.module_meta_information
-msgid "AEAT Model 349"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: model:ir.model,name:l10n_es_aeat_mod349.model_l10n_es_aeat_mod349_partner_record
-msgid "AEAT 349 Model - Partner record"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,period_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,period_selection:0
-msgid "0A - Annual"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: help:l10n.es.aeat.mod349.report,representative_vat:0
-msgid "Legal Representative VAT number."
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
-msgid "February"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_record,name:0
-#: field:l10n.es.aeat.mod349.report,name:0
-msgid "Name"
+#: field:l10n.es.aeat.mod349.report,total_partner_refunds:0
+msgid "Partners refunds"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,total_partner_refunds_amount:0
+msgid "Partners refunds amount"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_refund,period_selection:0
+#: field:l10n.es.aeat.mod349.report,period_selection:0
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,period_ids:0
+msgid "Periods"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,contact_phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,previous_number:0
+msgid "Previous declaration number"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.report,state:0
+msgid "Processed"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.partner_refund:0
+msgid "Refund data"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: help:l10n.es.aeat.mod349.partner_refund,total_origin_amount:0
+msgid "Refund original amount"
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
@@ -768,26 +746,54 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_record,country_id:0
-#: field:l10n.es.aeat.mod349.partner_refund,country_id:0
-#: report:report_l10n_es_aeat_mod349.report:0
-msgid "Country"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
+#: view:l10n.es.aeat.mod349.report:0
+msgid "Resultado"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:account.invoice,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
+msgid "S - Intra-Community services"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
 #: selection:l10n.es.aeat.mod349.report,month_selection:0
-#: selection:l10n.es.aeat.mod349.partner_refund,month_selection:0
-msgid "April"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: help:l10n.es.aeat.mod349.partner_refund,partner_refund_ok:0
-msgid "Checked if Refund record is OK"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: report:report_l10n_es_aeat_mod349.report:0
-msgid "Op.Amount"
+msgid "September"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,type:0
+msgid "Statement Type"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.report,type:0
+msgid "Substitutive"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,support_type:0
+msgid "Support Type"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "Support type:"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:account.invoice,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_record,operation_key:0
+#: selection:l10n.es.aeat.mod349.partner_refund,operation_key:0
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "T - Triangular operations"
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
@@ -796,16 +802,58 @@
 msgstr ""
 
 #. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_refund,partner_refund_ok:0
-msgid "Partner refund OK"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: view:l10n.es.aeat.mod349.partner_refund:0
-msgid "Refund data"
-msgstr ""
-
-#. module: l10n_es_aeat_mod349
-#: field:l10n.es.aeat.mod349.partner_refund_detail,invoice_id:0
-msgid "Invoice ID"
-msgstr ""
+#: code:addons/l10n_es_aeat_mod349/wizard/export_mod349_to_boe.py:122
+#, python-format
+msgid "The type 1 record must be 502 characters long"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: code:addons/l10n_es_aeat_mod349/wizard/export_mod349_to_boe.py:175
+#: code:addons/l10n_es_aeat_mod349/wizard/export_mod349_to_boe.py:227
+#, python-format
+msgid "The type 2 record must be 502 characters long"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "Total :"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_record,total_operation_amount:0
+#: field:l10n.es.aeat.mod349.partner_refund,total_operation_amount:0
+msgid "Total operation amount"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.partner_record,partner_vat:0
+#: field:l10n.es.aeat.mod349.partner_refund,partner_vat:0
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "VAT"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.report,company_vat:0
+msgid "VAT number"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: report:report_l10n_es_aeat_mod349.report:0
+msgid "Year"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.export_to_boe,state:0
+msgid "get"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: selection:l10n.es.aeat.mod349.export_to_boe,state:0
+msgid "open"
+msgstr ""
+
+#. module: l10n_es_aeat_mod349
+#: field:l10n.es.aeat.mod349.export_to_boe,state:0
+msgid "unknown"
+msgstr ""
+

=== modified file 'l10n_es_aeat_mod349/mod349.py'
--- l10n_es_aeat_mod349/mod349.py	2014-04-14 14:36:42 +0000
+++ l10n_es_aeat_mod349/mod349.py	2014-04-15 12:47:56 +0000
@@ -1,11 +1,16 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Copyright (C) 2004-2011
-#        Pexego Sistemas Informáticos. (http://pexego.es) All Rights Reserved
+#    Copyright (C)
+#        2004-2011: Pexego Sistemas Informáticos. (http://pexego.es)
+#        2013:      Top Consultant Software Creations S.L.
+#                   (http://www.topconsultant.es/)
+#        2014:      Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com)
+#                   Pedro M. Baeza <[e-mail]> 
 #
-#    Migración OpenERP 7.0. Top Consultant Software Creations S.L. (http://www.topconsultant.es/) 2013
-#        Ignacio Martínez y Miguel López.
+#    Autores originales: Luis Manuel Angueira Blanco (Pexego)
+#                        Omar Castiñeira Saavedra([e-mail])
+#    Migración OpenERP 7.0: Ignacio Martínez y Miguel López.
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -21,15 +26,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-__author__ = \
-"Luis Manuel Angueira Blanco (Pexego),Omar Castiñeira Saavedra([e-mail])"
-
-
 import re
 from openerp.tools.translate import _
 from openerp.osv import fields, orm
-
+from openerp.addons.l10n_es_aeat_mod349.account_invoice import OPERATION_KEYS
 
 MONTH_MAPPING = [
     ('01', 'January'),
@@ -46,22 +46,11 @@
     ('12', 'December'),
 ]
 
-OPERATION_KEY = [
-    ('E', 'E - Intra-Community supplies'),
-    ('A', 'A - Intra-Community acquisition'),
-    ('T', 'T - Triangular operations'),
-    ('S', 'S - Intra-Community services'),
-    ('I', 'I - Intra-Community services acquisitions'),
-    ('M', 'M - Intra-Community supplies without taxes'),
-    ('H', 'H - Intra-Community supplies without taxes delivered by legal'
-     ' representative'),
-]
-
+# TODO: Quitarlo de aquí y pasarlo a l10n_es_aeat con sustituciones
 NAME_RESTRICTIVE_REGEXP = re.compile(u"^[a-zA-Z0-9\sáÁéÉíÍóÓúÚñÑçÇäÄëËïÏüÜöÖ"
                                      u"àÀèÈìÌòÒùÙâÂêÊîÎôÔûÛ\.,-_&'´\:;:/]*$",
                                      re.UNICODE | re.X)
 
-
 def _check_valid_string(text_to_check):
     """
     Checks if string fits with RegExp
@@ -70,15 +59,23 @@
         return True
     return False
 
-
-class l10n_es_aeat_mod349(orm.Model):
+def _format_partner_vat(cr, uid, partner_vat=None, country=None,
+                      context=None):
+    """Formats VAT to match XXVATNUMBER (where XX is country code)."""
+    if country:
+        country_pattern = "[" + country.code + country.code.lower() + "]{2}.*"
+        vat_regex = re.compile(country_pattern, re.UNICODE | re.X)
+        if partner_vat and not vat_regex.match(partner_vat):
+            partner_vat = country.code + partner_vat
+    return partner_vat
+
+
+class Mod349(orm.Model):
     _inherit = "l10n.es.aeat.report"
     _name = "l10n.es.aeat.mod349.report"
     _description = "AEAT Model 349 Report"
 
-    #################
     ### FUNCTIONS ###
-    #################
     def _get_report_totals(self, cr, uid, ids, name, args, context=None):
         res = {}
         for report in self.browse(cr, uid, ids, context=context):
@@ -94,10 +91,9 @@
             }
         return res
 
-    def _get_report_alias(self, cr, uid, ids, field_name, args, context=None):
-        """
-        Returns an alias as name for the report
-        """
+    def _get_report_alias(self, cr, uid, ids, field_name, args,
+                          context=None):
+        """Returns an alias as name for the report."""
         res = {}
         for item in self.browse(cr, uid, ids, context=context):
             res[item.id] = '%s - %s/%s' % (
@@ -106,20 +102,165 @@
                 item.period_selection or '')
         return res
 
-    def button_calculate(self, cr, uid, ids, context=None):
-        calculate_obj = self.pool['l10n.es.aeat.mod349.calculate_records']
-        calculate_obj._wkf_calculate_records(cr, uid, ids, context=context)
-        return True
-
-    def button_recalculate(self, cr, uid, ids, context=None):
-        calculate_obj = self.pool['l10n.es.aeat.mod349.calculate_records']
-        calculate_obj._calculate_records(cr, uid, ids, context=context)
-        return True
-
-    def button_export(self, cr, uid, ids, context=None):
-        export_obj = self.pool["l10n.es.aeat.mod349.export_to_boe"]
-        self_brw = self.browse(cr, uid, ids and ids[0], context=context)
-        export_obj._export_boe_file(cr, uid, ids, self_brw, context=context)
+    def _create_349_partner_records(self, cr, uid, ids, report_id,
+                                           partner_obj, operation_key,
+                                           context=None):
+        """creates partner records in 349"""
+        invoices_ids = self.pool['account.invoice'].browse(cr, uid, ids,
+                                                           context=context)
+        obj = self.pool['l10n.es.aeat.mod349.partner_record']
+        partner_country = partner_obj.country_id
+        invoice_created = obj.create(cr, uid, {
+            'report_id': report_id,
+            'partner_id': partner_obj.id,
+            'partner_vat': _format_partner_vat(cr, uid,
+                                               partner_vat=partner_obj.vat,
+                                               country=partner_country),
+            'operation_key': operation_key,
+            'country_id': partner_country.id or False,
+            'total_operation_amount': sum([invoice.cc_amount_untaxed for
+                                            invoice in invoices_ids if
+                                            invoice.type not in
+                                            ('in_refund', 'out_refund')]) -
+                                               sum([invoice.cc_amount_untaxed
+                                                    for invoice in invoices_ids
+                                                    if invoice.type in
+                                                    ('in_refund',
+                                                     'out_refund')])
+        })
+        ### Creation of partner detail lines
+        for invoice in invoices_ids:
+            detail_obj = self.pool['l10n.es.aeat.mod349.partner_record_detail']
+            detail_obj.create(cr, uid,
+                              {'partner_record_id': invoice_created,
+                               'invoice_id': invoice.id,
+                               'amount_untaxed': invoice.cc_amount_untaxed})
+        return invoice_created
+
+    def _create_349_refund_records(self, cr, uid, ids, report_id,
+                                    partner_obj, operation_key, context=None):
+        """Creates restitution records in 349"""
+        refunds = self.pool['account.invoice'].browse(cr, uid, ids)
+        refundpol = self.pool['l10n.es.aeat.mod349.partner_record_detail']
+        refund_obj = self.pool['l10n.es.aeat.mod349.partner_record']
+        obj = self.pool['l10n.es.aeat.mod349.partner_refund']
+        obj_detail = self.pool['l10n.es.aeat.mod349.partner_refund_detail']
+        partner_country = [address.country_id for address in
+                           partner_obj.address if address.type ==
+                           'invoice' and address.country_id]
+        if not partner_country:
+            partner_country = [address.country_id for
+                               address in partner_obj.address
+                               if address.type == 'default' and
+                               address.country_id]
+        partner_country = partner_country and partner_country[0] or False
+        record = {}
+        for invoice in refunds:
+            #goes around all refunded invoices
+            for origin_inv in invoice.origin_invoices_ids:
+                if origin_inv.state in ['open', 'paid']:
+                    # searches for details of another 349s to restor
+                    refund_detail = refundpol.search(cr, uid,
+                                                     [('invoice_id', '=',
+                                                       origin_inv.id)])
+                    valid_refund_details = refund_detail
+                    for detail in refundpol.browse(cr, uid, refund_detail):
+                        if not detail.partner_record_id.report_id:
+                            valid_refund_details.remove(detail.id)
+                    if valid_refund_details:
+                        rd = refundpol.browse(cr, uid, valid_refund_details[0])
+                        #creates a dictionary key with partner_record id to
+                        #after recover it
+                        key = str(rd.partner_record_id.id)
+                        #separates restitutive invoices and nomal, refund
+                        #invoices of correct period
+                        if record.get(key):
+                            record[key].append(invoice)
+                            #NOTE: Two or more refunded invoices declared in
+                            #different 349s isn't implemented
+                            break
+                        else:
+                            record[key] = [invoice]
+                            #NOTE: Two or more refunded invoices declared in
+                            #different 349s isn't implemented
+                            break
+        #recorremos nuestro diccionario y vamos creando registros
+        for line in record:
+            partner_rec = refund_obj.browse(cr, uid, int(line),
+                                            context=context)
+            record_created = obj.create(cr, uid, {
+                'report_id': report_id,
+                'partner_id': partner_obj.id,
+                'partner_vat': _format_partner_vat(cr, uid,
+                                                   partner_vat=partner_obj.vat,
+                                                   country=partner_country,
+                                                   context=context),
+                'operation_key': operation_key,
+                'country_id': partner_country and partner_country.id or False,
+                'total_operation_amount':  partner_rec.total_operation_amount \
+                    - sum([x.cc_amount_untaxed for x in record[line]]),
+                'total_origin_amount': partner_rec.total_operation_amount,
+                'period_selection': partner_rec.report_id.period_selection,
+                'month_selection': partner_rec.report_id.month_selection,
+                'fiscalyear_id': partner_rec.report_id.fiscalyear_id.id
+            }, context=context)
+            ### Creation of partner detail lines
+            for invoice in record[line]:
+                obj_detail.create(cr, uid, {
+                    'refund_id': record_created,
+                    'invoice_id': invoice.id,
+                    'amount_untaxed': invoice.cc_amount_untaxed
+                }, context=context)
+        return True
+
+    def calculate(self, cr, uid, ids, context=None):
+        """Computes the records in report."""
+        partner_obj = self.pool['res.partner']
+        invoice_obj = self.pool['account.invoice']
+        report_obj = self.pool['l10n.es.aeat.mod349.report']
+        partner_record_obj = self.pool['l10n.es.aeat.mod349.partner_record']
+        partner_refund_obj = self.pool['l10n.es.aeat.mod349.partner_refund']
+        for mod349 in self.browse(cr, uid, ids, context=context):
+            ## Remove previous partner records and partner refunds in report
+            partner_record_obj.unlink(cr, uid, [record.id for record in
+                                                mod349.partner_record_ids],
+                                      context=context)
+            partner_refund_obj.unlink(cr, uid, [refund.id for refund in
+                                                mod349.partner_refund_ids],
+                                      context=context)
+            # Returns all partners
+            # TODO: Problema: Si se ha desactivado el partner, pero tiene
+            # facturas, no saldrán en el informe
+            partner_ids = partner_obj.search(cr, uid, [], context=context)
+            for partner_id in partner_ids:
+                for op_key in [x[0] for x in OPERATION_KEYS]:
+                    ## Invoices
+                    invoice_ids = invoice_obj._get_invoices_by_type(cr, uid,
+                                partner_id,
+                                operation_key=op_key,
+                                period_selection=mod349.period_selection,
+                                fiscalyear_id=mod349.fiscalyear_id.id,
+                                period_id=[x.id for x in mod349.period_ids],
+                                month=mod349.month_selection, context=context)
+                    # Separates normal invoices from restitution
+                    invoice_ids, refunds_ids = invoice_obj.\
+                        clean_refund_invoices(cr, uid, invoice_ids, partner_id,
+                                  fiscalyear_id=mod349.fiscalyear_id.id,
+                                  period_id=[x.id for x in mod349.period_ids],
+                                  month=mod349.month_selection,
+                                  period_selection=mod349.period_selection,
+                                  context=context)
+                    if invoice_ids or refunds_ids:
+                        partner = partner_obj.browse(cr, uid, partner_id,
+                                                     context=context)
+                    if invoice_ids:
+                        self._create_349_partner_records(cr, uid,
+                                            invoice_ids, mod349.id, partner,
+                                            op_key, context=context)
+                    if refunds_ids:
+                        self._create_349_refund_records(cr, uid,
+                                            refunds_ids, mod349.id, partner,
+                                            op_key, context=context)
         return True
 
     def _check_report_lines(self, cr, uid, ids, context=None):
@@ -132,21 +273,17 @@
             ## all are correct (all fields filled)
             for partner_record in item.partner_record_ids:
                 if not partner_record.partner_record_ok:
-                    raise orm.except_orm(
-                                         _('Error!'),
-                                         _("All partner records fields " +
-                                           "(country, VAT number) must " +
-                                           "be filled."))
+                    raise orm.except_orm(_('Error!'),
+                        _("All partner records fields (country, VAT number) "
+                          "must be filled."))
                 if partner_record.total_operation_amount < 0:
                     raise orm.except_orm(_('Error!'),
                                          _("All amounts must be positives"))
             for partner_record in item.partner_refund_ids:
                 if not partner_record.partner_refund_ok:
-                    raise orm.except_orm(
-                                         _('Error!'),
-                                         _("All partner refunds fields " +
-                                           "(country, VAT number) must " +
-                                           "be filled."))
+                    raise orm.except_orm(_('Error!'),
+                        _("All partner refunds fields (country, VAT number) "
+                          "must be filled."))
                 if partner_record.total_operation_amount < 0 or \
                                 partner_record.total_origin_amount < 0:
                     raise orm.except_orm(_('Error!'),
@@ -182,40 +319,33 @@
         """
         mod349_obj = self.browse(cr, uid, ids and ids[0], context)
         if not _check_valid_string(mod349_obj.contact_name):
-            raise osv.except_osv(_('Error!'),
+            raise orm.except_orm(_('Error!'),
                 _("Name '%s' have not allowed characters.\nPlease, fix it "
                   "before confirm the report") % mod349_obj.contact_name)
         ## Check partner record partner names
         for partner_record in mod349_obj.partner_record_ids:
             if not _check_valid_string(partner_record.partner_id.name):
-                raise osv.except_osv(_("Error!"),
+                raise orm.except_orm(_("Error!"),
                     _("Partner name '%s' in partner records is not valid "
                       "due to incorrect characters") %
                                      partner_record.partner_id.name)
         ## Check partner refund partner names
         for partner_refund in mod349_obj.partner_refund_ids:
             if not _check_valid_string(partner_refund.partner_id.name):
-                raise osv.except_osv(_("Error!"),
+                raise orm.except_orm(_("Error!"),
                     _("Partner name '%s' in refund lines is not valid due "
                       "to incorrect characters") %
                                      partner_refund.partner_id.name)
 
-    def wkf_confirm(self, cr, uid, ids, context=None):
-        """ Workflow : confirm """
-        if context is None:
-            context = {}
-
-        self._check_report(cr, uid, ids, context)
-        self.write(cr, uid, ids, {'state': 'done'}, context=context)
-        return True
-
-    def _check_report(self, cr, uid, ids, context):
+    def button_confirm(self, cr, uid, ids, context=None):
         """
-        Checks if all the fields of the report are filled
+        Checks if all the fields of the report are correctly filled
         """
         self._check_names(cr, uid, ids, context)
         self._check_report_lines(cr, uid, ids, context)
         self._check_restrictive_names(cr, uid, ids, context)
+        return super(Mod349, self).button_confirm(cr, uid, ids,
+                                                  context=context)
 
     def onchange_period_selection(self, cr, uid, ids, period_selection,
                                   fiscalyear_id, context=None):
@@ -233,8 +363,7 @@
                                 string="Name", method=True),
         'period_ids': fields.many2many('account.period',
                                        'mod349_mod349_period_rel',
-                                       'mod349_id', 'period_ids',
-                                       'Periods'),
+                                       'mod349_id', 'period_ids', 'Periods'),
         'period_selection': fields.selection([
                 ('0A', '0A - Annual'),
                 ('MO', 'MO - Monthly'),
@@ -244,64 +373,49 @@
                 ('4T', '4T - Fourth Quarter')
             ], 'Period', required=True, select=1,
             states={'confirmed': [('readonly', True)]}),
-
-        'month_selection': fields.selection(MONTH_MAPPING,
-                                            'Month',
-                                            states={'confirmed': [('readonly',
-                                                                   True)]}),
-
+        'month_selection': fields.selection(MONTH_MAPPING, 'Month',
+                                states={'confirmed': [('readonly', True)]}),
         'frequency_change': fields.boolean('Frequency change',
-                                           states={'confirmed': [('readonly',
-                                                                  True)]}),
+                                states={'confirmed': [('readonly', True)]}),
         ## Identification
-        'contact_name': fields.char("Full Name",
-                                    size=40,
-                                    help="Must have name and surname.",
-                                    states={'calculated': [('required',
-                                                            True)],
-                                            'confirmed': [('readonly',
-                                                           True)]}),
-        'contact_phone': fields.char("Phone",
-                                     size=9,
-                                     states={'calculated': [('required',
-                                                             True)],
-                                             'confirmed': [('readonly',
-                                                            True)]}),
+        'contact_name': fields.char("Full Name", size=40,
+                                help="Must have name and surname.",
+                                states={'calculated': [('required', True)],
+                                        'confirmed': [('readonly', True)]}),
+        'contact_phone': fields.char("Phone", size=9,
+                            states={'calculated': [('required', True)],
+                                    'confirmed': [('readonly', True)]}),
         ## TOTALS
         'total_partner_records': fields.function(_get_report_totals,
-                                                 string="Partners records",
-                                                method=True,
-                                                 type='integer',
-                                                 multi="report_totals_multi"),
+                            string="Partners records", method=True,
+                            type='integer', multi="report_totals_multi"),
         'total_partner_records_amount': fields.function(_get_report_totals,
-                                                        string="Partners" +
-                                                            " records amount",
-                                                        method=True,
-                                                        type='float',
-                                                        multi="report_" +
-                                                              "totals_multi"),
+                            string="Partners records amount", method=True,
+                            type='float', multi="report_totals_multi"),
         'total_partner_refunds': fields.function(_get_report_totals,
-                                                 string="Partners refunds",
-                                                 method=True,
-                                                 type='integer',
-                                                 multi="report_totals_multi"),
+                            string="Partners refunds", method=True,
+                            type='integer', multi="report_totals_multi"),
         'total_partner_refunds_amount': fields.function(_get_report_totals,
-                                                        string="Partners" +
-                                                        " refunds amount",
-                                                        method=True,
-                                                        type='float',
-                                                        multi="report_" +
-                                                              "totals_multi"),
+                            string="Partners refunds amount", method=True,
+                            type='float', multi="report_totals_multi"),
+        # LISTADOS
+        'partner_record_ids': fields.one2many(
+                            'l10n.es.aeat.mod349.partner_record',
+                            'report_id', 'Partner records', ondelete='cascade',
+                            states={'confirmed': [('readonly', True)]}),
+        'partner_refund_ids': fields.one2many(
+                        'l10n.es.aeat.mod349.partner_refund',
+                        'report_id', 'Partner refund IDS', ondelete='cascade',
+                        states={'confirmed': [('readonly', True)]}),
     }
-
     _defaults = {
         'period_selection': '0A',
-        'type': ' ',
+        'type': 'N',
         'number': '349',
     }
 
 
-class l10n_es_aeat_mod349_partner_record(orm.Model):
+class Mod349PartnerRecord(orm.Model):
     """
     AEAT 349 Model - Partner record
     Shows total amount per operation key (grouped) for each partner
@@ -332,60 +446,35 @@
         Formats VAT to match XXVATNUMBER (where XX is country code)
         """
         if country_id:
-            country_obj = self.pool.get('res.country')
-            country_code = country_obj.browse(cr, uid, country_id,
-                                              context=context).code
-            country_pattern = "[" + country_code + \
-                            country_code.lower() + "]{2}.*"
-            vat_regex = re.compile(country_pattern, re.UNICODE | re.X)
-
-            if partner_vat and not vat_regex.match(partner_vat):
-                partner_vat = country_code + partner_vat
+            country_obj = self.pool['res.country']
+            country = country_obj.browse(cr, uid, country_id, context=context)
+            partner_vat = _format_partner_vat(cr, uid, partner_vat=partner_vat,
+                                              country=country)
         return {'value': {'partner_vat': partner_vat}}
 
     _columns = {
         'report_id': fields.many2one('l10n.es.aeat.mod349.report',
                                      'AEAT 349 Report ID'),
         # The name it's just an alias of the partner vat
-        'name': fields.function(get_record_name,
-                                method=True,
-                                type="char",
-                                size="64",
-                                string="Name"),
+        'name': fields.function(get_record_name, method=True, type="char",
+                                size="64", string="Name"),
         'partner_id': fields.many2one('res.partner', 'Partner', required=True),
         'partner_vat': fields.char('VAT', size=15, select=1),
         'country_id': fields.many2one('res.country', 'Country'),
-        'operation_key': fields.selection(OPERATION_KEY,
-                                          'Operation key',
+        'operation_key': fields.selection(OPERATION_KEYS, 'Operation key',
                                           required=True),
         'total_operation_amount': fields.float('Total operation amount'),
         'partner_record_ok': fields.function(_check_partner_record_line,
-                                             method=True,
-                                             string='Partner Record OK',
-                                             help='Checked if' +
-                                                  ' Partner record is OK'),
-    }
-
-
-
-class l10n_es_aeat_mod349_report_add_partner_records(orm.Model):
-    """
-    Inheritance of 'l10n.es.aeat.mod349' to add
-    a relation between partner record and report
-    """
-    _inherit = 'l10n.es.aeat.mod349.report'
-
-    _columns = {
-        'partner_record_ids':
-                fields.one2many('l10n.es.aeat.mod349.partner_record',
-                                'report_id',
-                                'Partner records',
-                                ondelete='cascade',
-                                states={'confirmed': [('readonly', True)]}),
-    }
-
-
-class l10n_es_aeat_mod349_partner_record_detail(orm.Model):
+                                    method=True, string='Partner Record OK',
+                                    help='Checked if partner record is OK'),
+        'record_detail_ids': fields.one2many(
+                            'l10n.es.aeat.mod349.partner_record_detail',
+                            'partner_record_id', 'Partner record detail IDS',
+                            ondelete='cascade'),
+    }
+
+
+class Mod349PartnerRecordDetail(orm.Model):
     """
     AEAT 349 Model - Partner record detail
     Shows detail lines for each partner record.
@@ -394,19 +483,14 @@
     _description = 'AEAT 349 Model - Partner record detail'
 
     _columns = {
-        'partner_record_id':
-                fields.many2one('l10n.es.aeat.mod349.partner_record',
-                                'Partner record',
-                                required=True,
-                                ondelete='cascade',
-                                select=1),
+        'partner_record_id': fields.many2one(
+                                        'l10n.es.aeat.mod349.partner_record',
+                                        'Partner record', required=True,
+                                        ondelete='cascade', select=1),
         'invoice_id': fields.many2one('account.invoice', 'Invoice'),
         'amount_untaxed': fields.float('Amount untaxed'),
-        'date': fields.related('invoice_id',
-                               'date_invoice',
-                               type="date",
-                               string="Date",
-                               readonly=True),
+        'date': fields.related('invoice_id', 'date_invoice', type="date",
+                               string="Date", readonly=True),
     }
 
     _defaults = {
@@ -415,25 +499,7 @@
     }
 
 
-
-class l10n_es_aeat_mod349_partner_record_add_partner_record_details(orm.Model):
-    """
-    Inheritance of 'l10n.es.aeat.mod349.partner_record' to add a
-    relation between
-    partner record and partner record details
-    """
-    _inherit = 'l10n.es.aeat.mod349.partner_record'
-
-    _columns = {
-        'record_detail_ids':
-                fields.one2many('l10n.es.aeat.mod349.partner_record_detail',
-                                'partner_record_id',
-                                'Partner record detail IDS',
-                                ondelete='cascade'),
-    }
-
-
-class l10n_es_aeat_mod349_partner_refund(orm.Model):
+class Mod349PartnerRefund(orm.Model):
     _name = 'l10n.es.aeat.mod349.partner_refund'
     _description = 'AEAT 349 Model - Partner refund'
     _order = 'operation_key asc'
@@ -454,24 +520,19 @@
     _columns = {
         'report_id': fields.many2one('l10n.es.aeat.mod349.report',
                                      'AEAT 349 Report ID'),
-        'partner_id': fields.many2one('res.partner',
-                                      'Partner',
-                                      required=1,
+        'partner_id': fields.many2one('res.partner', 'Partner', required=1,
                                       select=1),
         'partner_vat': fields.char('VAT', size=15),
-        'operation_key': fields.selection(OPERATION_KEY,
-                                          'Operation key',
+        'operation_key': fields.selection(OPERATION_KEYS, 'Operation key',
                                           required=True),
         'country_id': fields.many2one('res.country', 'Country'),
-        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscalyear'),
+        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal year'),
         'total_operation_amount': fields.float('Total operation amount'),
         'total_origin_amount': fields.float('Original amount',
                                             help="Refund original amount"),
-        'partner_refund_ok':
-                    fields.function(_check_partner_refund_line,
-                                    method=True,
-                                    string='Partner refund OK',
-                                    help='Checked if Refund record is OK'),
+        'partner_refund_ok': fields.function(_check_partner_refund_line,
+                                     method=True, string='Partner refund OK',
+                                     help='Checked if refund record is OK'),
         'period_selection': fields.selection([
                 ('0A', '0A - Annual'),
                 ('MO', 'MO - Monthly'),
@@ -480,7 +541,11 @@
                 ('3T', '3T - Third Quarter'),
                 ('4T', '4T - Fourth Quarter')
             ], 'Period'),
-        'month_selection': fields.selection(MONTH_MAPPING, 'Month')
+        'month_selection': fields.selection(MONTH_MAPPING, 'Month'),
+        'refund_detail_ids': fields.one2many(
+                                'l10n.es.aeat.mod349.partner_refund_detail',
+                                'refund_id', 'Partner refund detail IDS',
+                                ondelete='cascade'),
     }
 
     _defaults = {
@@ -489,41 +554,16 @@
 
     def onchange_format_partner_vat(self, cr, uid, ids,
                                     partner_vat, country_id, context=None):
-        """
-        Formats VAT to match XXVATNUMBER (where XX is country code)
-        """
+        """Formats VAT to match XXVATNUMBER (where XX is country code)"""
         if country_id:
             country_obj = self.pool['res.country']
-            country_code = country_obj.browse(cr, uid, country_id,
-                                              context=context).code
-            country_pattern = "[" + country_code + \
-                              country_code.lower() + "]{2}.*"
-            vat_regex = re.compile(country_pattern, re.UNICODE | re.X)
-            if partner_vat and not vat_regex.match(partner_vat):
-                partner_vat = country_code + partner_vat
+            country = country_obj.browse(cr, uid, country_id, context=context)
+            partner_vat = _format_partner_vat(cr, uid, partner_vat=partner_vat,
+                                              country=country)
         return {'value': {'partner_vat': partner_vat}}
 
 
-class l10n_es_aeat_mod349_partner_record_add_partner_refund(orm.Model):
-    """
-    Inheritance of 'l10n.es.aeat.mod349' to add a
-    relation between partner refund and report
-    """
-    _inherit = 'l10n.es.aeat.mod349.report'
-
-    _columns = {
-        'partner_refund_ids':
-                        fields.one2many('l10n.es.aeat.mod349.partner_refund',
-                                        'report_id',
-                                        'Partner refund IDS',
-                                        ondelete='cascade',
-                                        states={'confirmed': [('readonly',
-                                                               True)]}),
-    }
-
-
-class l10n_es_aeat_mod349_partner_refund_detail(orm.Model):
-
+class Mod349PartnerRefundDetail(orm.Model):
     _name = 'l10n.es.aeat.mod349.partner_refund_detail'
     _description = 'AEAT 349 Model - Partner refund detail'
 
@@ -535,20 +575,3 @@
         'date': fields.related('invoice_id', 'date_invoice',
                                type="date", string="Date", readonly=True)
     }
-
-
-class l10n_es_aeat_mod349_partner_refund_add_partner_refund_detail(orm.Model):
-    """
-    Inheritance of 'l10n.es.aeat.mod349.partner_refund' to add a relation
-    between partner refund and partner refund detail
-    """
-    _inherit = 'l10n.es.aeat.mod349.partner_refund'
-
-    _columns = {
-        'refund_detail_ids':
-                fields.one2many('l10n.es.aeat.mod349.partner_refund_detail',
-                                'refund_id',
-                                'Partner refund detail IDS',
-                                ondelete='cascade'),
-    }
-

=== modified file 'l10n_es_aeat_mod349/mod349_view.xml'
--- l10n_es_aeat_mod349/mod349_view.xml	2014-04-14 14:36:42 +0000
+++ l10n_es_aeat_mod349/mod349_view.xml	2014-04-15 12:47:56 +0000
@@ -33,8 +33,6 @@
             </field>
         </record>
 
-
-
         <!-- #################################
         ### AEAT MODEL 349 PARTNER RECORDS ###
         ################################## -->
@@ -78,8 +76,6 @@
             </field>
         </record>
 
-
-
         <!-- #######################################
         ### AEAT MODEL 349 PARTNER REFUND DETAIL ###
         ######################################## -->
@@ -111,8 +107,6 @@
             </field>
         </record>
 
-
-
         <!-- #################################
         ### AEAT MODEL 349 PARTNER REFUNDS ###
         ################################## -->
@@ -166,99 +160,68 @@
             </field>
         </record>
 
-
-
         <!-- #################
         ### AEAT MODEL 349 ###
         ################## -->
         <!-- Tree view -->
         <record id="view_l10n_es_aeat_mod349_report_tree" model="ir.ui.view">
-            <field name="name">AEAT Model 349 (tree)</field>
+            <field name="name">l10n_es.aeat.mod349.report.tree</field>
             <field name="model">l10n.es.aeat.mod349.report</field>
-            <field name="type">tree</field>
+            <field name="inherit_id" ref="l10n_es_aeat.view_l10n_es_aeat_report_tree"/>
             <field name="arch" type="xml">
-                <tree string="AEAT 349">
-                    <field name="number"/>
-                    <field name="name"/>
-                    <field name="company_id"/>
-                    <field name="fiscalyear_id"/>
+                <tree position="attributes">
+                    <attribute name="string">AEAT 349 reports</attribute>=
+                </tree>
+                <field name="fiscalyear_id" position="after">
                     <field name="period_selection"/>
                     <field name="month_selection"/>
-                    <field name="type"/>
-                    <field name="previous_number"/>
-                    <field name="state"/>
-                </tree>
+                    <field name="total_partner_records"/>
+                    <field name="total_partner_records_amount"/>
+                    <field name="total_partner_refunds"/>
+                    <field name="total_partner_refunds_amount"/>
+                </field>
             </field>
         </record>
 
         <!-- Form view -->
         <record id="view_l10n_es_aeat_mod349_report_form" model="ir.ui.view">
-            <field name="name">AEAT Model 349 (form)</field>
+            <field name="name">l10n_es.aeat.mod349.report.form</field>
             <field name="model">l10n.es.aeat.mod349.report</field>
-            <field name="type">form</field>
+            <field name="inherit_id" ref="l10n_es_aeat.view_l10n_es_aeat_report_form"/>
             <field name="arch" type="xml">
-                <form string="AEAT 349" version="7.0">
-                	<header>
-                		<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="calculated,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"/>
-                	</header>
-                	<sheet>
-                    <group colspan="4" col="6" string="Declaration">
-                        <field name="company_id" on_change="on_change_company_id(company_id)" required="1" select="1"/>
-                        <field name="number"/>
-                    </group>
-                    
-                    <group colspan="4" col="8">
-                        <group colspan="4" col="2">
-                            <field name="fiscalyear_id"/>
-                        </group>
-                        <group colspan="4" col="2">
-                            <field name="period_selection" on_change="onchange_period_selection(period_selection, fiscalyear_id)"/>
-                                <newline/>
-                            <group colspan="2" col="2" attrs="{'invisible':[('period_selection','not in',['1T','2T','3T','4T'])]}">
-                                <field name="period_ids"  attrs="{'required':[('period_selection','in',['1T','2T','3T','4T'])]}" domain="[('fiscalyear_id','=',fiscalyear_id)]"/>
-                            </group>
-                                <newline/>
-                            <group colspan="2" col="2" attrs="{'invisible':[('period_selection','!=','MO')]}">
-                                <field name="month_selection" attrs="{'required':[('period_selection','==','MO')]}"/>
-                            </group>
-                        </group>
-                    </group>
-                    <sheet>
+                <button name="%(l10n_es_aeat.action_wizard_aeat_export)d" position="attributes">
+                    <attribute name="name">%(action_wizard_aeat_mod349_export)d</attribute>
+                </button>
+                <field name="company_vat" position="after">
+                    <field name="contact_phone"/>
+                    <field name="contact_name"/>
+                    <field name="representative_vat"/>
+                </field>
+                <field name="calculation_date" position="after">
+                    <field name="period_selection" on_change="onchange_period_selection(period_selection, fiscalyear_id)"/>
+                    <field name="period_ids"
+                            attrs="{'required': [('period_selection', 'in', ['1T','2T','3T','4T'])], 'invisible':[('period_selection', 'not in', ['1T','2T','3T','4T'])]}"
+                            domain="[('fiscalyear_id','=',fiscalyear_id)]"/>
+                    <field name="month_selection"
+                            attrs="{'required': [('period_selection','==','MO')], 'invisible': [('period_selection','!=','MO')]}"/>
+                </field>
+                <group string="Declaración" position="after">
+                    <group string="Complementaria" colspan="4">
+                        <field name="type"/>
+                        <field name="previous_number"
+                                attrs="{'invisible': [('type','==','N')], 'required': ['|', ('type','==','S'), ('type','==','C')]}"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="General">
-                            <group string="Identification" colspan="4">
-                                <field name="company_vat"/>
-                                <field name="contact_phone"/>
-                                <field name="contact_name"/>
-                                <field name="representative_vat"/>
-                            </group>
-                            <group string="Complementary/Substitutive declaration" colspan="4">
-                                <field name="type"/>
-                                <field name="previous_number"
-                                    attrs="{'required':[('type','==','S'),('state','==','calculated')]}"/>
-                            </group>
-                            <group string="Summary" colspan="4">
-                                <field name="total_partner_records"/>
-                                <field name="total_partner_records_amount"/>
-                                <field name="total_partner_refunds"/>
-                                <field name="total_partner_refunds_amount"/>
+                            <group string="Resultado">
+                                <group>
+                                    <field name="total_partner_records"/>
+                                    <field name="total_partner_records_amount"/>
+                                </group>
+                                <group>
+                                    <field name="total_partner_refunds"/>
+                                    <field name="total_partner_refunds_amount"/>
+                                </group>
                             </group>
                             <group string="Options" colspan="4">
                                 <field name="support_type"/>
@@ -272,39 +235,7 @@
                             <field name="partner_refund_ids" nolabel="1"/>
                         </page>
                     </notebook>
-                    </sheet>
-                    <footer>
-                    <group colspan="4">
-                        <field name="state" select="2" readonly="1"/>
-                        <field name="calculation_date" select="2" readonly="1"/>
-                    </group>
-                    </footer>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-       <record id="view_l10n_es_aeat_mod349_report_search" model="ir.ui.view">
-            <field name="name">AEAT Model 349 (search)</field>
-            <field name="model">l10n.es.aeat.mod349.report</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="AEAT 349">
-                    <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'}"/>
-                    </group>
-                    <newline/>
-                    <field name="number"/>
-                    <field name="period_selection"/>
-                    <field name="type"/>
-                </search>
+                </group>
             </field>
         </record>
 
@@ -314,19 +245,27 @@
             <field name="res_model">l10n.es.aeat.mod349.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="help">Create and query AEAT Model 349 Reports</field>
-        </record>
-
-
-
-        <!--
-        ### MENU ACCESS ###
-        -->
+            <field name="help">Create and query AEAT Model 349 reports</field>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_l10n_es_aeat_mod303_report_tree">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_l10n_es_aeat_mod349_report_tree"/>
+            <field name="act_window_id" ref="action_l10n_es_aeat_mod349_report"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_l10n_es_aeat_mod349_report_form">
+            <field name="sequence" eval="3"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_l10n_es_aeat_mod349_report_form"/>
+            <field name="act_window_id" ref="action_l10n_es_aeat_mod349_report"/>
+        </record>
+
+        <!-- ### MENU ACCESS ### -->
         <menuitem
             id="menu_aeat_mod349_report"
             parent="l10n_es_aeat.menu_root_aeat"
             action="action_l10n_es_aeat_mod349_report"
-            sequence="60"
+            sequence="349"
             name="AEAT 349 Model"/>
                 
     </data>

=== removed file 'l10n_es_aeat_mod349/mod349_workflow.xml'
--- l10n_es_aeat_mod349/mod349_workflow.xml	2013-11-22 23:44:11 +0000
+++ l10n_es_aeat_mod349/mod349_workflow.xml	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="wkf_l10n_es_aeat_mod349_report" model="workflow">
-            <field name="name">AEAT 349 Report</field>
-            <field name="osv">l10n.es.aeat.mod349.report</field>
-            <field name="on_create">True</field>
-        </record>
-
-
-        <!--
-        ### NODES ###
-        -->
-        <record id="act_draft" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_l10n_es_aeat_mod349_report"/>
-            <field name="flow_start">True</field>
-            <field name="name">draft</field>
-        </record>
-
-        <record id="act_calculate" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_l10n_es_aeat_mod349_report"/>
-            <field name="name">calculated</field>
-            <field name="action">write({'state':'calculated'})</field>
-            <field name="kind">function</field>
-        </record>
-
-        <record id="act_confirm" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_l10n_es_aeat_mod349_report"/>
-            <field name="name">confirmed</field>
-            <field name="action">wkf_confirm()</field>
-            <field name="kind">function</field>
-        </record>
-
-        <record id="act_cancel" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_l10n_es_aeat_mod349_report"/>
-            <field name="name">canceled</field>
-            <field name="flow_stop">True</field>
-            <field name="action">write({'state':'canceled'})</field>
-            <field name="kind">function</field>
-        </record>
-
-
-        <!--
-        ### TRANSITIONS ###
-        -->
-        <record id="trans_draft_calculate" model="workflow.transition">
-            <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_calculate"/>
-            <field name="signal">calculate</field>
-        </record>
-
-        <record id="trans_calculate_confirm" model="workflow.transition">
-            <field name="act_from" ref="act_calculate"/>
-            <field name="act_to" ref="act_confirm"/>
-            <field name="signal">confirm</field>
-        </record>
-
-        <record id="trans_calculate_draft" model="workflow.transition">
-            <field name="act_from" ref="act_calculate"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">cancel</field>
-        </record>
-
-        <record id="trans_confirm_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_confirm"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">cancel</field>
-        </record>
-
-    </data>
-</openerp>

=== renamed file 'l10n_es_aeat_mod349/mod349_report.xml' => 'l10n_es_aeat_mod349/report/mod349_report.xml'
--- l10n_es_aeat_mod349/mod349_report.xml	2013-11-22 23:44:11 +0000
+++ l10n_es_aeat_mod349/report/mod349_report.xml	2014-04-15 12:47:56 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
+    <data>
 
             <report
                 id="report_l10n_es_aeat_mod349"
@@ -12,5 +12,5 @@
                 menu="True"
                 header="False" />
                 
-	</data>
+    </data>
 </openerp>
\ No newline at end of file

=== modified file 'l10n_es_aeat_mod349/security/ir.model.access.csv'
--- l10n_es_aeat_mod349/security/ir.model.access.csv	2013-11-22 23:44:11 +0000
+++ l10n_es_aeat_mod349/security/ir.model.access.csv	2014-04-15 12:47:56 +0000
@@ -1,16 +1,11 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-
 "access_l10n_es_aeat_mod349_report_user","AEAT 349 Model: Report - Account User","model_l10n_es_aeat_mod349_report","account.group_account_user",1,0,0,0
 "access_l10n_es_aeat_mod349_report_manager","AEAT 349 Model: Report - Account Manager","model_l10n_es_aeat_mod349_report","account.group_account_manager",1,1,1,1
-
 "access_l10n_es_aeat_mod349_partner_record_user","AEAT 349 Model: Partner record - Account User","model_l10n_es_aeat_mod349_partner_record","account.group_account_user",1,0,0,0
 "access_l10n_es_aeat_mod349_partner_record_manager","AEAT 349 Model: Partner record - Account Manager","model_l10n_es_aeat_mod349_partner_record","account.group_account_manager",1,1,1,1
-
 "access_l10n_es_aeat_mod349_partner_record_detail_user","AEAT 349 Model: Partner record detail - Account User","model_l10n_es_aeat_mod349_partner_record_detail","account.group_account_user",1,0,0,0
 "access_l10n_es_aeat_mod349_partner_record_detail_manager","AEAT 349 Model: Partner record detail - Account Manager","model_l10n_es_aeat_mod349_partner_record_detail","account.group_account_manager",1,1,1,1
-
 "access_l10n_es_aeat_mod349_partner_refund_user","AEAT 349 Model: Partner refund - Account User","model_l10n_es_aeat_mod349_partner_refund","account.group_account_user",1,0,0,0
 "access_l10n_es_aeat_mod349_partner_refund_manager","AEAT 349 Model: Partner refund - Account Manager","model_l10n_es_aeat_mod349_partner_refund","account.group_account_manager",1,1,1,1
-
 "access_l10n_es_aeat_mod349_partner_refund_detail_user","AEAT 349 Model: Partner refund detail - Account User","model_l10n_es_aeat_mod349_partner_refund_detail","account.group_account_user",1,0,0,0
-"access_l10n_es_aeat_mod349_partner_refund_detail_manager","AEAT 349 Model: Partner refund detail - Account Manager","model_l10n_es_aeat_mod349_partner_refund_detail","account.group_account_manager",1,1,1,1
\ No newline at end of file
+"access_l10n_es_aeat_mod349_partner_refund_detail_manager","AEAT 349 Model: Partner refund detail - Account Manager","model_l10n_es_aeat_mod349_partner_refund_detail","account.group_account_manager",1,1,1,1

=== added directory 'l10n_es_aeat_mod349/static'
=== added directory 'l10n_es_aeat_mod349/static/src'
=== added directory 'l10n_es_aeat_mod349/static/src/img'
=== added file 'l10n_es_aeat_mod349/static/src/img/icon.png'
Binary files l10n_es_aeat_mod349/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and l10n_es_aeat_mod349/static/src/img/icon.png	2014-04-15 12:47:56 +0000 differ
=== added file 'l10n_es_aeat_mod349/static/src/img/icon_source.svg'
--- l10n_es_aeat_mod349/static/src/img/icon_source.svg	1970-01-01 00:00:00 +0000
+++ l10n_es_aeat_mod349/static/src/img/icon_source.svg	2014-04-15 12:47:56 +0000
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   width="128"
+   height="128"
+   sodipodi:docname="icon_source.svg"
+   inkscape:export-filename="icon.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </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="1056"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="9.2903224"
+     inkscape:cx="65.663825"
+     inkscape:cy="30.379861"
+     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
+     sodipodi:linespacing="125%"
+     id="text2988"
+     y="127.48399"
+     x="-1.5893271"
+     style="font-size:42.27203751px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial Bold"
+     xml:space="preserve"><tspan
+       y="127.48399"
+       x="-1.5893271"
+       id="tspan2990"
+       sodipodi:role="line">349</tspan></text>
+</svg>

=== modified file 'l10n_es_aeat_mod349/wizard/__init__.py'
--- l10n_es_aeat_mod349/wizard/__init__.py	2014-04-14 14:36:42 +0000
+++ l10n_es_aeat_mod349/wizard/__init__.py	2014-04-15 12:47:56 +0000
@@ -1,11 +1,16 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Copyright (C) 2004-2011
-#        Pexego Sistemas Informáticos. (http://pexego.es) All Rights Reserved
+#    Copyright (C)
+#        2004-2011: Pexego Sistemas Informáticos. (http://pexego.es)
+#        2013:      Top Consultant Software Creations S.L.
+#                   (http://www.topconsultant.es/)
+#        2014:      Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com)
+#                   Pedro M. Baeza <[e-mail]> 
 #
-#    Migración OpenERP 7.0. Top Consultant Software Creations S.L. (http://www.topconsultant.es/) 2013
-#        Ignacio Martínez y Miguel López.
+#    Autores originales: Luis Manuel Angueira Blanco (Pexego)
+#                        Omar Castiñeira Saavedra([e-mail])
+#    Migración OpenERP 7.0: Ignacio Martínez y Miguel López.
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -21,8 +26,4 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-__author__ = "Luis Manuel Angueira Blanco (Pexego)"
-
-from . import calculate_mod349_records
-from . import export_mod349_to_boe
\ No newline at end of file
+from . import export_mod349_to_boe

=== removed file 'l10n_es_aeat_mod349/wizard/calculate_mod349_records.py'
--- l10n_es_aeat_mod349/wizard/calculate_mod349_records.py	2014-04-14 14:36:42 +0000
+++ l10n_es_aeat_mod349/wizard/calculate_mod349_records.py	1970-01-01 00:00:00 +0000
@@ -1,295 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2004-2011
-#        Pexego Sistemas Informáticos. (http://pexego.es) All Rights Reserved
-#
-#    Migración OpenERP 7.0. Top Consultant Software Creations S.L. (http://www.topconsultant.es/) 2013
-#        Ignacio Martínez y Miguel López.
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import threading
-import time
-from openerp import netsvc
-import re
-from openerp.osv import orm
-
-vat_regex = re.compile(u"[a-zA-Z]{2}.*", re.UNICODE | re.X)
-
-
-class l10n_es_aeat_mod349_calculate_records(orm.TransientModel):
-    _name = "l10n.es.aeat.mod349.calculate_records"
-    _description = u"AEAT Model 349 Wizard - Calculate Records"
-
-    def _formatPartnerVAT(self, cr, uid, partner_vat=None, country_id=None,
-                          context=None):
-        """
-        Formats VAT to match XXVATNUMBER (where XX is country code)
-        """
-        if partner_vat and \
-            not vat_regex.match(partner_vat) and country_id:
-            partner_vat = self.pool.get('res.country').\
-            browse(cr, uid, country_id, context=context).code + partner_vat
-
-        return partner_vat
-
-    def _create_partner_records_for_report(self, cr, uid, ids, report_id,\
-                                           partner_obj, operation_key,
-                                           context=None):
-        """creates partner records in 349"""
-        invoices_ids = self.pool.get('account.invoice').browse(cr, uid, ids,
-                                                               context=context)
-
-        obj = self.pool.get('l10n.es.aeat.mod349.partner_record')
-
-        partner_country = partner_obj.country_id
-
-        invoice_created = obj.create(cr, uid, {
-            'report_id': report_id,
-            'partner_id': partner_obj.id,
-            'partner_vat':
-                        self._formatPartnerVAT(cr,
-                                               uid,
-                                               partner_vat=partner_obj.vat,
-                                               country_id=partner_country.id),
-            'operation_key': operation_key,
-            'country_id': partner_country.id or False,
-            'total_operation_amount': sum([invoice.cc_amount_untaxed for
-                                            invoice in invoices_ids if
-                                            invoice.type not in
-                                            ('in_refund', 'out_refund')]) -
-                                               sum([invoice.cc_amount_untaxed
-                                                    for invoice in invoices_ids
-                                                    if invoice.type in
-                                                    ('in_refund',
-                                                     'out_refund')])
-        })
-
-        ### Creation of partner detail lines
-        for invoice in invoices_ids:
-            self.pool.get('l10n.es.aeat.mod349.partner_record_detail').\
-            create(cr, uid, {
-                'partner_record_id': invoice_created,