From 5d33cba7cd939d0caff756402b4c2ff19c06a622 Mon Sep 17 00:00:00 2001 From: Eric Antones Date: Mon, 12 Oct 2020 18:07:10 +0200 Subject: [PATCH 1/6] [ADD] contract_sii: new module --- contract_sii/README.rst | 29 ++++++ contract_sii/__init__.py | 5 + contract_sii/__manifest__.py | 23 +++++ contract_sii/i18n/es.po | 89 ++++++++++++++++++ contract_sii/models/__init__.py | 5 + .../models/account_analytic_account.py | 79 ++++++++++++++++ contract_sii/static/description/icon.png | Bin 0 -> 6342 bytes .../views/account_analytic_contract_view.xml | 56 +++++++++++ 8 files changed, 286 insertions(+) create mode 100644 contract_sii/README.rst create mode 100644 contract_sii/__init__.py create mode 100644 contract_sii/__manifest__.py create mode 100644 contract_sii/i18n/es.po create mode 100644 contract_sii/models/__init__.py create mode 100644 contract_sii/models/account_analytic_account.py create mode 100644 contract_sii/static/description/icon.png create mode 100644 contract_sii/views/account_analytic_contract_view.xml diff --git a/contract_sii/README.rst b/contract_sii/README.rst new file mode 100644 index 000000000..60e787719 --- /dev/null +++ b/contract_sii/README.rst @@ -0,0 +1,29 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +============ +Contract SII +============ + +* This module adds SII data to contracts and propagate them to invoice + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smashing it by providing a detailed and welcomed feedback. + +Credits +======= + +Contributors +------------ + +* Eric Antones + + + + diff --git a/contract_sii/__init__.py b/contract_sii/__init__.py new file mode 100644 index 000000000..38b2ba65b --- /dev/null +++ b/contract_sii/__init__.py @@ -0,0 +1,5 @@ +# Copyright NuoBiT Solutions, S.L. () +# Eric Antones +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) + +from . import models diff --git a/contract_sii/__manifest__.py b/contract_sii/__manifest__.py new file mode 100644 index 000000000..1277fafc0 --- /dev/null +++ b/contract_sii/__manifest__.py @@ -0,0 +1,23 @@ +# Copyright NuoBiT Solutions, S.L. () +# Eric Antones +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) + +{ + 'name': 'Contract SII', + 'summary': 'This module adds SII data to contracts and propagate them to invoice', + 'version': '11.0.1.0.0', + 'category': 'Contract Management', + 'author': 'NuoBiT Solutions, S.L., Eric Antones', + 'website': 'https://www.nuobit.com', + 'license': 'AGPL-3', + 'depends': [ + 'contract', + 'l10n_es_aeat_sii', + + ], + 'data': [ + 'views/account_analytic_contract_view.xml', + ], + 'installable': True, + 'auto_install': False, +} diff --git a/contract_sii/i18n/es.po b/contract_sii/i18n/es.po new file mode 100644 index 000000000..2e8058c13 --- /dev/null +++ b/contract_sii/i18n/es.po @@ -0,0 +1,89 @@ +# This file contains the translation of the following modules: +# * contract_sii +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-10-12 15:56+0000\n" +"PO-Revision-Date: 2020-10-12 15:56+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: contract_sii +#: model:ir.model.fields,field_description:contract_sii.field_account_analytic_account_sii_registration_key_additional2 +#: model:ir.model.fields,field_description:contract_sii.field_project_project_sii_registration_key_additional2 +msgid "Additional 2 SII registration key" +msgstr "Clave de registro adicional 2 SII" + +#. module: contract_sii +#: model:ir.model.fields,field_description:contract_sii.field_account_analytic_account_sii_registration_key_additional1 +#: model:ir.model.fields,field_description:contract_sii.field_project_project_sii_registration_key_additional1 +msgid "Additional SII registration key" +msgstr "Clave de registro adicional SII" + +#. module: contract_sii +#: model:ir.model,name:contract_sii.model_account_analytic_account +msgid "Analytic Account" +msgstr "Cuenta analítica" + +#. module: contract_sii +#: model:ir.model.fields,field_description:contract_sii.field_account_analytic_account_sii_registration_key_code +#: model:ir.model.fields,field_description:contract_sii.field_project_project_sii_registration_key_code +msgid "Code" +msgstr "Código" + +#. module: contract_sii +#: model:ir.model.fields,field_description:contract_sii.field_account_analytic_account_sii_enabled +#: model:ir.model.fields,field_description:contract_sii.field_project_project_sii_enabled +msgid "Enable SII" +msgstr "Activar SII" + +#. module: contract_sii +#: model:ir.model.fields,field_description:contract_sii.field_account_analytic_account_sii_property_cadastrial_code +#: model:ir.model.fields,field_description:contract_sii.field_project_project_sii_property_cadastrial_code +msgid "Real property cadastrial code" +msgstr "Referencia catastral" + +#. module: contract_sii +#: model:ir.model.fields,field_description:contract_sii.field_account_analytic_account_sii_property_location +#: model:ir.model.fields,field_description:contract_sii.field_project_project_sii_property_location +msgid "Real property location" +msgstr "Situación del inmueble" + +#. module: contract_sii +#: model:ir.ui.view,arch_db:contract_sii.account_analytic_account_purchase_form +#: model:ir.ui.view,arch_db:contract_sii.account_analytic_account_sale_form +msgid "SII Information" +msgstr "Información SII" + +#. module: contract_sii +#: model:ir.model.fields,field_description:contract_sii.field_account_analytic_account_sii_registration_key +#: model:ir.model.fields,field_description:contract_sii.field_project_project_sii_registration_key +msgid "SII registration key" +msgstr "Clave de registro SII" + +#. module: contract_sii +#: selection:account.analytic.account,sii_property_location:0 +msgid "[1]-Real property with cadastral code located within the Spanish territory except Basque Country or Navarra" +msgstr "[1]-Inmueble con referencia catastral situado dentro del territorio Español excepto el País Vasco y Navarra" + +#. module: contract_sii +#: selection:account.analytic.account,sii_property_location:0 +msgid "[2]-Real property located in the Basque Country or Navarra" +msgstr "[2]-Inmueble situado en el País Vasco o Navarra" + +#. module: contract_sii +#: selection:account.analytic.account,sii_property_location:0 +msgid "[3]-Real property in any of the above situations but without cadastral code" +msgstr "[3]-Inmueble situado en cualquiera de las ubicaciones anteriores pero sin referencia catastral" + +#. module: contract_sii +#: selection:account.analytic.account,sii_property_location:0 +msgid "[4]-Real property located in a foreign country" +msgstr "[4]-Inmueble situado en un país extranjero" + diff --git a/contract_sii/models/__init__.py b/contract_sii/models/__init__.py new file mode 100644 index 000000000..710406955 --- /dev/null +++ b/contract_sii/models/__init__.py @@ -0,0 +1,5 @@ +# Copyright NuoBiT Solutions, S.L. () +# Eric Antones +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) + +from . import account_analytic_account diff --git a/contract_sii/models/account_analytic_account.py b/contract_sii/models/account_analytic_account.py new file mode 100644 index 000000000..854117048 --- /dev/null +++ b/contract_sii/models/account_analytic_account.py @@ -0,0 +1,79 @@ +# Copyright NuoBiT Solutions, S.L. () +# Eric Antones +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) + +from odoo import api, fields, models + + +class AccountAnalyticAccount(models.Model): + _inherit = 'account.analytic.account' + + def _default_sii_registration_key(self): + sii_key_obj = self.env['aeat.sii.mapping.registration.keys'] + contract_type = self.env.context.get('default_contract_type') + key = sii_key_obj.search( + [('code', '=', '01'), ('type', '=', contract_type)], limit=1) + return key + + sii_registration_key = fields.Many2one( + comodel_name='aeat.sii.mapping.registration.keys', + string="SII registration key", default=_default_sii_registration_key, + ) + sii_registration_key_additional1 = fields.Many2one( + comodel_name='aeat.sii.mapping.registration.keys', + string="Additional SII registration key" + ) + sii_registration_key_additional2 = fields.Many2one( + comodel_name='aeat.sii.mapping.registration.keys', + string="Additional 2 SII registration key" + ) + sii_registration_key_code = fields.Char( + related="sii_registration_key.code", readonly=True, + ) + sii_enabled = fields.Boolean( + string='Enable SII', compute='_compute_sii_enabled', + ) + sii_property_location = fields.Selection( + string="Real property location", copy=False, + selection=[ + ('1', '[1]-Real property with cadastral code located within ' + 'the Spanish territory except Basque Country or Navarra'), + ('2', '[2]-Real property located in the ' + 'Basque Country or Navarra'), + ('3', '[3]-Real property in any of the above situations ' + 'but without cadastral code'), + ('4', '[4]-Real property located in a foreign country'), + ], + ) + sii_property_cadastrial_code = fields.Char( + string="Real property cadastrial code", size=25, copy=False, + ) + + @api.multi + @api.depends('company_id', 'company_id.sii_enabled') + def _compute_sii_enabled(self): + for rec in self: + rec.sii_enabled = rec.company_id.sii_enabled + + @api.multi + def _prepare_invoice(self): + invoice = super()._prepare_invoice() + + values = {} + if self.sii_registration_key: + values['sii_registration_key'] = self.sii_registration_key.id + if self.sii_registration_key_additional1: + values['sii_registration_key_additional1'] = self.sii_registration_key_additional1.id + if self.sii_registration_key_additional2: + values['sii_registration_key_additional2'] = self.sii_registration_key_additional2.id + + if self.contract_type == 'sale': + if self.sii_property_location: + values['sii_property_location'] = self.sii_property_location + if self.sii_property_cadastrial_code: + values['sii_property_cadastrial_code'] = self.sii_property_cadastrial_code + + if values: + invoice.update(values) + + return invoice diff --git a/contract_sii/static/description/icon.png b/contract_sii/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1cd641e792c30455187ca30940bc0f329ce8bbb0 GIT binary patch literal 6342 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 literal 0 HcmV?d00001 diff --git a/contract_sii/views/account_analytic_contract_view.xml b/contract_sii/views/account_analytic_contract_view.xml new file mode 100644 index 000000000..52d1b3eee --- /dev/null +++ b/contract_sii/views/account_analytic_contract_view.xml @@ -0,0 +1,56 @@ + + + + + account.analytic.account + + + + + + + + + + + + + + + + + + + + + + account.analytic.account + + + + + + + + + + + + + + + + + From 5110621e6fa07a0bd2d104c62538c2d3755d2d63 Mon Sep 17 00:00:00 2001 From: Christopher Ormaza Date: Tue, 4 Jan 2022 11:29:16 -0500 Subject: [PATCH 2/6] [IMP] contract_sii: black, isort, prettier --- contract_sii/__manifest__.py | 29 ++++--- .../models/account_analytic_account.py | 74 ++++++++++------- .../views/account_analytic_contract_view.xml | 83 +++++++++++++------ 3 files changed, 117 insertions(+), 69 deletions(-) diff --git a/contract_sii/__manifest__.py b/contract_sii/__manifest__.py index 1277fafc0..6bd52895c 100644 --- a/contract_sii/__manifest__.py +++ b/contract_sii/__manifest__.py @@ -3,21 +3,20 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) { - 'name': 'Contract SII', - 'summary': 'This module adds SII data to contracts and propagate them to invoice', - 'version': '11.0.1.0.0', - 'category': 'Contract Management', - 'author': 'NuoBiT Solutions, S.L., Eric Antones', - 'website': 'https://www.nuobit.com', - 'license': 'AGPL-3', - 'depends': [ - 'contract', - 'l10n_es_aeat_sii', - + "name": "Contract SII", + "summary": "This module adds SII data to contracts and propagate them to invoice", + "version": "11.0.1.0.0", + "category": "Contract Management", + "author": "NuoBiT Solutions, S.L., Eric Antones", + "website": "https://github.com/nuobit/odoo-addons", + "license": "AGPL-3", + "depends": [ + "contract", + "l10n_es_aeat_sii", ], - 'data': [ - 'views/account_analytic_contract_view.xml', + "data": [ + "views/account_analytic_contract_view.xml", ], - 'installable': True, - 'auto_install': False, + "installable": True, + "auto_install": False, } diff --git a/contract_sii/models/account_analytic_account.py b/contract_sii/models/account_analytic_account.py index 854117048..9bde65cc1 100644 --- a/contract_sii/models/account_analytic_account.py +++ b/contract_sii/models/account_analytic_account.py @@ -6,51 +6,63 @@ class AccountAnalyticAccount(models.Model): - _inherit = 'account.analytic.account' + _inherit = "account.analytic.account" def _default_sii_registration_key(self): - sii_key_obj = self.env['aeat.sii.mapping.registration.keys'] - contract_type = self.env.context.get('default_contract_type') + sii_key_obj = self.env["aeat.sii.mapping.registration.keys"] + contract_type = self.env.context.get("default_contract_type") key = sii_key_obj.search( - [('code', '=', '01'), ('type', '=', contract_type)], limit=1) + [("code", "=", "01"), ("type", "=", contract_type)], limit=1 + ) return key sii_registration_key = fields.Many2one( - comodel_name='aeat.sii.mapping.registration.keys', - string="SII registration key", default=_default_sii_registration_key, + comodel_name="aeat.sii.mapping.registration.keys", + string="SII registration key", + default=_default_sii_registration_key, ) sii_registration_key_additional1 = fields.Many2one( - comodel_name='aeat.sii.mapping.registration.keys', - string="Additional SII registration key" + comodel_name="aeat.sii.mapping.registration.keys", + string="Additional SII registration key", ) sii_registration_key_additional2 = fields.Many2one( - comodel_name='aeat.sii.mapping.registration.keys', - string="Additional 2 SII registration key" + comodel_name="aeat.sii.mapping.registration.keys", + string="Additional 2 SII registration key", ) sii_registration_key_code = fields.Char( - related="sii_registration_key.code", readonly=True, + related="sii_registration_key.code", + readonly=True, ) sii_enabled = fields.Boolean( - string='Enable SII', compute='_compute_sii_enabled', + string="Enable SII", + compute="_compute_sii_enabled", ) sii_property_location = fields.Selection( - string="Real property location", copy=False, + string="Real property location", + copy=False, selection=[ - ('1', '[1]-Real property with cadastral code located within ' - 'the Spanish territory except Basque Country or Navarra'), - ('2', '[2]-Real property located in the ' - 'Basque Country or Navarra'), - ('3', '[3]-Real property in any of the above situations ' - 'but without cadastral code'), - ('4', '[4]-Real property located in a foreign country'), + ( + "1", + "[1]-Real property with cadastral code located within " + "the Spanish territory except Basque Country or Navarra", + ), + ("2", "[2]-Real property located in the " "Basque Country or Navarra"), + ( + "3", + "[3]-Real property in any of the above situations " + "but without cadastral code", + ), + ("4", "[4]-Real property located in a foreign country"), ], ) sii_property_cadastrial_code = fields.Char( - string="Real property cadastrial code", size=25, copy=False, + string="Real property cadastrial code", + size=25, + copy=False, ) @api.multi - @api.depends('company_id', 'company_id.sii_enabled') + @api.depends("company_id", "company_id.sii_enabled") def _compute_sii_enabled(self): for rec in self: rec.sii_enabled = rec.company_id.sii_enabled @@ -61,17 +73,23 @@ def _prepare_invoice(self): values = {} if self.sii_registration_key: - values['sii_registration_key'] = self.sii_registration_key.id + values["sii_registration_key"] = self.sii_registration_key.id if self.sii_registration_key_additional1: - values['sii_registration_key_additional1'] = self.sii_registration_key_additional1.id + values[ + "sii_registration_key_additional1" + ] = self.sii_registration_key_additional1.id if self.sii_registration_key_additional2: - values['sii_registration_key_additional2'] = self.sii_registration_key_additional2.id + values[ + "sii_registration_key_additional2" + ] = self.sii_registration_key_additional2.id - if self.contract_type == 'sale': + if self.contract_type == "sale": if self.sii_property_location: - values['sii_property_location'] = self.sii_property_location + values["sii_property_location"] = self.sii_property_location if self.sii_property_cadastrial_code: - values['sii_property_cadastrial_code'] = self.sii_property_cadastrial_code + values[ + "sii_property_cadastrial_code" + ] = self.sii_property_cadastrial_code if values: invoice.update(values) diff --git a/contract_sii/views/account_analytic_contract_view.xml b/contract_sii/views/account_analytic_contract_view.xml index 52d1b3eee..a525a3f5b 100644 --- a/contract_sii/views/account_analytic_contract_view.xml +++ b/contract_sii/views/account_analytic_contract_view.xml @@ -1,30 +1,46 @@ - + account.analytic.account - + - + - - - - - + + + + + - - + + @@ -33,21 +49,36 @@ account.analytic.account - + - + - - + + - - + + From caf1aef54ce1c23d8cfb38e8b8b6be5a6bcfcb2e Mon Sep 17 00:00:00 2001 From: Christopher Ormaza Date: Tue, 4 Jan 2022 13:57:38 -0500 Subject: [PATCH 3/6] [14.0][MIG] contract_sii : Migration to 14.0 --- contract_sii/README.rst | 9 +- contract_sii/__manifest__.py | 6 +- contract_sii/i18n/es.po | 84 +++++++----- contract_sii/models/__init__.py | 2 +- ...ccount_analytic_account.py => contract.py} | 16 +-- contract_sii/tests/__init__.py | 1 + contract_sii/tests/test_contract_sii.py | 129 ++++++++++++++++++ .../views/account_analytic_contract_view.xml | 87 ------------ contract_sii/views/contract_view.xml | 54 ++++++++ 9 files changed, 248 insertions(+), 140 deletions(-) rename contract_sii/models/{account_analytic_account.py => contract.py} (89%) create mode 100644 contract_sii/tests/__init__.py create mode 100644 contract_sii/tests/test_contract_sii.py delete mode 100644 contract_sii/views/account_analytic_contract_view.xml create mode 100644 contract_sii/views/contract_view.xml diff --git a/contract_sii/README.rst b/contract_sii/README.rst index 60e787719..0c35997a6 100644 --- a/contract_sii/README.rst +++ b/contract_sii/README.rst @@ -1,5 +1,5 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html +.. image:: https://img.shields.io/badge/license-AGPL--3-blue.png + :target: https://www.gnu.org/licenses/agpl :alt: License: AGPL-3 ============ @@ -23,7 +23,4 @@ Contributors ------------ * Eric Antones - - - - +* Christopher Ormaza diff --git a/contract_sii/__manifest__.py b/contract_sii/__manifest__.py index 6bd52895c..235b4994d 100644 --- a/contract_sii/__manifest__.py +++ b/contract_sii/__manifest__.py @@ -5,17 +5,17 @@ { "name": "Contract SII", "summary": "This module adds SII data to contracts and propagate them to invoice", - "version": "11.0.1.0.0", + "version": "14.0.1.0.0", "category": "Contract Management", "author": "NuoBiT Solutions, S.L., Eric Antones", "website": "https://github.com/nuobit/odoo-addons", "license": "AGPL-3", "depends": [ "contract", - "l10n_es_aeat_sii", + "l10n_es_aeat_sii_oca", ], "data": [ - "views/account_analytic_contract_view.xml", + "views/contract_view.xml", ], "installable": True, "auto_install": False, diff --git a/contract_sii/i18n/es.po b/contract_sii/i18n/es.po index 2e8058c13..7002202fe 100644 --- a/contract_sii/i18n/es.po +++ b/contract_sii/i18n/es.po @@ -1,13 +1,14 @@ +# Translation of Odoo Server. # This file contains the translation of the following modules: -# * contract_sii +# * contract_sii # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-12 15:56+0000\n" -"PO-Revision-Date: 2020-10-12 15:56+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2022-01-21 13:58+0000\n" +"PO-Revision-Date: 2022-01-21 13:58+0000\n" +"Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -15,75 +16,88 @@ msgstr "" "Plural-Forms: \n" #. module: contract_sii -#: model:ir.model.fields,field_description:contract_sii.field_account_analytic_account_sii_registration_key_additional2 -#: model:ir.model.fields,field_description:contract_sii.field_project_project_sii_registration_key_additional2 +#: model:ir.model.fields,field_description:contract_sii.field_contract_contract__sii_registration_key_additional2 msgid "Additional 2 SII registration key" msgstr "Clave de registro adicional 2 SII" #. module: contract_sii -#: model:ir.model.fields,field_description:contract_sii.field_account_analytic_account_sii_registration_key_additional1 -#: model:ir.model.fields,field_description:contract_sii.field_project_project_sii_registration_key_additional1 +#: model:ir.model.fields,field_description:contract_sii.field_contract_contract__sii_registration_key_additional1 msgid "Additional SII registration key" msgstr "Clave de registro adicional SII" #. module: contract_sii -#: model:ir.model,name:contract_sii.model_account_analytic_account -msgid "Analytic Account" -msgstr "Cuenta analítica" +#: model:ir.model,name:contract_sii.model_contract_contract +msgid "Contract" +msgstr "Contrato" #. module: contract_sii -#: model:ir.model.fields,field_description:contract_sii.field_account_analytic_account_sii_registration_key_code -#: model:ir.model.fields,field_description:contract_sii.field_project_project_sii_registration_key_code -msgid "Code" -msgstr "Código" +#: model:ir.model.fields,field_description:contract_sii.field_contract_contract__display_name +msgid "Display Name" +msgstr "Nombre mostrado" #. module: contract_sii -#: model:ir.model.fields,field_description:contract_sii.field_account_analytic_account_sii_enabled -#: model:ir.model.fields,field_description:contract_sii.field_project_project_sii_enabled +#: model:ir.model.fields,field_description:contract_sii.field_contract_contract__sii_enabled msgid "Enable SII" msgstr "Activar SII" #. module: contract_sii -#: model:ir.model.fields,field_description:contract_sii.field_account_analytic_account_sii_property_cadastrial_code -#: model:ir.model.fields,field_description:contract_sii.field_project_project_sii_property_cadastrial_code +#: model:ir.model.fields,field_description:contract_sii.field_contract_contract__id +msgid "ID" +msgstr "" + +#. module: contract_sii +#: model:ir.model.fields,field_description:contract_sii.field_contract_contract____last_update +msgid "Last Modified on" +msgstr "Última Modificación en" + +#. module: contract_sii +#: model:ir.model.fields,field_description:contract_sii.field_contract_contract__sii_property_cadastrial_code msgid "Real property cadastrial code" msgstr "Referencia catastral" #. module: contract_sii -#: model:ir.model.fields,field_description:contract_sii.field_account_analytic_account_sii_property_location -#: model:ir.model.fields,field_description:contract_sii.field_project_project_sii_property_location +#: model:ir.model.fields,field_description:contract_sii.field_contract_contract__sii_property_location msgid "Real property location" msgstr "Situación del inmueble" #. module: contract_sii -#: model:ir.ui.view,arch_db:contract_sii.account_analytic_account_purchase_form -#: model:ir.ui.view,arch_db:contract_sii.account_analytic_account_sale_form +#: model:ir.model.fields,field_description:contract_sii.field_contract_contract__sii_registration_key_code +msgid "SII Code" +msgstr "Código SII" + +#. module: contract_sii +#: model_terms:ir.ui.view,arch_db:contract_sii.contract_contract_sale_form msgid "SII Information" msgstr "Información SII" #. module: contract_sii -#: model:ir.model.fields,field_description:contract_sii.field_account_analytic_account_sii_registration_key -#: model:ir.model.fields,field_description:contract_sii.field_project_project_sii_registration_key +#: model:ir.model.fields,field_description:contract_sii.field_contract_contract__sii_registration_key msgid "SII registration key" msgstr "Clave de registro SII" #. module: contract_sii -#: selection:account.analytic.account,sii_property_location:0 -msgid "[1]-Real property with cadastral code located within the Spanish territory except Basque Country or Navarra" -msgstr "[1]-Inmueble con referencia catastral situado dentro del territorio Español excepto el País Vasco y Navarra" +#: model:ir.model.fields.selection,name:contract_sii.selection__contract_contract__sii_property_location__1 +msgid "" +"[1]-Real property with cadastral code located within the Spanish territory " +"except Basque Country or Navarra" +msgstr "" +"[1]-Inmueble con referencia catastral situado dentro del territorio Español " +"excepto el País Vasco y Navarra" #. module: contract_sii -#: selection:account.analytic.account,sii_property_location:0 +#: model:ir.model.fields.selection,name:contract_sii.selection__contract_contract__sii_property_location__2 msgid "[2]-Real property located in the Basque Country or Navarra" msgstr "[2]-Inmueble situado en el País Vasco o Navarra" #. module: contract_sii -#: selection:account.analytic.account,sii_property_location:0 -msgid "[3]-Real property in any of the above situations but without cadastral code" -msgstr "[3]-Inmueble situado en cualquiera de las ubicaciones anteriores pero sin referencia catastral" +#: model:ir.model.fields.selection,name:contract_sii.selection__contract_contract__sii_property_location__3 +msgid "" +"[3]-Real property in any of the above situations but without cadastral code" +msgstr "" +"[3]-Inmueble situado en cualquiera de las ubicaciones anteriores pero sin " +"referencia catastral" #. module: contract_sii -#: selection:account.analytic.account,sii_property_location:0 +#: model:ir.model.fields.selection,name:contract_sii.selection__contract_contract__sii_property_location__4 msgid "[4]-Real property located in a foreign country" msgstr "[4]-Inmueble situado en un país extranjero" - diff --git a/contract_sii/models/__init__.py b/contract_sii/models/__init__.py index 710406955..86aa00632 100644 --- a/contract_sii/models/__init__.py +++ b/contract_sii/models/__init__.py @@ -2,4 +2,4 @@ # Eric Antones # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) -from . import account_analytic_account +from . import contract diff --git a/contract_sii/models/account_analytic_account.py b/contract_sii/models/contract.py similarity index 89% rename from contract_sii/models/account_analytic_account.py rename to contract_sii/models/contract.py index 9bde65cc1..ee9847869 100644 --- a/contract_sii/models/account_analytic_account.py +++ b/contract_sii/models/contract.py @@ -5,8 +5,8 @@ from odoo import api, fields, models -class AccountAnalyticAccount(models.Model): - _inherit = "account.analytic.account" +class ContractContract(models.Model): + _inherit = "contract.contract" def _default_sii_registration_key(self): sii_key_obj = self.env["aeat.sii.mapping.registration.keys"] @@ -32,6 +32,7 @@ def _default_sii_registration_key(self): sii_registration_key_code = fields.Char( related="sii_registration_key.code", readonly=True, + string="SII Code", ) sii_enabled = fields.Boolean( string="Enable SII", @@ -61,15 +62,14 @@ def _default_sii_registration_key(self): copy=False, ) - @api.multi @api.depends("company_id", "company_id.sii_enabled") def _compute_sii_enabled(self): for rec in self: rec.sii_enabled = rec.company_id.sii_enabled - @api.multi - def _prepare_invoice(self): - invoice = super()._prepare_invoice() + def _prepare_invoice(self, date_invoice, journal=None): + self.ensure_one() + invoice_vals, move_form = super()._prepare_invoice(date_invoice, journal) values = {} if self.sii_registration_key: @@ -92,6 +92,6 @@ def _prepare_invoice(self): ] = self.sii_property_cadastrial_code if values: - invoice.update(values) + invoice_vals.update(values) - return invoice + return invoice_vals, move_form diff --git a/contract_sii/tests/__init__.py b/contract_sii/tests/__init__.py new file mode 100644 index 000000000..4f96d644b --- /dev/null +++ b/contract_sii/tests/__init__.py @@ -0,0 +1 @@ +from . import test_contract_sii diff --git a/contract_sii/tests/test_contract_sii.py b/contract_sii/tests/test_contract_sii.py new file mode 100644 index 000000000..0d027ee90 --- /dev/null +++ b/contract_sii/tests/test_contract_sii.py @@ -0,0 +1,129 @@ +from odoo.tests import Form + +from odoo.addons.contract.tests.test_contract import TestContractBase + + +class TestContractSii(TestContractBase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.company_model = cls.env["res.company"] + cls.contract_model = cls.env["contract.contract"] + cls.aml_model = cls.env["account.move.line"] + cls.registration_keys_model = cls.env["aeat.sii.mapping.registration.keys"] + cls.env.company.write( + { + "sii_enabled": True, + "sii_test": True, + } + ) + + def test_contract_sale_sii(self): + contract_sale_form = Form( + self.contract_model.with_context( + is_contract=True, default_contract_type="sale" + ) + ) + contract_sale_form.name = "Test Contract" + contract_sale_form.partner_id = self.partner + contract_sale_form.pricelist_id = self.partner.property_product_pricelist + contract_sale_form.recurring_interval = 1 + contract_sale_form.recurring_rule_type = "monthly" + sale_keys = self.registration_keys_model.search([("type", "=", "sale")]) + contract_sale_form.sii_registration_key = sale_keys[0] + contract_sale_form.sii_registration_key_additional1 = sale_keys[0] + contract_sale_form.sii_registration_key_additional2 = sale_keys[0] + contract_sale_form.sii_property_cadastrial_code = "12345" + contract_sale_form.recurring_interval = 1 + line_form = contract_sale_form.contract_line_ids.new() + line_form.product_id = self.product_1 + line_form.name = "Services from #START# to #END#" + line_form.quantity = 1 + line_form.price_unit = 100 + line_form.discount = 50 + line_form.recurring_rule_type = "monthly" + line_form.recurring_interval = 1 + line_form.date_start = "2018-02-15" + line_form.recurring_next_date = "2018-02-22" + line_form.save() + self.contract_sale_ssi = contract_sale_form.save() + self.contract_sale_ssi.recurring_create_invoice() + invoices = self.aml_model.search( + [ + ( + "contract_line_id", + "in", + self.contract_sale_ssi.contract_line_ids.ids, + ) + ] + ).mapped("move_id") + self.assertEqual( + invoices.mapped("sii_registration_key").ids, + self.contract_sale_ssi.sii_registration_key.ids, + ) + self.assertEqual( + invoices.mapped("sii_registration_key_additional1").ids, + self.contract_sale_ssi.sii_registration_key_additional1.ids, + ) + self.assertEqual( + invoices.mapped("sii_registration_key_additional2").ids, + self.contract_sale_ssi.sii_registration_key_additional2.ids, + ) + self.assertEqual( + invoices.mapped("sii_property_location")[0], + self.contract_sale_ssi.sii_property_location, + ) + self.assertEqual( + invoices.mapped("sii_property_cadastrial_code")[0], + self.contract_sale_ssi.sii_property_cadastrial_code, + ) + + def test_contract_purchase_sii(self): + contract_purchase_form = Form( + self.contract_model.with_context( + is_contract=True, default_contract_type="purchase" + ) + ) + contract_purchase_form.name = "Test Contract" + contract_purchase_form.partner_id = self.partner + contract_purchase_form.pricelist_id = self.partner.property_product_pricelist + sale_keys = self.registration_keys_model.search([("type", "=", "purchase")]) + contract_purchase_form.sii_registration_key = sale_keys[0] + contract_purchase_form.sii_registration_key_additional1 = sale_keys[0] + contract_purchase_form.sii_registration_key_additional2 = sale_keys[0] + contract_purchase_form.sii_property_location = "1" + contract_purchase_form.recurring_rule_type = "monthly" + line_form = contract_purchase_form.contract_line_ids.new() + line_form.product_id = self.product_1 + line_form.name = "Services from #START# to #END#" + line_form.quantity = 1 + line_form.price_unit = 100 + line_form.discount = 50 + line_form.recurring_rule_type = "monthly" + line_form.recurring_interval = 1 + line_form.date_start = "2018-02-15" + line_form.recurring_next_date = "2018-02-22" + line_form.save() + self.contract_purchase_ssi = contract_purchase_form.save() + self.contract_purchase_ssi.recurring_create_invoice() + invoices = self.aml_model.search( + [ + ( + "contract_line_id", + "in", + self.contract_purchase_ssi.contract_line_ids.ids, + ) + ] + ).mapped("move_id") + self.assertEqual( + invoices.mapped("sii_registration_key").ids, + self.contract_purchase_ssi.sii_registration_key.ids, + ) + self.assertEqual( + invoices.mapped("sii_registration_key_additional1").ids, + self.contract_purchase_ssi.sii_registration_key_additional1.ids, + ) + self.assertEqual( + invoices.mapped("sii_registration_key_additional2").ids, + self.contract_purchase_ssi.sii_registration_key_additional2.ids, + ) diff --git a/contract_sii/views/account_analytic_contract_view.xml b/contract_sii/views/account_analytic_contract_view.xml deleted file mode 100644 index a525a3f5b..000000000 --- a/contract_sii/views/account_analytic_contract_view.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - account.analytic.account - - - - - - - - - - - - - - - - - - - - - - account.analytic.account - - - - - - - - - - - - - - - - - diff --git a/contract_sii/views/contract_view.xml b/contract_sii/views/contract_view.xml new file mode 100644 index 000000000..3c804ca6d --- /dev/null +++ b/contract_sii/views/contract_view.xml @@ -0,0 +1,54 @@ + + + + + contract.contract + + + + + + + + + + + + + + + + + + + + + From 956a70a282ec19d8e827dc8936751da5f42f4971 Mon Sep 17 00:00:00 2001 From: Eric Antones Date: Tue, 7 Feb 2023 11:16:31 +0100 Subject: [PATCH 4/6] [FIX] contract_sii: fix failing tests --- contract_sii/__manifest__.py | 2 +- contract_sii/tests/test_contract_sii.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/contract_sii/__manifest__.py b/contract_sii/__manifest__.py index 235b4994d..0186e24fb 100644 --- a/contract_sii/__manifest__.py +++ b/contract_sii/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Contract SII", "summary": "This module adds SII data to contracts and propagate them to invoice", - "version": "14.0.1.0.0", + "version": "14.0.1.0.1", "category": "Contract Management", "author": "NuoBiT Solutions, S.L., Eric Antones", "website": "https://github.com/nuobit/odoo-addons", diff --git a/contract_sii/tests/test_contract_sii.py b/contract_sii/tests/test_contract_sii.py index 0d027ee90..742c25861 100644 --- a/contract_sii/tests/test_contract_sii.py +++ b/contract_sii/tests/test_contract_sii.py @@ -47,6 +47,7 @@ def test_contract_sale_sii(self): line_form.recurring_next_date = "2018-02-22" line_form.save() self.contract_sale_ssi = contract_sale_form.save() + self.contract_sale_ssi._compute_recurring_next_date() self.contract_sale_ssi.recurring_create_invoice() invoices = self.aml_model.search( [ @@ -105,6 +106,7 @@ def test_contract_purchase_sii(self): line_form.recurring_next_date = "2018-02-22" line_form.save() self.contract_purchase_ssi = contract_purchase_form.save() + self.contract_purchase_ssi._compute_recurring_next_date() self.contract_purchase_ssi.recurring_create_invoice() invoices = self.aml_model.search( [ From e970ecb4d06c73ca34671463ff98291803498c14 Mon Sep 17 00:00:00 2001 From: ??? Date: Thu, 25 Sep 2025 15:27:56 +0200 Subject: [PATCH 5/6] [IMP] contract_sii: pre-commit auto fixes --- contract_sii/__manifest__.py | 2 +- contract_sii/models/contract.py | 18 +++++++++--------- contract_sii/pyproject.toml | 3 +++ contract_sii/views/contract_view.xml | 1 - 4 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 contract_sii/pyproject.toml diff --git a/contract_sii/__manifest__.py b/contract_sii/__manifest__.py index 0186e24fb..83baf8170 100644 --- a/contract_sii/__manifest__.py +++ b/contract_sii/__manifest__.py @@ -8,7 +8,7 @@ "version": "14.0.1.0.1", "category": "Contract Management", "author": "NuoBiT Solutions, S.L., Eric Antones", - "website": "https://github.com/nuobit/odoo-addons", + "website": "https://github.com/NuoBiT/odoo-addons", "license": "AGPL-3", "depends": [ "contract", diff --git a/contract_sii/models/contract.py b/contract_sii/models/contract.py index ee9847869..29a054c2c 100644 --- a/contract_sii/models/contract.py +++ b/contract_sii/models/contract.py @@ -75,21 +75,21 @@ def _prepare_invoice(self, date_invoice, journal=None): if self.sii_registration_key: values["sii_registration_key"] = self.sii_registration_key.id if self.sii_registration_key_additional1: - values[ - "sii_registration_key_additional1" - ] = self.sii_registration_key_additional1.id + values["sii_registration_key_additional1"] = ( + self.sii_registration_key_additional1.id + ) if self.sii_registration_key_additional2: - values[ - "sii_registration_key_additional2" - ] = self.sii_registration_key_additional2.id + values["sii_registration_key_additional2"] = ( + self.sii_registration_key_additional2.id + ) if self.contract_type == "sale": if self.sii_property_location: values["sii_property_location"] = self.sii_property_location if self.sii_property_cadastrial_code: - values[ - "sii_property_cadastrial_code" - ] = self.sii_property_cadastrial_code + values["sii_property_cadastrial_code"] = ( + self.sii_property_cadastrial_code + ) if values: invoice_vals.update(values) diff --git a/contract_sii/pyproject.toml b/contract_sii/pyproject.toml new file mode 100644 index 000000000..4231d0ccc --- /dev/null +++ b/contract_sii/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/contract_sii/views/contract_view.xml b/contract_sii/views/contract_view.xml index 3c804ca6d..5031a6814 100644 --- a/contract_sii/views/contract_view.xml +++ b/contract_sii/views/contract_view.xml @@ -50,5 +50,4 @@ - From 870d042942b76552f12e5cdd21b1f136cced5251 Mon Sep 17 00:00:00 2001 From: ??? Date: Thu, 25 Sep 2025 15:36:22 +0200 Subject: [PATCH 6/6] [MIG] contract_sii: Migration to 18.0 --- contract_sii/README.rst | 59 ++- contract_sii/__init__.py | 4 - contract_sii/__manifest__.py | 10 +- contract_sii/i18n/es.po | 2 +- contract_sii/models/__init__.py | 4 - contract_sii/models/contract.py | 7 +- contract_sii/readme/CONTRIBUTORS.md | 3 + contract_sii/readme/DESCRIPTION.md | 1 + contract_sii/static/description/index.html | 420 +++++++++++++++++++++ contract_sii/tests/test_contract_sii.py | 38 +- contract_sii/views/contract_view.xml | 16 +- 11 files changed, 514 insertions(+), 50 deletions(-) create mode 100644 contract_sii/readme/CONTRIBUTORS.md create mode 100644 contract_sii/readme/DESCRIPTION.md create mode 100644 contract_sii/static/description/index.html diff --git a/contract_sii/README.rst b/contract_sii/README.rst index 0c35997a6..234bd9b27 100644 --- a/contract_sii/README.rst +++ b/contract_sii/README.rst @@ -1,26 +1,63 @@ -.. image:: https://img.shields.io/badge/license-AGPL--3-blue.png - :target: https://www.gnu.org/licenses/agpl - :alt: License: AGPL-3 - ============ Contract SII ============ -* This module adds SII data to contracts and propagate them to invoice +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:929437dbe6ec8ac86dd85522942ceaf5f646cc1e64ed2d17a910fa300548f822 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-NuoBiT%2Fodoo--addons-lightgray.png?logo=github + :target: https://github.com/NuoBiT/odoo-addons/tree/18.0/contract_sii + :alt: NuoBiT/odoo-addons + +|badge1| |badge2| |badge3| + +This module adds SII data to contracts and propagate them to invoice + +**Table of contents** + +.. contents:: + :local: Bug Tracker =========== -Bugs are tracked on `GitHub Issues -`_. In case of trouble, please -check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed feedback. +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. Credits ======= +Authors +------- + +* NuoBiT Solutions SL + Contributors ------------ -* Eric Antones -* Christopher Ormaza +- `NuoBiT `__: + + - Eric Antones eantones@nuobit.com + - Deniz Gallo dgallo@nuobit.com + +Maintainers +----------- + +This module is part of the `NuoBiT/odoo-addons `_ project on GitHub. + +You are welcome to contribute. diff --git a/contract_sii/__init__.py b/contract_sii/__init__.py index 38b2ba65b..0650744f6 100644 --- a/contract_sii/__init__.py +++ b/contract_sii/__init__.py @@ -1,5 +1 @@ -# Copyright NuoBiT Solutions, S.L. () -# Eric Antones -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) - from . import models diff --git a/contract_sii/__manifest__.py b/contract_sii/__manifest__.py index 83baf8170..a287cd53e 100644 --- a/contract_sii/__manifest__.py +++ b/contract_sii/__manifest__.py @@ -1,13 +1,13 @@ -# Copyright NuoBiT Solutions, S.L. () -# Eric Antones +# Copyright NuoBiT Solutions SL - Eric Antones +# Copyright 2025 NuoBiT Solutions SL - Deniz Gallo # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) { "name": "Contract SII", "summary": "This module adds SII data to contracts and propagate them to invoice", - "version": "14.0.1.0.1", + "version": "18.0.1.0.0", "category": "Contract Management", - "author": "NuoBiT Solutions, S.L., Eric Antones", + "author": "NuoBiT Solutions SL", "website": "https://github.com/NuoBiT/odoo-addons", "license": "AGPL-3", "depends": [ @@ -17,6 +17,4 @@ "data": [ "views/contract_view.xml", ], - "installable": True, - "auto_install": False, } diff --git a/contract_sii/i18n/es.po b/contract_sii/i18n/es.po index 7002202fe..6296c9b42 100644 --- a/contract_sii/i18n/es.po +++ b/contract_sii/i18n/es.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 18.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-01-21 13:58+0000\n" "PO-Revision-Date: 2022-01-21 13:58+0000\n" diff --git a/contract_sii/models/__init__.py b/contract_sii/models/__init__.py index 86aa00632..99a5468ac 100644 --- a/contract_sii/models/__init__.py +++ b/contract_sii/models/__init__.py @@ -1,5 +1 @@ -# Copyright NuoBiT Solutions, S.L. () -# Eric Antones -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) - from . import contract diff --git a/contract_sii/models/contract.py b/contract_sii/models/contract.py index 29a054c2c..80edaf644 100644 --- a/contract_sii/models/contract.py +++ b/contract_sii/models/contract.py @@ -1,5 +1,4 @@ -# Copyright NuoBiT Solutions, S.L. () -# Eric Antones +# Copyright NuoBiT Solutions SL - Eric Antones # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) from odoo import api, fields, models @@ -69,7 +68,7 @@ def _compute_sii_enabled(self): def _prepare_invoice(self, date_invoice, journal=None): self.ensure_one() - invoice_vals, move_form = super()._prepare_invoice(date_invoice, journal) + invoice_vals = super()._prepare_invoice(date_invoice, journal) values = {} if self.sii_registration_key: @@ -94,4 +93,4 @@ def _prepare_invoice(self, date_invoice, journal=None): if values: invoice_vals.update(values) - return invoice_vals, move_form + return invoice_vals diff --git a/contract_sii/readme/CONTRIBUTORS.md b/contract_sii/readme/CONTRIBUTORS.md new file mode 100644 index 000000000..909507cba --- /dev/null +++ b/contract_sii/readme/CONTRIBUTORS.md @@ -0,0 +1,3 @@ +- [NuoBiT](https://www.nuobit.com): + - Eric Antones + - Deniz Gallo diff --git a/contract_sii/readme/DESCRIPTION.md b/contract_sii/readme/DESCRIPTION.md new file mode 100644 index 000000000..94765dcf6 --- /dev/null +++ b/contract_sii/readme/DESCRIPTION.md @@ -0,0 +1 @@ +This module adds SII data to contracts and propagate them to invoice diff --git a/contract_sii/static/description/index.html b/contract_sii/static/description/index.html new file mode 100644 index 000000000..ec5e85660 --- /dev/null +++ b/contract_sii/static/description/index.html @@ -0,0 +1,420 @@ + + + + + +Contract SII + + + +
+

Contract SII

+ + +

Beta License: AGPL-3 NuoBiT/odoo-addons

+

This module adds SII data to contracts and propagate them to invoice

+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • NuoBiT Solutions SL
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is part of the NuoBiT/odoo-addons project on GitHub.

+

You are welcome to contribute.

+
+
+
+ + diff --git a/contract_sii/tests/test_contract_sii.py b/contract_sii/tests/test_contract_sii.py index 742c25861..d06458e37 100644 --- a/contract_sii/tests/test_contract_sii.py +++ b/contract_sii/tests/test_contract_sii.py @@ -10,7 +10,7 @@ def setUpClass(cls): cls.company_model = cls.env["res.company"] cls.contract_model = cls.env["contract.contract"] cls.aml_model = cls.env["account.move.line"] - cls.registration_keys_model = cls.env["aeat.sii.mapping.registration.keys"] + # cls.registration_keys_model = cls.env.["aeat.sii.mapping.registration.keys"] cls.env.company.write( { "sii_enabled": True, @@ -29,12 +29,15 @@ def test_contract_sale_sii(self): contract_sale_form.pricelist_id = self.partner.property_product_pricelist contract_sale_form.recurring_interval = 1 contract_sale_form.recurring_rule_type = "monthly" - sale_keys = self.registration_keys_model.search([("type", "=", "sale")]) - contract_sale_form.sii_registration_key = sale_keys[0] - contract_sale_form.sii_registration_key_additional1 = sale_keys[0] - contract_sale_form.sii_registration_key_additional2 = sale_keys[0] + sale12_key = self.env.ref( + "l10n_es_aeat_sii_oca.aeat_sii_mapping_registration_keys_12" + ) + contract_sale_form.sii_registration_key = sale12_key + contract_sale_form.sii_registration_key_additional1 = sale12_key + contract_sale_form.sii_registration_key_additional2 = sale12_key contract_sale_form.sii_property_cadastrial_code = "12345" - contract_sale_form.recurring_interval = 1 + contract_sale_form.sii_property_location = "1" + contract_sale_form.line_recurrence = True line_form = contract_sale_form.contract_line_ids.new() line_form.product_id = self.product_1 line_form.name = "Services from #START# to #END#" @@ -85,15 +88,28 @@ def test_contract_purchase_sii(self): is_contract=True, default_contract_type="purchase" ) ) + + journal = self.env["account.journal"].create( + { + "name": "Test Purchase Journal", + "code": "TPJ", + "type": "purchase", + "company_id": self.env.company.id, + } + ) + contract_purchase_form.name = "Test Contract" contract_purchase_form.partner_id = self.partner contract_purchase_form.pricelist_id = self.partner.property_product_pricelist - sale_keys = self.registration_keys_model.search([("type", "=", "purchase")]) - contract_purchase_form.sii_registration_key = sale_keys[0] - contract_purchase_form.sii_registration_key_additional1 = sale_keys[0] - contract_purchase_form.sii_registration_key_additional2 = sale_keys[0] - contract_purchase_form.sii_property_location = "1" + sale01_key = self.env.ref( + "l10n_es_aeat_sii_oca.aeat_sii_mapping_registration_keys_01" + ) + contract_purchase_form.sii_registration_key = sale01_key + contract_purchase_form.sii_registration_key_additional1 = sale01_key + contract_purchase_form.sii_registration_key_additional2 = sale01_key contract_purchase_form.recurring_rule_type = "monthly" + contract_purchase_form.journal_id = journal + contract_purchase_form.line_recurrence = True line_form = contract_purchase_form.contract_line_ids.new() line_form.product_id = self.product_1 line_form.name = "Services from #START# to #END#" diff --git a/contract_sii/views/contract_view.xml b/contract_sii/views/contract_view.xml index 5031a6814..bc2a99895 100644 --- a/contract_sii/views/contract_view.xml +++ b/contract_sii/views/contract_view.xml @@ -1,6 +1,6 @@ - @@ -11,7 +11,7 @@ @@ -23,15 +23,13 @@ />