From d6933eddce25156feb5771273b4f612e2e981688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Garc=C3=ADa?= <alvarogruiz8@gmail.com>
Date: Mon, 20 Jan 2025 13:55:46 +0100
Subject: [PATCH 01/12] [IMP] Changes of translations and user usability in the
selfconsumption module
---
energy_selfconsumption/i18n/ca_ES.po | 56 +++++++++++++-----
.../i18n/energy_selfconsumption.pot | 22 +++++--
energy_selfconsumption/i18n/es.po | 58 +++++++++++++------
energy_selfconsumption/i18n/eu_ES.po | 52 ++++++++++++-----
.../models/selfconsumption.py | 29 ++++++----
.../views/selfconsumption_views.xml | 19 ++++--
.../website_inscription_data_template.xml | 10 +++-
7 files changed, 175 insertions(+), 71 deletions(-)
diff --git a/energy_selfconsumption/i18n/ca_ES.po b/energy_selfconsumption/i18n/ca_ES.po
index 04f435d4d..c032f8d29 100644
--- a/energy_selfconsumption/i18n/ca_ES.po
+++ b/energy_selfconsumption/i18n/ca_ES.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-03 09:34+0000\n"
-"PO-Revision-Date: 2024-12-03 09:34+0000\n"
+"POT-Creation-Date: 2025-01-20 11:03+0000\n"
+"PO-Revision-Date: 2025-01-20 11:03+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -727,6 +727,11 @@ msgstr "Acció necessària"
msgid "Activate Registration Form"
msgstr ""
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_form_view
+msgid "Activate form"
+msgstr "Activa el formulari"
+
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/models/distribution_table.py:0
@@ -869,6 +874,11 @@ msgstr "Autogenerar dades (Noves dades)"
msgid "BANK DETAILS"
msgstr "DADES BANCÀRIES"
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.inscription_data_error_message_template
+msgid "Back to form"
+msgstr "Tornar a la forma"
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__mandate_id
msgid "Bank Mandate"
@@ -1412,7 +1422,7 @@ msgstr "Coeficient de distribució"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__energy_shares
msgid "Distribution coefficient in kWh"
-msgstr ""
+msgstr "Coeficient de distribució en kWh"
#. module: energy_selfconsumption
#: model:ir.model.fields,help:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__energy_shares
@@ -1420,6 +1430,8 @@ msgid ""
"Distribution coneffcient in kWh. The sum of all have to result in total "
"project power"
msgstr ""
+"Coneficient de distribució en kWh. La suma de tots ha de resultar en total "
+"poder del projecte"
#. module: energy_selfconsumption
#. odoo-python
@@ -1484,21 +1496,27 @@ msgstr "Correu electrònic"
#. module: energy_selfconsumption
#: model:mail.template,description:energy_selfconsumption.selfconsumption_power_acquired_invoicing_reminder
msgid "E-mail billing reminder of self-consumption of energy purchased"
-msgstr "Recordatori de facturació per correu electrònic de l'autoconsum d'energia comprada"
+msgstr ""
+"Recordatori de facturació per correu electrònic de l'autoconsum d'energia "
+"comprada"
#. module: energy_selfconsumption
#: model:mail.template,description:energy_selfconsumption.selfconsumption_insciption_form
msgid ""
"E-mail of inscription in the self-consumption project of the Energy "
"Community"
-msgstr "Correu electrònic d'inscripció al projecte d'autoconsum de la Comunitat de l'Energia"
+msgstr ""
+"Correu electrònic d'inscripció al projecte d'autoconsum de la Comunitat de "
+"l'Energia"
#. module: energy_selfconsumption
#: model:mail.template,description:energy_selfconsumption.selfconsumption_energy_delivered_custom_invoicing_reminder
msgid ""
"E-mail reminder of personalized billing of self-consumption of energy "
"supplied"
-msgstr "Recordatori per correu electrònic de facturació personalitzada de l'autoconsum de l'energia subministrada"
+msgstr ""
+"Recordatori per correu electrònic de facturació personalitzada de "
+"l'autoconsum de l'energia subministrada"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__effective_date
@@ -1545,7 +1563,9 @@ msgstr ""
#. module: energy_selfconsumption
#: model:mail.template,description:energy_selfconsumption.selfconsumption_energy_delivered_invoicing_reminder
msgid "Email reminder for self-consumption billing of supplied energy"
-msgstr "Recordatori per correu electrònic per a la facturació d'autoconsum de l'energia subministrada"
+msgstr ""
+"Recordatori per correu electrònic per a la facturació d'autoconsum de "
+"l'energia subministrada"
#. module: energy_selfconsumption
#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__account_move__selfconsumption_invoicing_mode__none
@@ -1666,10 +1686,8 @@ msgstr "Projecte energètic"
#. module: energy_selfconsumption
#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.inscription_data_form_fields_template
-msgid ""
-"Enrollment in the shared self-consumption project of the Energy Community:"
-msgstr ""
-"Inscripció al projecte d'autoconsum compartit de la Comunitat de l'Energia:"
+msgid "Enrollment in the shared self-consumption project of the"
+msgstr "Inscripció al projecte d'autoconsum compartit de la"
#. module: energy_selfconsumption
#. odoo-python
@@ -1938,9 +1956,9 @@ msgid ""
"part of participation in this shared self-consumption project of my energy "
"community"
msgstr ""
-"Accepto i autorizo poder emetre pagaments a aquest compte bancari "
-"com a part de la participació en aquest projecte d'autoconsum "
-"compartit de la meva comunitat energètica"
+"Accepto i autorizo poder emetre pagaments a aquest compte bancari com a "
+"part de la participació en aquest projecte d'autoconsum compartit de la meva"
+" comunitat energètica"
#. module: energy_selfconsumption
#. odoo-python
@@ -2298,7 +2316,7 @@ msgstr "NIF/CIF no vàlid: {error}"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_define_invoicing_mode_wizard__recurring_interval
msgid "Invoice Every"
-msgstr "Factura tots"
+msgstr "Factura cada"
#. module: energy_selfconsumption
#: model:ir.model.fields,help:energy_selfconsumption.field_energy_selfconsumption_define_invoicing_mode_wizard__recurring_interval
@@ -3178,7 +3196,8 @@ msgstr "Autoconsum - Recordatori de facturació d'energia adquirida"
#. module: energy_selfconsumption
#: model:mail.template,name:energy_selfconsumption.selfconsumption_energy_delivered_custom_invoicing_reminder
msgid "Selfconsumption Energy Delivered Custom Invoicing Reminder"
-msgstr "Recordatori de facturació personalitzada lliurada d'energia d'autoconsum"
+msgstr ""
+"Recordatori de facturació personalitzada lliurada d'energia d'autoconsum"
#. module: energy_selfconsumption
#: model:mail.template,name:energy_selfconsumption.selfconsumption_energy_delivered_invoicing_reminder
@@ -3701,6 +3720,11 @@ msgstr "Tipologia"
msgid "URL"
msgstr ""
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_form_view
+msgid "Unactivate form"
+msgstr "Desactiva el formulari"
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__used_in_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__used_in_selfconsumption
diff --git a/energy_selfconsumption/i18n/energy_selfconsumption.pot b/energy_selfconsumption/i18n/energy_selfconsumption.pot
index 301a2e436..dcc7d6f49 100644
--- a/energy_selfconsumption/i18n/energy_selfconsumption.pot
+++ b/energy_selfconsumption/i18n/energy_selfconsumption.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-03 09:33+0000\n"
-"PO-Revision-Date: 2024-12-03 09:33+0000\n"
+"POT-Creation-Date: 2025-01-20 11:03+0000\n"
+"PO-Revision-Date: 2025-01-20 11:03+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -578,6 +578,11 @@ msgstr ""
msgid "Activate Registration Form"
msgstr ""
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_form_view
+msgid "Activate form"
+msgstr ""
+
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/models/distribution_table.py:0
@@ -715,6 +720,11 @@ msgstr ""
msgid "BANK DETAILS"
msgstr ""
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.inscription_data_error_message_template
+msgid "Back to form"
+msgstr ""
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__mandate_id
msgid "Bank Mandate"
@@ -1463,8 +1473,7 @@ msgstr ""
#. module: energy_selfconsumption
#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.inscription_data_form_fields_template
-msgid ""
-"Enrollment in the shared self-consumption project of the Energy Community:"
+msgid "Enrollment in the shared self-consumption project of the"
msgstr ""
#. module: energy_selfconsumption
@@ -3426,6 +3435,11 @@ msgstr ""
msgid "URL"
msgstr ""
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_form_view
+msgid "Unactivate form"
+msgstr ""
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__used_in_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__used_in_selfconsumption
diff --git a/energy_selfconsumption/i18n/es.po b/energy_selfconsumption/i18n/es.po
index 6d4a48210..7e169f519 100644
--- a/energy_selfconsumption/i18n/es.po
+++ b/energy_selfconsumption/i18n/es.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-03 09:33+0000\n"
-"PO-Revision-Date: 2024-12-03 09:33+0000\n"
+"POT-Creation-Date: 2025-01-20 11:03+0000\n"
+"PO-Revision-Date: 2025-01-20 11:03+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -694,6 +694,11 @@ msgstr "Accion necesaria"
msgid "Activate Registration Form"
msgstr "Activar formulario de inscripción"
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_form_view
+msgid "Activate form"
+msgstr "Activar formulario"
+
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/models/distribution_table.py:0
@@ -838,6 +843,11 @@ msgstr "Autogenerar datos (Datos nuevos)"
msgid "BANK DETAILS"
msgstr "DATOS BANCARIOS"
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.inscription_data_error_message_template
+msgid "Back to form"
+msgstr "Volver al formulario"
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__mandate_id
msgid "Bank Mandate"
@@ -1363,7 +1373,7 @@ msgstr "Coeficiente de distribución"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__energy_shares
msgid "Distribution coefficient in kWh"
-msgstr ""
+msgstr "Coeficiente de distribución en kWh"
#. module: energy_selfconsumption
#: model:ir.model.fields,help:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__energy_shares
@@ -1371,6 +1381,8 @@ msgid ""
"Distribution coneffcient in kWh. The sum of all have to result in total "
"project power"
msgstr ""
+"Coneficiente de distribución en kWh. La suma de todos tiene que dar como resultado total "
+"potencia del proyecto"
#. module: energy_selfconsumption
#. odoo-python
@@ -1435,21 +1447,27 @@ msgstr ""
#. module: energy_selfconsumption
#: model:mail.template,description:energy_selfconsumption.selfconsumption_power_acquired_invoicing_reminder
msgid "E-mail billing reminder of self-consumption of energy purchased"
-msgstr "Facturación por correo electrónico para recordar el autoconsumo de la energía adquirida"
+msgstr ""
+"Facturación por correo electrónico para recordar el autoconsumo de la "
+"energía adquirida"
#. module: energy_selfconsumption
#: model:mail.template,description:energy_selfconsumption.selfconsumption_insciption_form
msgid ""
"E-mail of inscription in the self-consumption project of the Energy "
"Community"
-msgstr "Correo electrónico de inscripción en el proyecto de autoconsumo de la Comunidad de la Energía"
+msgstr ""
+"Correo electrónico de inscripción en el proyecto de autoconsumo de la "
+"Comunidad de la Energía"
#. module: energy_selfconsumption
#: model:mail.template,description:energy_selfconsumption.selfconsumption_energy_delivered_custom_invoicing_reminder
msgid ""
"E-mail reminder of personalized billing of self-consumption of energy "
"supplied"
-msgstr "Recordatorio por correo electrónico de la facturación personalizada del autoconsumo de energía suministrada"
+msgstr ""
+"Recordatorio por correo electrónico de la facturación personalizada del "
+"autoconsumo de energía suministrada"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__effective_date
@@ -1480,7 +1498,9 @@ msgstr ""
#. module: energy_selfconsumption
#: model:mail.template,description:energy_selfconsumption.selfconsumption_energy_delivered_invoicing_reminder
msgid "Email reminder for self-consumption billing of supplied energy"
-msgstr "Recordatorio por correo electrónico para la facturación del autoconsumo de la energía suministrada"
+msgstr ""
+"Recordatorio por correo electrónico para la facturación del autoconsumo de "
+"la energía suministrada"
#. module: energy_selfconsumption
#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__account_move__selfconsumption_invoicing_mode__none
@@ -1597,11 +1617,8 @@ msgstr "Proyecto energético"
#. module: energy_selfconsumption
#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.inscription_data_form_fields_template
-msgid ""
-"Enrollment in the shared self-consumption project of the Energy Community:"
-msgstr ""
-"Inscripción en el proyecto de autoconsumo compartido de la Comunidad de la "
-"Energía:"
+msgid "Enrollment in the shared self-consumption project of the"
+msgstr "Inscripción en el proyecto de autoconsumo compartido del"
#. module: energy_selfconsumption
#. odoo-python
@@ -1863,9 +1880,9 @@ msgid ""
"part of participation in this shared self-consumption project of my energy "
"community"
msgstr ""
-"Acepto y autorizo poder emitir pagos a esta cuenta bancaria "
-"como parte de la participación en este proyecto de autoconsumo "
-"compartido de mi comunidad energética"
+"Acepto y autorizo poder emitir pagos a esta cuenta bancaria como parte de la"
+" participación en este proyecto de autoconsumo compartido de mi comunidad "
+"energética"
#. module: energy_selfconsumption
#. odoo-python
@@ -2950,7 +2967,8 @@ msgstr "Referencia"
#. module: energy_selfconsumption
#: model:mail.template,name:energy_selfconsumption.selfconsumption_insciption_form
msgid "Registration in self-consumption project of the Energy Community"
-msgstr "Inscripción en el proyecto de autoconsumo de la Comunidad de la Energía"
+msgstr ""
+"Inscripción en el proyecto de autoconsumo de la Comunidad de la Energía"
#. module: energy_selfconsumption
#: model:mail.template,subject:energy_selfconsumption.selfconsumption_insciption_form
@@ -3098,7 +3116,8 @@ msgstr "Autoconsumo - Recordatorio Facturación Energía Adquirida"
#. module: energy_selfconsumption
#: model:mail.template,name:energy_selfconsumption.selfconsumption_energy_delivered_custom_invoicing_reminder
msgid "Selfconsumption Energy Delivered Custom Invoicing Reminder"
-msgstr "Autoconsumo Energía suministrada Facturación personalizada Recordatorio"
+msgstr ""
+"Autoconsumo Energía suministrada Facturación personalizada Recordatorio"
#. module: energy_selfconsumption
#: model:mail.template,name:energy_selfconsumption.selfconsumption_energy_delivered_invoicing_reminder
@@ -3623,6 +3642,11 @@ msgstr "Tipología"
msgid "URL"
msgstr ""
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_form_view
+msgid "Unactivate form"
+msgstr "Desactivar formulario"
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__used_in_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__used_in_selfconsumption
diff --git a/energy_selfconsumption/i18n/eu_ES.po b/energy_selfconsumption/i18n/eu_ES.po
index f1a988aba..68194f055 100644
--- a/energy_selfconsumption/i18n/eu_ES.po
+++ b/energy_selfconsumption/i18n/eu_ES.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-03 09:34+0000\n"
-"PO-Revision-Date: 2024-12-03 09:34+0000\n"
+"POT-Creation-Date: 2025-01-20 11:04+0000\n"
+"PO-Revision-Date: 2025-01-20 11:04+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -715,6 +715,11 @@ msgstr "Ekintza Beharrezkoa"
msgid "Activate Registration Form"
msgstr "Aktibatu Erregistro Inprimakia"
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_form_view
+msgid "Activate form"
+msgstr "Aktibatu formularioa"
+
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/models/distribution_table.py:0
@@ -858,6 +863,11 @@ msgstr "Sortu automatikoki datuak (datu berriak)"
msgid "BANK DETAILS"
msgstr "BANKUKO DATUAK"
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.inscription_data_error_message_template
+msgid "Back to form"
+msgstr "Itzuli formara"
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__mandate_id
msgid "Bank Mandate"
@@ -1399,7 +1409,7 @@ msgstr "Banaketa-koefizientea"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__energy_shares
msgid "Distribution coefficient in kWh"
-msgstr ""
+msgstr "Banaketa koefizientea kWh-tan"
#. module: energy_selfconsumption
#: model:ir.model.fields,help:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__energy_shares
@@ -1407,6 +1417,8 @@ msgid ""
"Distribution coneffcient in kWh. The sum of all have to result in total "
"project power"
msgstr ""
+"Banaketa efizientea kWh-tan. Guztien baturak guztizkoa izan behar du "
+"proiektuaren boterea"
#. module: energy_selfconsumption
#. odoo-python
@@ -1471,7 +1483,9 @@ msgstr "Posta elektronikoa"
#. module: energy_selfconsumption
#: model:mail.template,description:energy_selfconsumption.selfconsumption_power_acquired_invoicing_reminder
msgid "E-mail billing reminder of self-consumption of energy purchased"
-msgstr "Erositako energiaren autokontsumoaren abisua posta elektroniko bidezko fakturazioa"
+msgstr ""
+"Erositako energiaren autokontsumoaren abisua posta elektroniko bidezko "
+"fakturazioa"
#. module: energy_selfconsumption
#: model:mail.template,description:energy_selfconsumption.selfconsumption_insciption_form
@@ -1485,7 +1499,9 @@ msgstr "Energia Erkidegoaren autokontsumo proiektuan izena emateko e-maila"
msgid ""
"E-mail reminder of personalized billing of self-consumption of energy "
"supplied"
-msgstr "Hornitutako energiaren autokontsumoaren fakturazio pertsonalizatuaren abisua posta elektronikoz"
+msgstr ""
+"Hornitutako energiaren autokontsumoaren fakturazio pertsonalizatuaren abisua"
+" posta elektronikoz"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__effective_date
@@ -1531,7 +1547,9 @@ msgstr ""
#. module: energy_selfconsumption
#: model:mail.template,description:energy_selfconsumption.selfconsumption_energy_delivered_invoicing_reminder
msgid "Email reminder for self-consumption billing of supplied energy"
-msgstr "Hornitutako energiaren autokontsumoaren fakturazio posta elektronikoaren abisua"
+msgstr ""
+"Hornitutako energiaren autokontsumoaren fakturazio posta elektronikoaren "
+"abisua"
#. module: energy_selfconsumption
#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__account_move__selfconsumption_invoicing_mode__none
@@ -1652,10 +1670,8 @@ msgstr "Energia Proiektua"
#. module: energy_selfconsumption
#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.inscription_data_form_fields_template
-msgid ""
-"Enrollment in the shared self-consumption project of the Energy Community:"
-msgstr ""
-"Energia Erkidegoaren partekatutako autokontsumo proiektuan izena ematea:"
+msgid "Enrollment in the shared self-consumption project of the"
+msgstr "Partekatutako autokontsumo proiektuan izena ematea"
#. module: energy_selfconsumption
#. odoo-python
@@ -1922,10 +1938,10 @@ msgid ""
"I accept and authorize being able to issue payments to this bank account as "
"part of participation in this shared self-consumption project of my energy "
"community"
-msgstr "Onetsi"
-"Onartu eta baimentzen dut banku-kontu honetara ordainketak "
-"egin ahal izatea nire energia-komunitatearen autokontsumo "
-"proiektu partekatu honetan parte hartzeko"
+msgstr ""
+"OnetsiOnartu eta baimentzen dut banku-kontu honetara ordainketak egin ahal "
+"izatea nire energia-komunitatearen autokontsumo proiektu partekatu honetan "
+"parte hartzeko"
#. module: energy_selfconsumption
#. odoo-python
@@ -3163,7 +3179,8 @@ msgstr "Autokontsumoa - Eskuratutako energia fakturatzeko abisua"
#. module: energy_selfconsumption
#: model:mail.template,name:energy_selfconsumption.selfconsumption_energy_delivered_custom_invoicing_reminder
msgid "Selfconsumption Energy Delivered Custom Invoicing Reminder"
-msgstr "Autokontsumoko energia entregatutako fakturazio pertsonalizatuaren abisua"
+msgstr ""
+"Autokontsumoko energia entregatutako fakturazio pertsonalizatuaren abisua"
#. module: energy_selfconsumption
#: model:mail.template,name:energy_selfconsumption.selfconsumption_energy_delivered_invoicing_reminder
@@ -3687,6 +3704,11 @@ msgstr "Tipologia"
msgid "URL"
msgstr ""
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_form_view
+msgid "Unactivate form"
+msgstr "Desaktibatu inprimakia"
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__used_in_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__used_in_selfconsumption
diff --git a/energy_selfconsumption/models/selfconsumption.py b/energy_selfconsumption/models/selfconsumption.py
index c486ffb48..94ab1573b 100644
--- a/energy_selfconsumption/models/selfconsumption.py
+++ b/energy_selfconsumption/models/selfconsumption.py
@@ -137,9 +137,17 @@ class Selfconsumption(models.Model):
conf_bank_details = fields.Boolean("Show bank details")
conf_url_form = fields.Char(string="URL")
- @api.onchange("conf_state")
- def _onchange_conf_state(self):
- if self.conf_state == "active":
+ def activate_form(self):
+ self.ensure_one() # Ensures only one record is selected
+ if self.conf_state != "active":
+ if not self.company_id.data_policy_approval_text:
+ raise ValidationError(
+ _(
+ "You need to add the privacy policy file to display the form."
+ "To modify the privacy policy go to company settings."
+ )
+ )
+ self.conf_state = "active"
self.conf_url_form = (
"{base_url}/inscription-data?model_id={model_id}".format(
base_url=self.env["ir.config_parameter"]
@@ -148,18 +156,15 @@ class Selfconsumption(models.Model):
model_id=self._origin.id,
)
)
- if not self.company_id.data_policy_approval_text:
- raise ValidationError(
- _(
- "You need to add the privacy policy file to display the form."
- "To modify the privacy policy go to company settings."
- )
- )
- else:
+
+ def unactivate_form(self):
+ self.ensure_one() # Ensures only one record is selected
+ if self.conf_state == "active":
self.conf_url_form = ""
+ self.conf_state = "inactive"
def action_redirect_to_page_form_inscription(self):
- self.ensure_one() # Asegura que solo haya un registro seleccionado
+ self.ensure_one() # Ensures only one record is selected
return {
"type": "ir.actions.act_url",
"url": self.conf_url_form,
diff --git a/energy_selfconsumption/views/selfconsumption_views.xml b/energy_selfconsumption/views/selfconsumption_views.xml
index b2a5ba1b3..22612d64a 100644
--- a/energy_selfconsumption/views/selfconsumption_views.xml
+++ b/energy_selfconsumption/views/selfconsumption_views.xml
@@ -211,11 +211,23 @@
<page
string="Inscription form configuration"
name="form_configuration"
+ autofocus="autofocus"
>
- <label for="conf_state" />
- <field name="conf_state" widget="radio" />
+ <field name="conf_state" widget="radio" invisible="1" />
+ <button
+ class="btn btn btn-primary"
+ type="object"
+ name="activate_form"
+ attrs="{'invisible': [('conf_state', '==', 'active')]}"
+ >Activate form</button>
+ <button
+ class="btn btn btn-primary"
+ type="object"
+ name="unactivate_form"
+ attrs="{'invisible': [('conf_state', '!=', 'active')]}"
+ >Unactivate form</button>
+ <span style="margin: 0px 10px;"></span>
<button
- style="margin-left: 145px;"
class="btn btn btn-primary"
type="object"
name="action_redirect_to_page_form_inscription"
@@ -275,7 +287,6 @@
<page
string="Invoicing Mode"
name="invoicing_mode"
- autofocus="autofocus"
attrs="{'invisible':[('invoicing_mode', '==', False)]}"
>
<group>
diff --git a/energy_selfconsumption/views/website_inscription_data_template.xml b/energy_selfconsumption/views/website_inscription_data_template.xml
index 2b0925561..014191c74 100644
--- a/energy_selfconsumption/views/website_inscription_data_template.xml
+++ b/energy_selfconsumption/views/website_inscription_data_template.xml
@@ -23,9 +23,7 @@
src="/energy_selfconsumption/static/src/js/inscription-data-website.js"
/>
<h1>
- Enrollment in the shared self-consumption project of the Energy Community: <t
- t-esc="company_name"
- /> of the EC
+ Enrollment in the shared self-consumption project of the <t t-esc="company_name"/> of the EC
</h1>
<h2>
Installation: <t t-esc="project_name" /> of the project
@@ -360,6 +358,12 @@
<t t-raw="error_msg" />
</div>
</t>
+ <br />
+ <div t-if="error_msgs" class="col-md-12" style="text-align: end;">
+ <a type="button" href="javascript: history.go(-1)" class="btn btn-primary">
+ Back to form
+ </a>
+ </div>
</template>
<template
--
GitLab
From 9e47b3524f05ddc8ab95384028f947b78fa84afc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Garc=C3=ADa?= <alvarogruiz8@gmail.com>
Date: Thu, 30 Jan 2025 13:28:31 +0100
Subject: [PATCH 02/12] [IMP] Task 703,504,524,556,606,705 Refactor
inscriptions selfconsumption
---
.../data/ir_attachment_data.xml | 14 +--
energy_selfconsumption/i18n/ca_ES.po | 48 +++++++--
.../i18n/energy_selfconsumption.pot | 43 ++++++--
energy_selfconsumption/i18n/es.po | 53 +++++++--
energy_selfconsumption/i18n/eu_ES.po | 48 +++++++--
.../models/create_inscription.py | 41 ++++++-
energy_selfconsumption/models/inscription.py | 6 +-
.../models/selfconsumption.py | 2 +-
.../views/distribution_table_views.xml | 2 +
.../views/inscription_views.xml | 30 ++++--
.../wizards/selfconsumption_import_wizard.py | 102 +++++++++++++-----
.../selfconsumption_import_wizard_views.xml | 3 +
12 files changed, 309 insertions(+), 83 deletions(-)
diff --git a/energy_selfconsumption/data/ir_attachment_data.xml b/energy_selfconsumption/data/ir_attachment_data.xml
index 699f37e78..300bafc03 100644
--- a/energy_selfconsumption/data/ir_attachment_data.xml
+++ b/energy_selfconsumption/data/ir_attachment_data.xml
@@ -2,20 +2,10 @@
<odoo>
<data>
<record model="ir.attachment" id="selfconsumption_table_example_attachment">
- <field name="name">import_selfconsumption_template.csv</field>
+ <field name="name">import_selfconsumption_template.xlsx</field>
<field name="type">binary</field>
<field name="datas">
- RE5JIFNvY2lvLEZlY2hhIGVmZWN0aXZhLENVUFMsUG90w6huY2lhIG3DoHhpbWEgY29udHJhY3RhZGEsVGFyaWZhIGRlIGFjY2VzbyxDYWxsZSAxLENhbGxlIDIsQ2l1ZGFkLEPDs2RpZ28gZGUgbGEgcHJvdmluY2lhLEPDs2RpZ28gcG9zdGFsLEPDs2RpZ28gSVNPIGRlbCBwYcOtcyxSZWZlcmVuY2lhIENhdGFzdHJhbCxETkkgVGl0dWxhcixOb21icmUgVGl0dWxhcixBcGVsbGlkb3MgVGl0dWxhcixJQkFOLEZlY2hhIGF1dG9yaXphY2nDs24gY2FyZ28gYmFuY2FyaW8gZGVsIG1hbmRhdG8KMjQ0OTY1MDhKLDAxLzAxLzIwMjMsRVMwMzkwNzI2MjAxMTQ5MjUzWEwsMS4yLDIuMFRELENhcnJlciBNYWpvciAyLE7CuiAxLE1hZHJpZCxNLDI4MDAxLEVTLDc4MzczMDFWRzgxNzNCMDAwMVRULDI0NDk2NTA4SiwsLCwKWTI1ODM0MjZCLCxFUzAzOTA3MDA4NzY0OTQ1MjJKWiwxNi4yNSwzLjBURCxBdmVuaWRhIE1ham9yLE7CuiAyLEJhcmNlbG9uYSxCLDgwMDEsRVMsLFkyNTgzNDI2QiwsLCwKMDU3NDk5MTNNLCxFUzAzOTA4NTg0NzEzNjAxMTNCWiwxLjcsMi4wVEQsVHJhdmVzaWEgTWFqb3IsTsK6IDIsTGxlaWRhLEwsMjUwMDEsRVMsLDA1NzQ5OTEzTSwsLCwK
- </field>
- <field name="company_id" />
- <field name="public" eval="True" />
- </record>
-
- <record model="ir.attachment" id="list_state_attachment">
- <field name="name">lista_de_provincias.xlsx</field>
- <field name="type">binary</field>
- <field name="datas">
- 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
+ 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
</field>
<field name="company_id" />
<field name="public" eval="True" />
diff --git a/energy_selfconsumption/i18n/ca_ES.po b/energy_selfconsumption/i18n/ca_ES.po
index c032f8d29..07143ad1c 100644
--- a/energy_selfconsumption/i18n/ca_ES.po
+++ b/energy_selfconsumption/i18n/ca_ES.po
@@ -6,8 +6,13 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
+<<<<<<< Updated upstream
"POT-Creation-Date: 2025-01-20 11:03+0000\n"
"PO-Revision-Date: 2025-01-20 11:03+0000\n"
+=======
+"POT-Creation-Date: 2025-01-30 11:36+0000\n"
+"PO-Revision-Date: 2025-01-30 11:36+0000\n"
+>>>>>>> Stashed changes
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -516,6 +521,7 @@ msgstr ""
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/wizards/selfconsumption_import_wizard.py:0
+#: code:addons/energy_selfconsumption/wizards/selfconsumption_import_wizard.py:0
#, python-format
msgid "<li>Line {line}: {error}</li>\n"
msgstr "<li>Línia {line}: {error}</li>\n"
@@ -698,6 +704,11 @@ msgstr ""
msgid "Accept"
msgstr "Acceptar"
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.inscription_view_tree
+msgid "Accept terms"
+msgstr "Acceptar els termes"
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__tariff
msgid "Access tariff"
@@ -816,6 +827,13 @@ msgstr "Avança a Actiu"
msgid "Advance to In Inscription"
msgstr "Avançar en Inscripció"
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_import_wizard_form_view
+msgid ""
+"Warning: In the configuration of this registration, importing bank account is not marked."
+msgstr ""
+"Avís: a la configuració d'aquest registre, no es marca el compte bancari d'importació."
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__annual_electricity_use
msgid "Annual electricity use"
@@ -1117,6 +1135,11 @@ msgstr ""
" i la totalitat dels excedents de la instal·lació de l’autoconsum, tal com s’estableix el Rela\n"
" Decret 244/2019, del 5 d'abril."
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__conf_bank_details
+msgid "Conf Bank Details"
+msgstr "Dades bancàries de Conf"
+
#. module: energy_selfconsumption
#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_form_view
msgid "Configuration"
@@ -2796,6 +2819,7 @@ msgid "Other"
msgstr "Altres"
#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__owner_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__owner_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__owner_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__owner_id
@@ -2894,6 +2918,7 @@ msgid "Partner with VAT:<b>{vat}</b> was not found."
msgstr "No s'ha trobat el soci amb CIF/NIF:<b>{vat}</b>."
#. module: energy_selfconsumption
+#: model:ir.model.fields,help:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__owner_id
#: model:ir.model.fields,help:energy_selfconsumption.field_energy_selfconsumption_supply_point__owner_id
#: model:ir.model.fields,help:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__owner_id
msgid "Partner with the legal obligation of the supply point"
@@ -3075,6 +3100,11 @@ msgstr "Informes de Taula de distribució"
msgid "Report contract"
msgstr "Informe contracte"
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__conf_bank_details
+msgid "Request bank details"
+msgstr "Sol·liciteu les dades bancàries"
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__reseller_id
msgid "Reseller"
@@ -3117,6 +3147,15 @@ msgstr "Desa les dades"
msgid "Select the associated Energy Supplier"
msgstr "Seleccioneu el proveïdor d'energia associat"
+#. module: energy_selfconsumption
+#: model:ir.model.fields,help:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__conf_bank_details
+msgid ""
+"Select when you want to make the payment by bank transfer. If not requested,"
+" the payment must be made by bank transfer by the member."
+msgstr ""
+"Seleccioneu quan voleu fer el pagament per transferència bancària. Si no es demana,"
+" el pagament s'ha de fer mitjançant transferència bancària per part del soci."
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_invoicing_wizard__num_contracts
msgid "Selected contracts"
@@ -3296,11 +3335,6 @@ msgstr "energy_selfconsumption.distribution_table_import.wizard"
msgid "Service to import project selfconsumption"
msgstr "energy_selfconsumption.selfconsumption_import.wizard"
-#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__conf_bank_details
-msgid "Show bank details"
-msgstr "Mostra les dades bancàries"
-
#. module: energy_selfconsumption
#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.inscription_data_form_fields_template
msgid "Show privacy policy"
@@ -3519,8 +3553,8 @@ msgstr "L'energia generada ha de ser superior a 0 (kWh)."
#. odoo-python
#: code:addons/energy_selfconsumption/wizards/selfconsumption_import_wizard.py:0
#, python-format
-msgid "The file should contain 17 columns and not {header_length} columns."
-msgstr "El fitxer ha de contenir 17 columnes i no {header_length} columnes."
+msgid "The file should contain 28 columns and not {header_length} columns."
+msgstr "El fitxer ha de contenir 28 columnes i no {header_length} columnes."
#. module: energy_selfconsumption
#. odoo-python
diff --git a/energy_selfconsumption/i18n/energy_selfconsumption.pot b/energy_selfconsumption/i18n/energy_selfconsumption.pot
index dcc7d6f49..d45ae5ca1 100644
--- a/energy_selfconsumption/i18n/energy_selfconsumption.pot
+++ b/energy_selfconsumption/i18n/energy_selfconsumption.pot
@@ -6,8 +6,13 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
+<<<<<<< Updated upstream
"POT-Creation-Date: 2025-01-20 11:03+0000\n"
"PO-Revision-Date: 2025-01-20 11:03+0000\n"
+=======
+"POT-Creation-Date: 2025-01-30 11:37+0000\n"
+"PO-Revision-Date: 2025-01-30 11:37+0000\n"
+>>>>>>> Stashed changes
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -390,6 +395,7 @@ msgstr ""
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/wizards/selfconsumption_import_wizard.py:0
+#: code:addons/energy_selfconsumption/wizards/selfconsumption_import_wizard.py:0
#, python-format
msgid "<li>Line {line}: {error}</li>\n"
msgstr ""
@@ -549,6 +555,11 @@ msgstr ""
msgid "Accept"
msgstr ""
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.inscription_view_tree
+msgid "Accept terms"
+msgstr ""
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__tariff
msgid "Access tariff"
@@ -664,6 +675,12 @@ msgstr ""
msgid "Advance to In Inscription"
msgstr ""
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_import_wizard_form_view
+msgid ""
+"Warning: In the configuration of this registration, importing bank account is not marked."
+msgstr ""
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__annual_electricity_use
msgid "Annual electricity use"
@@ -946,6 +963,11 @@ msgid ""
" Decreto 244/2019, de 5 de abril."
msgstr ""
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__conf_bank_details
+msgid "Conf Bank Details"
+msgstr ""
+
#. module: energy_selfconsumption
#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_form_view
msgid "Configuration"
@@ -2548,6 +2570,7 @@ msgid "Other"
msgstr ""
#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__owner_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__owner_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__owner_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__owner_id
@@ -2646,6 +2669,7 @@ msgid "Partner with VAT:<b>{vat}</b> was not found."
msgstr ""
#. module: energy_selfconsumption
+#: model:ir.model.fields,help:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__owner_id
#: model:ir.model.fields,help:energy_selfconsumption.field_energy_selfconsumption_supply_point__owner_id
#: model:ir.model.fields,help:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__owner_id
msgid "Partner with the legal obligation of the supply point"
@@ -2826,6 +2850,11 @@ msgstr ""
msgid "Report contract"
msgstr ""
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__conf_bank_details
+msgid "Request bank details"
+msgstr ""
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__reseller_id
msgid "Reseller"
@@ -2868,6 +2897,13 @@ msgstr ""
msgid "Select the associated Energy Supplier"
msgstr ""
+#. module: energy_selfconsumption
+#: model:ir.model.fields,help:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__conf_bank_details
+msgid ""
+"Select when you want to make the payment by bank transfer. If not requested,"
+" the payment must be made by bank transfer by the member."
+msgstr ""
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_invoicing_wizard__num_contracts
msgid "Selected contracts"
@@ -3041,11 +3077,6 @@ msgstr ""
msgid "Service to import project selfconsumption"
msgstr ""
-#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__conf_bank_details
-msgid "Show bank details"
-msgstr ""
-
#. module: energy_selfconsumption
#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.inscription_data_form_fields_template
msgid "Show privacy policy"
@@ -3254,7 +3285,7 @@ msgstr ""
#. odoo-python
#: code:addons/energy_selfconsumption/wizards/selfconsumption_import_wizard.py:0
#, python-format
-msgid "The file should contain 17 columns and not {header_length} columns."
+msgid "The file should contain 28 columns and not {header_length} columns."
msgstr ""
#. module: energy_selfconsumption
diff --git a/energy_selfconsumption/i18n/es.po b/energy_selfconsumption/i18n/es.po
index 7e169f519..9c9afbb1b 100644
--- a/energy_selfconsumption/i18n/es.po
+++ b/energy_selfconsumption/i18n/es.po
@@ -6,8 +6,13 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
+<<<<<<< Updated upstream
"POT-Creation-Date: 2025-01-20 11:03+0000\n"
"PO-Revision-Date: 2025-01-20 11:03+0000\n"
+=======
+"POT-Creation-Date: 2025-01-30 11:37+0000\n"
+"PO-Revision-Date: 2025-01-30 11:37+0000\n"
+>>>>>>> Stashed changes
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -501,6 +506,7 @@ msgstr ""
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/wizards/selfconsumption_import_wizard.py:0
+#: code:addons/energy_selfconsumption/wizards/selfconsumption_import_wizard.py:0
#, python-format
msgid "<li>Line {line}: {error}</li>\n"
msgstr "<li>Línea {line}: {error}</li>"
@@ -665,6 +671,11 @@ msgstr ""
msgid "Accept"
msgstr "Aceptar"
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.inscription_view_tree
+msgid "Accept terms"
+msgstr "Aceptar términos"
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__tariff
msgid "Access tariff"
@@ -782,6 +793,13 @@ msgstr "Avance a activo"
msgid "Advance to In Inscription"
msgstr "Avance a inscripción"
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_import_wizard_form_view
+msgid ""
+"Warning: In the configuration of this registration, importing bank account is not marked."
+msgstr ""
+"Alerta: En la configuración de esta inscripción no está marcado importar cuenta bancaria."
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__annual_electricity_use
msgid "Annual electricity use"
@@ -1078,6 +1096,11 @@ msgid ""
" Decreto 244/2019, de 5 de abril."
msgstr ""
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__conf_bank_details
+msgid "Conf Bank Details"
+msgstr "Conf Datos Bancarios"
+
#. module: energy_selfconsumption
#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_form_view
msgid "Configuration"
@@ -1381,8 +1404,13 @@ msgid ""
"Distribution coneffcient in kWh. The sum of all have to result in total "
"project power"
msgstr ""
+<<<<<<< Updated upstream
"Coneficiente de distribución en kWh. La suma de todos tiene que dar como resultado total "
"potencia del proyecto"
+=======
+"Coneficiente de distribución en kWh. La suma de todos tiene que dar como "
+"resultado total potencia del proyecto"
+>>>>>>> Stashed changes
#. module: energy_selfconsumption
#. odoo-python
@@ -2714,6 +2742,7 @@ msgid "Other"
msgstr "Otros"
#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__owner_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__owner_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__owner_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__owner_id
@@ -2812,6 +2841,7 @@ msgid "Partner with VAT:<b>{vat}</b> was not found."
msgstr "No se ha encontrado socio con CIF/NIF:<b>{vat}</b>."
#. module: energy_selfconsumption
+#: model:ir.model.fields,help:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__owner_id
#: model:ir.model.fields,help:energy_selfconsumption.field_energy_selfconsumption_supply_point__owner_id
#: model:ir.model.fields,help:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__owner_id
msgid "Partner with the legal obligation of the supply point"
@@ -2995,6 +3025,11 @@ msgstr "Informe de Tabla de distribución"
msgid "Report contract"
msgstr "Informe contrato"
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__conf_bank_details
+msgid "Request bank details"
+msgstr "Solicitar datos bancarios"
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__reseller_id
msgid "Reseller"
@@ -3037,6 +3072,15 @@ msgstr "Guardar datos"
msgid "Select the associated Energy Supplier"
msgstr "Seleccione el Proveedor de Energía asociado"
+#. module: energy_selfconsumption
+#: model:ir.model.fields,help:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__conf_bank_details
+msgid ""
+"Select when you want to make the payment by bank transfer. If not requested,"
+" the payment must be made by bank transfer by the member."
+msgstr ""
+"Seleccione cuándo desea realizar el pago por transferencia bancaria. Si no se solicita,"
+" el pago debe ser realizado por transferencia bancaria por el afiliado."
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_invoicing_wizard__num_contracts
msgid "Selected contracts"
@@ -3217,11 +3261,6 @@ msgstr "energy_selfconsumption.distribution_table_import.wizard"
msgid "Service to import project selfconsumption"
msgstr "energy_selfconsumption.selfconsumption_import.wizard"
-#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__conf_bank_details
-msgid "Show bank details"
-msgstr "Mostrar datos bancarios"
-
#. module: energy_selfconsumption
#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.inscription_data_form_fields_template
msgid "Show privacy policy"
@@ -3438,8 +3477,8 @@ msgstr "La energía generada debe ser superior a 0 (kWh)."
#. odoo-python
#: code:addons/energy_selfconsumption/wizards/selfconsumption_import_wizard.py:0
#, python-format
-msgid "The file should contain 17 columns and not {header_length} columns."
-msgstr "El fichero debe contener 17 columnas y no {header_length} columnas."
+msgid "The file should contain 28 columns and not {header_length} columns."
+msgstr "El archivo debe contener 28 columnas y no {header_length} columnas."
#. module: energy_selfconsumption
#. odoo-python
diff --git a/energy_selfconsumption/i18n/eu_ES.po b/energy_selfconsumption/i18n/eu_ES.po
index 68194f055..b68bddd4c 100644
--- a/energy_selfconsumption/i18n/eu_ES.po
+++ b/energy_selfconsumption/i18n/eu_ES.po
@@ -6,8 +6,13 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
+<<<<<<< Updated upstream
"POT-Creation-Date: 2025-01-20 11:04+0000\n"
"PO-Revision-Date: 2025-01-20 11:04+0000\n"
+=======
+"POT-Creation-Date: 2025-01-30 11:36+0000\n"
+"PO-Revision-Date: 2025-01-30 11:36+0000\n"
+>>>>>>> Stashed changes
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -509,6 +514,7 @@ msgstr ""
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/wizards/selfconsumption_import_wizard.py:0
+#: code:addons/energy_selfconsumption/wizards/selfconsumption_import_wizard.py:0
#, python-format
msgid "<li>Line {line}: {error}</li>\n"
msgstr "<li>Lerroa {line}: {error}</li>\n"
@@ -686,6 +692,11 @@ msgstr ""
msgid "Accept"
msgstr "Onetsi"
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.inscription_view_tree
+msgid "Accept terms"
+msgstr "Onartu baldintzak"
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__tariff
msgid "Access tariff"
@@ -805,6 +816,13 @@ msgstr "Aktibora aurreratu"
msgid "Advance to In Inscription"
msgstr "Izen-ematearen aurrerapena"
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_import_wizard_form_view
+msgid ""
+"Warning: In the configuration of this registration, importing bank account is not marked."
+msgstr ""
+"Abisua: Erregistro honen konfigurazioan, banku-kontua inportatzea ez dago markatuta."
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__annual_electricity_use
msgid "Annual electricity use"
@@ -1104,6 +1122,11 @@ msgstr ""
" eta autokontsumoko instalazioaren soberakin guztiak, Realak ezarritakoaren arabera\n"
" 244/2019 Dekretua, apirilaren 5ekoa."
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__conf_bank_details
+msgid "Conf Bank Details"
+msgstr "Conf Bank xehetasunak"
+
#. module: energy_selfconsumption
#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_form_view
msgid "Configuration"
@@ -2779,6 +2802,7 @@ msgid "Other"
msgstr "Bestela"
#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__owner_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__owner_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__owner_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__owner_id
@@ -2878,6 +2902,7 @@ msgid "Partner with VAT:<b>{vat}</b> was not found."
msgstr "IFK/NIF-ko bazkidea:<b>{vat}</b> ez da aurkitu."
#. module: energy_selfconsumption
+#: model:ir.model.fields,help:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__owner_id
#: model:ir.model.fields,help:energy_selfconsumption.field_energy_selfconsumption_supply_point__owner_id
#: model:ir.model.fields,help:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__owner_id
msgid "Partner with the legal obligation of the supply point"
@@ -3058,6 +3083,11 @@ msgstr "Txostena banatzeko taula"
msgid "Report contract"
msgstr "Txosten kontratua"
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__conf_bank_details
+msgid "Request bank details"
+msgstr "Eskatu banku-datuak"
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__reseller_id
msgid "Reseller"
@@ -3100,6 +3130,15 @@ msgstr "Gorde datuak"
msgid "Select the associated Energy Supplier"
msgstr "Hautatu lotutako Energia Hornitzailea"
+#. module: energy_selfconsumption
+#: model:ir.model.fields,help:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__conf_bank_details
+msgid ""
+"Select when you want to make the payment by bank transfer. If not requested,"
+" the payment must be made by bank transfer by the member."
+msgstr ""
+"Hautatu noiz egin nahi duzun ordainketa banku-transferentzia bidez. Ez bada eskatu,"
+" ordainketa banku-transferentzia bidez egin beharko du bazkideak."
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_invoicing_wizard__num_contracts
msgid "Selected contracts"
@@ -3280,11 +3319,6 @@ msgstr "energy_selfconsumption.distribution_table_import.wizard"
msgid "Service to import project selfconsumption"
msgstr "energy_selfconsumption.selfconsumption_import.wizard"
-#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__conf_bank_details
-msgid "Show bank details"
-msgstr "Erakutsi banku-datuak"
-
#. module: energy_selfconsumption
#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.inscription_data_form_fields_template
msgid "Show privacy policy"
@@ -3503,8 +3537,8 @@ msgstr "Sortutako energia 0 (kWh) baino handiagoa izan behar da."
#. odoo-python
#: code:addons/energy_selfconsumption/wizards/selfconsumption_import_wizard.py:0
#, python-format
-msgid "The file should contain 17 columns and not {header_length} columns."
-msgstr "Fitxategiak 17 zutabe izan behar ditu eta ez {header_length} zutabe."
+msgid "The file should contain 28 columns and not {header_length} columns."
+msgstr "Fitxategiak 28 zutabe izan behar ditu eta ez {header_length} zutabe."
#. module: energy_selfconsumption
#. odoo-python
diff --git a/energy_selfconsumption/models/create_inscription.py b/energy_selfconsumption/models/create_inscription.py
index 656762c65..ffca75ee1 100644
--- a/energy_selfconsumption/models/create_inscription.py
+++ b/energy_selfconsumption/models/create_inscription.py
@@ -31,10 +31,9 @@ class CreateInscription(models.AbstractModel):
.sudo()
.search([("code", "=", values["supplypoint_cups"])])
)
-
+ country = self._get_country(values, project)
if not supply_point:
try:
- country = self._get_country(values, project)
vals = {
"code": values["supplypoint_cups"],
"owner_id": owner.id,
@@ -61,6 +60,30 @@ class CreateInscription(models.AbstractModel):
except Exception as e:
return True, _(str(e))
+ else:
+ try:
+ vals = {
+ "owner_id": owner.id,
+ "contracted_power": float(
+ values.get("supplypoint_contracted_power", 0)
+ ),
+ "tariff": tariff,
+ "partner_id": partner.id,
+ "company_id": project.company_id.id,
+ "street": values["supplypoint_street"],
+ "city": values["supplypoint_city"],
+ "country_id": country.id,
+ "state_id": self._get_state(values, project, country).id,
+ "zip": values["supplypoint_zip"],
+ "cadastral_reference": values["supplypoint_cadastral_reference"],
+ }
+ if project.conf_used_in_selfconsumption:
+ vals["used_in_selfconsumption"] = values.get(
+ "supplypoint_used_in_selfconsumption", None
+ )
+ supply_point.sudo().write(vals)
+ except Exception as e:
+ return True, _(str(e))
participation = self._get_participation(values, project)
if not participation:
@@ -119,7 +142,7 @@ class CreateInscription(models.AbstractModel):
if not owner:
return True, _("Owner could not be created or found.")
- contracted_power = float(values.get("supplypoint_contracted_power", "0").replace(",", "."))
+ contracted_power = float(str(values.get("supplypoint_contracted_power", "0")).replace(",", "."))
tariff = self._determine_tariff(contracted_power, values)
return self._create_supply_point(
@@ -199,6 +222,18 @@ class CreateInscription(models.AbstractModel):
)
mandate_auth_date = self._get_mandate_auth_date(values)
+ mandate_obj = (
+ self.env["account.banking.mandate"]
+ .with_company(project.company_id)
+ .sudo()
+ .search([
+ ("partner_bank_id", "=", bank_account.id),
+ ("partner_id", "=", partner.id),
+ ("company_id", "=", project.company_id.id),
+ ])
+ )
+ if mandate_obj:
+ return False, mandate_obj
return False, (
self.env["account.banking.mandate"]
.with_company(project.company_id)
diff --git a/energy_selfconsumption/models/inscription.py b/energy_selfconsumption/models/inscription.py
index aa6da5708..493649445 100644
--- a/energy_selfconsumption/models/inscription.py
+++ b/energy_selfconsumption/models/inscription.py
@@ -36,6 +36,10 @@ class Inscription(models.Model):
supply_point_id = fields.Many2one(
"energy_selfconsumption.supply_point", required=True
)
+ owner_id = fields.Many2one(
+ related="supply_point_id.owner_id",
+ string="Owner",
+ )
code = fields.Char(string="CUPS", related="supply_point_id.code")
used_in_selfconsumption = fields.Selection(
string="Used in selfconsumption",
@@ -43,7 +47,7 @@ class Inscription(models.Model):
)
vulnerability_situation = fields.Selection(
string="Vulnerability situation",
- related="partner_id.vulnerability_situation",
+ related="supply_point_id.owner_id.vulnerability_situation",
)
@api.constrains("project_id", "partner_id", "supply_point_id")
diff --git a/energy_selfconsumption/models/selfconsumption.py b/energy_selfconsumption/models/selfconsumption.py
index 94ab1573b..d6916637e 100644
--- a/energy_selfconsumption/models/selfconsumption.py
+++ b/energy_selfconsumption/models/selfconsumption.py
@@ -134,7 +134,7 @@ class Selfconsumption(models.Model):
)
conf_used_in_selfconsumption = fields.Boolean("Show used in selfconsumption")
conf_vulnerability_situation = fields.Boolean("Show vulnerability situation")
- conf_bank_details = fields.Boolean("Show bank details")
+ conf_bank_details = fields.Boolean("Request bank details", default=True, help="Select when you want to make the payment by bank transfer. If not requested, the payment must be made by bank transfer by the member.")
conf_url_form = fields.Char(string="URL")
def activate_form(self):
diff --git a/energy_selfconsumption/views/distribution_table_views.xml b/energy_selfconsumption/views/distribution_table_views.xml
index d1ffa068a..0a00934b4 100644
--- a/energy_selfconsumption/views/distribution_table_views.xml
+++ b/energy_selfconsumption/views/distribution_table_views.xml
@@ -66,6 +66,8 @@
mode="list"
context="{'default_distribution_table_id':id, 'distribution_table_type': type}"
attrs="{'readonly': [('state', 'not in', ['draft'])]}"
+ nolabel="1"
+ colspan="2"
>
<tree editable="bottom">
<field
diff --git a/energy_selfconsumption/views/inscription_views.xml b/energy_selfconsumption/views/inscription_views.xml
index 2112f799c..754f7ced5 100644
--- a/energy_selfconsumption/views/inscription_views.xml
+++ b/energy_selfconsumption/views/inscription_views.xml
@@ -7,28 +7,38 @@
name="model"
>energy_selfconsumption.inscription_selfconsumption</field>
<field name="arch" type="xml">
- <tree editable="bottom">
+ <tree create="false" editable="bottom">
<field
name="partner_id"
options="{'no_create': True}"
width="14%"
+ optional="show"
/>
- <field name="used_in_selfconsumption" width="6%" />
- <field name="vulnerability_situation" width="6%" />
- <field name="supply_point_id" width="10%" />
- <field name="code" readonly="1" width="22%" />
- <field name="is_member" readonly="1" width="10%" />
- <field name="effective_date" width="6%" />
+ <field
+ name="owner_id"
+ options="{'no_create': True}"
+ width="14%"
+ optional="show"
+ />
+ <field name="used_in_selfconsumption" width="6%" optional="show"/>
+ <field name="vulnerability_situation" width="6%" optional="show"/>
+ <field name="annual_electricity_use" width="6%" optional="show"/>
+ <field name="supply_point_id" width="10%" optional="hide" />
+ <field name="code" readonly="1" width="22%" optional="show"/>
+ <field name="is_member" readonly="1" width="10%" optional="hide"/>
+ <field name="effective_date" width="6%" optional="hide"/>
<field name="mandate_filtered_ids" invisible="True" />
- <field name="acc_number" width="12%" />
+ <field name="acc_number" width="12%" optional="show"/>
<field
name="mandate_id"
domain="[('id', 'in', mandate_filtered_ids)]"
context="{'default_partner_id': partner_id}"
width="14%"
+ optional="hide"
/>
- <field name="member" readonly="1" width="6%" />
- <field name="participation_quantity" sum="True" width="6%" />
+ <field name="member" readonly="1" width="6%" optional="hide"/>
+ <field name="accept" string="Accept terms" readonly="1" width="6%" optional="hide"/>
+ <field name="participation_quantity" sum="True" width="6%" optional="show"/>
</tree>
</field>
</record>
diff --git a/energy_selfconsumption/wizards/selfconsumption_import_wizard.py b/energy_selfconsumption/wizards/selfconsumption_import_wizard.py
index 541f6fe45..d269dae02 100644
--- a/energy_selfconsumption/wizards/selfconsumption_import_wizard.py
+++ b/energy_selfconsumption/wizards/selfconsumption_import_wizard.py
@@ -45,18 +45,22 @@ class SelfconsumptionImportWizard(models.TransientModel):
)
user_current_role = fields.Char()
+ conf_bank_details = fields.Boolean()
@api.model
def default_get(self, fields):
defaults = super().default_get(fields)
defaults["user_current_role"] = self.env.user.user_current_role
+ project = self.env["energy_selfconsumption.selfconsumption"].browse(self.env.context.get("active_id"))
+ if project:
+ defaults["conf_bank_details"] = project.conf_bank_details
return defaults
@api.constrains("import_file")
def _constrains_import_file(self):
if self.fname:
- format = str(self.fname.split(".")[1])
- if format != "csv":
+ format_file = str(self.fname.split(".")[1])
+ if format_file != "csv":
raise ValidationError(_("Only csv format files are accepted."))
def import_file_button(self):
@@ -67,10 +71,19 @@ class SelfconsumptionImportWizard(models.TransientModel):
active_id = self.env.context.get("active_id")
project = self.env["energy_selfconsumption.selfconsumption"].browse(active_id)
for index, line in enumerate(parsing_data):
- import_dict = self.get_line_dict(line)
+ error, import_dict = self.get_line_dict(line)
+ if error:
+ error_string_list += "".join(
+ [
+ error_string_list,
+ _("<li>Line {line}: {error}</li>\n").format(
+ line=index, error=import_dict
+ ),
+ ]
+ )
result = self.import_line(import_dict, project)
if result[0]:
- error_string_list = "".join(
+ error_string_list += "".join(
[
error_string_list,
_("<li>Line {line}: {error}</li>\n").format(
@@ -113,12 +126,25 @@ class SelfconsumptionImportWizard(models.TransientModel):
"target": "new",
}
+ def _get_state(self, name):
+ """Gets the state based on values and country."""
+ state = (
+ self.env["res.country.state"]
+ .sudo()
+ .search(
+ [("name", "=", name)], limit=1
+ )
+ )
+ if state:
+ return state.code
+ return False
+
def get_line_dict(self, line):
header = list(line.keys())
- if len(header) != 17:
+ if len(header) != 28:
raise ValidationError(
_(
- "The file should contain 17 columns and not {header_length} columns."
+ "The file should contain 28 columns and not {header_length} columns."
).format(header_length=len(header))
)
supplypoint_owner_id_same = "no"
@@ -128,29 +154,47 @@ class SelfconsumptionImportWizard(models.TransientModel):
supplypoint_owner_id_same = "yes"
if not line.get(header[14], False):
supplypoint_owner_id_same = "yes"
- return {
- "inscription_partner_id_vat": line.get(header[0], False),
- "effective_date": line.get(header[1], False),
- "supplypoint_cups": line.get(header[2], False),
- "supplypoint_contracted_power": float(
- str(line.get(header[3], 0.0)).replace(",", ".")
- ),
- "tariff": line.get(header[4], False),
- "supplypoint_street": line.get(header[5], False),
- "street2": line.get(header[6], False),
- "supplypoint_city": line.get(header[7], False),
- "state": line.get(header[8], False),
- "supplypoint_zip": line.get(header[9], False),
- "country": line.get(header[10], False),
- "supplypoint_cadastral_reference": line.get(header[11], False),
- "supplypoint_owner_id_vat": line.get(header[12], False),
- "supplypoint_owner_id_name": line.get(header[13], False),
- "supplypoint_owner_id_lastname": line.get(header[14], False),
- "inscription_acc_number": line.get(header[15], False),
- "mandate_auth_date": line.get(header[16], False),
- "date_format": self.date_format,
- "supplypoint_owner_id_same": supplypoint_owner_id_same,
- }
+ try:
+ return False, {
+ "inscription_partner_id_vat": line.get(header[0], False),
+ "effective_date": line.get(header[1], False),
+ "supplypoint_cups": line.get(header[2], False),
+ "supplypoint_contracted_power": float(
+ str(line.get(header[3], 0.0)).replace(",", ".")
+ ),
+ "tariff": line.get(header[4], False),
+ "supplypoint_street": line.get(header[5], False),
+ "street2": line.get(header[6], False),
+ "supplypoint_city": line.get(header[7], False),
+ "state": self._get_state(line.get(header[8], "")),
+ "supplypoint_zip": line.get(header[9], False),
+ "country": line.get(header[10], False),
+ "supplypoint_cadastral_reference": line.get(header[11], False),
+ "supplypoint_owner_id_vat": line.get(header[12], False),
+ "supplypoint_owner_id_name": line.get(header[13], False),
+ "supplypoint_owner_id_lastname": line.get(header[14], False),
+ "supplypoint_owner_id_gender": line.get(header[15], False), # New
+ "supplypoint_owner_id_birthdate_date": line.get(header[16], False), # New
+ "supplypoint_owner_id_phone": line.get(header[17], False), # New
+ "supplypoint_owner_id_lang": line.get(header[18], False), # New
+ "supplypoint_owner_id_email": line.get(header[19], False), # New
+ "supplypoint_owner_id_vulnerability_situation": line.get(header[20], False), # New
+ "inscription_project_privacy": line.get(header[21], False), # New
+ "inscription_acc_number": line.get(header[22], False),
+ "mandate_auth_date": line.get(header[23], False),
+ "date_format": self.date_format,
+ "supplypoint_owner_id_same": supplypoint_owner_id_same,
+ "supplypoint_used_in_selfconsumption": line.get(header[24], False), # New
+ "inscriptionselfconsumption_annual_electricity_use": float(
+ str(line.get(header[25], 0.0)).replace(",", ".")
+ ), # New
+ "inscriptionselfconsumption_participation": float(
+ str(line.get(header[26], 0.0)).replace(",", ".")
+ ), # New
+ "inscriptionselfconsumption_accept": line.get(header[27], False), # New
+ }
+ except Exception as e:
+ return True, _(str(e))
def _parse_file(self, data_file):
self.ensure_one()
diff --git a/energy_selfconsumption/wizards/selfconsumption_import_wizard_views.xml b/energy_selfconsumption/wizards/selfconsumption_import_wizard_views.xml
index b6fb3ad21..99a31ccfb 100644
--- a/energy_selfconsumption/wizards/selfconsumption_import_wizard_views.xml
+++ b/energy_selfconsumption/wizards/selfconsumption_import_wizard_views.xml
@@ -17,6 +17,8 @@
The template must have the following format and be a CSV file.</p>
<p
>In the state list file, you can check which code is assigned for your state.</p>
+ <p attrs="{'invisible':[('conf_bank_details','=', True)]}" style="color: red;"
+ >Warning: In the configuration of this registration, importing bank account is not marked.</p>
<button
type="object"
class="btn btn-primary mr-1"
@@ -45,6 +47,7 @@
<separator />
<group>
<field name="user_current_role" invisible="1" />
+ <field name="conf_bank_details" invisible="1" />
<field
name="import_file"
filename="fname"
--
GitLab
From 6a961c1ac1e611c5cc616420e677b2258fffe546 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Garc=C3=ADa?= <alvarogruiz8@gmail.com>
Date: Thu, 30 Jan 2025 15:15:33 +0100
Subject: [PATCH 03/12] [IMP] Task 704,717,718 Partner have a new check for no
member but autorized in energy actions
---
energy_communities_cooperator/models/partner.py | 6 ++++++
energy_communities_cooperator/views/res_partner_views.xml | 5 +++++
energy_selfconsumption/models/create_inscription.py | 4 +++-
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/energy_communities_cooperator/models/partner.py b/energy_communities_cooperator/models/partner.py
index c4d692ab0..51c7123dd 100644
--- a/energy_communities_cooperator/models/partner.py
+++ b/energy_communities_cooperator/models/partner.py
@@ -17,6 +17,12 @@ class ResPartner(models.Model):
store=True,
)
+ no_member_autorized_in_energy_actions = fields.Boolean(
+ string="Authorized guest",
+ company_dependent=True,
+ help="Enable the contact to participate in Community Energy Actions despite not being an effective member of the Community."
+ )
+
@api.depends("vat")
def _compute_company_register_number(self):
for record in self:
diff --git a/energy_communities_cooperator/views/res_partner_views.xml b/energy_communities_cooperator/views/res_partner_views.xml
index 909ceda2c..ff19921a0 100644
--- a/energy_communities_cooperator/views/res_partner_views.xml
+++ b/energy_communities_cooperator/views/res_partner_views.xml
@@ -31,9 +31,14 @@
<field name="generic_rules_approved" position="attributes">
<attribute name="readonly">1</attribute>
</field>
+ <field name="vat" position="attributes">
+ <attribute name="attrs">{'readonly': [('parent_id','!=',False)], 'required': [('no_member_autorized_in_energy_actions', '=', True)]}</attribute>
+ </field>
<field name="legal_form" position="after">
<field name="user_current_role" invisible="1" />
<field name="cooperator" readonly="1" />
+ <field name="no_member_autorized_in_energy_actions" />
+
<field
name="coop_candidate"
readonly="1"
diff --git a/energy_selfconsumption/models/create_inscription.py b/energy_selfconsumption/models/create_inscription.py
index ffca75ee1..34a51b033 100644
--- a/energy_selfconsumption/models/create_inscription.py
+++ b/energy_selfconsumption/models/create_inscription.py
@@ -169,7 +169,9 @@ class CreateInscription(models.AbstractModel):
)
def _is_cooperator(self, partner, project):
- """Verify if the partner is a cooperative member."""
+ """Verify if the partner is a cooperative member o no member but autorized in energy actions"""
+ if partner.no_member_autorized_in_energy_actions:
+ return True
return bool(
self.env["cooperative.membership"]
.sudo()
--
GitLab
From be4fe3a4aff29f75cb7a686a2b300f128c8150ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Garc=C3=ADa?= <alvarogruiz8@gmail.com>
Date: Thu, 30 Jan 2025 15:29:32 +0100
Subject: [PATCH 04/12] [IMP] Translate i18n
---
energy_communities_cooperator/i18n/ca_ES.po | 304 ++++++++--------
.../i18n/energy_communities_cooperator.pot | 74 +++-
energy_communities_cooperator/i18n/es.po | 327 +++++++++---------
energy_communities_cooperator/i18n/eu_ES.po | 320 ++++++++---------
energy_selfconsumption/i18n/ca_ES.po | 5 -
.../i18n/energy_selfconsumption.pot | 5 -
energy_selfconsumption/i18n/es.po | 10 -
energy_selfconsumption/i18n/eu_ES.po | 5 -
8 files changed, 557 insertions(+), 493 deletions(-)
diff --git a/energy_communities_cooperator/i18n/ca_ES.po b/energy_communities_cooperator/i18n/ca_ES.po
index c28956174..e1e244880 100644
--- a/energy_communities_cooperator/i18n/ca_ES.po
+++ b/energy_communities_cooperator/i18n/ca_ES.po
@@ -6,23 +6,20 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-29 09:55+0000\n"
-"PO-Revision-Date: 2024-12-03 22:18+0100\n"
+"POT-Creation-Date: 2025-01-30 14:17+0000\n"
+"PO-Revision-Date: 2025-01-30 14:17+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
-"Language: ca_ES\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.4.2\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
#. module: energy_communities_cooperator
#: model:ir.model.fields,help:energy_communities_cooperator.field_subscription_request__vat
msgid ""
"\n"
-" The Tax Identification Number. Complete it if the contact is "
-"subjected to\n"
+" The Tax Identification Number. Complete it if the contact is subjected to\n"
" government taxes. Used in some legal statements.\"\n"
" "
msgstr ""
@@ -35,44 +32,29 @@ msgstr ""
#: model:mail.template,body_html:energy_communities_cooperator.email_template_confirmation_voluntary_share
msgid ""
"<div style=\"margin: 0px; padding: 0px;\">\n"
-" <p style=\"margin: 0px; padding: 0px; font-size: 13px;"
-"\">\n"
+" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
" Dear <t t-out=\"object.firstname\"></t>,<br><br>\n"
-" We confirm that we have correctly received your "
-"request to make a voluntary contribution to the capital social of <b><t t-"
-"out=\"object.company_id.name\"></t></b>, with the following data:<br><br>\n"
+" We confirm that we have correctly received your request to make a voluntary contribution to the capital social of <b><t t-out=\"object.company_id.name\"></t></b>, with the following data:<br><br>\n"
" <ul>\n"
-" <li>Partner VAT: <b><t t-out=\"object.vat\"></"
-"t></b></li>\n"
-" <li>Partner name: <b><t t-out=\"object."
-"firstname\"></t> <t t-out=\"object.lastname\"></t></b></li>\n"
-" <li>Charging account finished on: <b><t t-"
-"out=\"object.iban[-4:]\"></t></b></li>\n"
-" <li>Subscription amount: <b><t t-out=\"object."
-"subscription_amount\"></t> €</b></li>\n"
+" <li>Partner VAT: <b><t t-out=\"object.vat\"></t></b></li>\n"
+" <li>Partner name: <b><t t-out=\"object.firstname\"></t> <t t-out=\"object.lastname\"></t></b></li>\n"
+" <li>Charging account finished on: <b><t t-out=\"object.iban[-4:]\"></t></b></li>\n"
+" <li>Subscription amount: <b><t t-out=\"object.subscription_amount\"></t> €</b></li>\n"
" </ul>\n"
" <br>\n"
-" In the next few days you will receive the bank "
-"charge in this account, please verify that all the data\n"
-" provided is correct and you have the money you want "
-"to invest, to avoid any incident in the\n"
+" In the next few days you will receive the bank charge in this account, please verify that all the data\n"
+" provided is correct and you have the money you want to invest, to avoid any incident in the\n"
" draft of the receipt.\n"
" <br><br>\n"
-" Once the validity of the payment has been verified, "
-"you will receive a new notification confirming the contribution made.\n"
+" Once the validity of the payment has been verified, you will receive a new notification confirming the contribution made.\n"
" <br><br>\n"
-" Thank you for your involvement and we inform you "
-"that for any doubt or clarification you can\n"
+" Thank you for your involvement and we inform you that for any doubt or clarification you can\n"
" <t t-if=\"object.company_id.website\">\n"
-" consult our website: <a t-if=\"object.company_id."
-"website\" t-att-href=\"object.company_id.website\"><t t-out=\"object."
-"company_id.website\"></t></a>\n"
+" consult our website: <a t-if=\"object.company_id.website\" t-att-href=\"object.company_id.website\"><t t-out=\"object.company_id.website\"></t></a>\n"
" or\n"
-" </t> send us an email to <t t-out=\"object."
-"company_id.email\"></t>.\n"
+" </t> send us an email to <t t-out=\"object.company_id.email\"></t>.\n"
" <br><br>\n"
-" Get the word out by explaining the project to "
-"family and friends. The more we are, the further we will go!\n"
+" Get the word out by explaining the project to family and friends. The more we are, the further we will go!\n"
" <br>\n"
" Thank you very much and good energy!\n"
" <br><br>\n"
@@ -84,39 +66,25 @@ msgid ""
msgstr ""
"<p>Apreciat/ada <t t-out=\"object.firstname\"></t>,</p>\n"
" <p>\n"
-" Et confirmem que hem rebut correctament la teva sol·licitud per "
-"realitzar una aportació voluntària al capital social de <b><t t-"
-"out=\"object.company_id.name\"></t></b>, amb les següents dades:\n"
+" Et confirmem que hem rebut correctament la teva sol·licitud per realitzar una aportació voluntària al capital social de <b><t t-out=\"object.company_id.name\"></t></b>, amb les següents dades:\n"
" </p>\n"
" <ul>\n"
" <li>Soci/sòcia NIF: <b><t t-out=\"object.vat\"></t></b></li>\n"
-" <li>Soci/sòcia: <b><t t-out=\"object.firstname\"></t> <t t-"
-"out=\"object.lastname\"></t></b></li>\n"
+" <li>Soci/sòcia: <b><t t-out=\"object.firstname\"></t> <t t-out=\"object.lastname\"></t></b></li>\n"
" <li>Compte bancari: <b><t t-out=\"object.iban[-4:]\"></t></b></li>\n"
-" <li>Import d'aportació: <b><t t-out=\"object."
-"subscription_amount\"></t>€</b></li>\n"
+" <li>Import d'aportació: <b><t t-out=\"object.subscription_amount\"></t>€</b></li>\n"
" </ul>\n"
" <p>\n"
-"En els pròxims dies rebràs el càrrec bancari en aquest compte, si us plau "
-"verifica que totes les teves dades siguin correctes i disposis dels diners "
-"que vulguis invertir, per evitar qualsevol incidència en el gir del rebut.\n"
+"En els pròxims dies rebràs el càrrec bancari en aquest compte, si us plau verifica que totes les teves dades siguin correctes i disposis dels diners que vulguis invertir, per evitar qualsevol incidència en el gir del rebut.\n"
" </p>\n"
" <p>\n"
-"Una vegada verificat el pagament, rebràs una notificació confirmant "
-"l'aportació realitzada i detallant les condicions particulars de la teva "
-"aportació.\n"
+"Una vegada verificat el pagament, rebràs una notificació confirmant l'aportació realitzada i detallant les condicions particulars de la teva aportació.\n"
" </p>\n"
" <p>\n"
-"Agraïm la teva implicació amb la cooperativa i t'informem que pots aclarir "
-"qualsevol dubte en la nostra pàgina web <a t-if=\"object.company_id."
-"website\" t-att-href=\"object.company_id.website\"><t t-out=\"object."
-"company_id.website\"></t></a> o enviar-nos un correu electrònic a <a t-att-"
-"href=\"object.company_id.email\"><t t-out=\"object.company_id.email\"></t></"
-"a>\n"
+"Agraïm la teva implicació amb la cooperativa i t'informem que pots aclarir qualsevol dubte en la nostra pàgina web <a t-if=\"object.company_id.website\" t-att-href=\"object.company_id.website\"><t t-out=\"object.company_id.website\"></t></a> o enviar-nos un correu electrònic a <a t-att-href=\"object.company_id.email\"><t t-out=\"object.company_id.email\"></t></a>\n"
" </p>\n"
" <p>\n"
-"Fes que corri la veu explicant el nostre projecte a familiars i amics/"
-"amigues. Com més siguem, més lluny arribarem!\n"
+"Fes que corri la veu explicant el nostre projecte a familiars i amics/amigues. Com més siguem, més lluny arribarem!\n"
" </p>\n"
" <p>\n"
"Moltes gràcies i bona energia!\n"
@@ -130,21 +98,12 @@ msgstr ""
#: model:mail.template,body_html:energy_communities_cooperator.email_template_conditions_voluntary_share
msgid ""
"<div style=\"margin: 0px; padding: 0px;\">\n"
-" <p style=\"margin: 0px; padding: 0px; font-size: 13px;"
-"\">\n"
+" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
" Hello <t t-out=\"object.name\"></t>,<br><br>\n"
-" Recently we have allready charged your account the "
-"amount corresponding to your voluntary contribution to the share capital of "
-"<b><t t-out=\"object.company_id.comercial_name or object.company_id."
-"name\"></t></b>.<br><br>\n"
-" We take this opportunity to <b>thank you</b>, once "
-"again, for your involvement with the objective to promote actions and "
-"projects that contribute to an energy and social transition.<br><br>\n"
-" Please find in attachment your <t t-out=\"object."
-"company_id.comercial_name or object.company_id.name\"></t> cooperator "
-"certificate.<br><br>\n"
-" Get the word out by explaining the project to family "
-"and friends. The more we are, the further we will go!<br><br>\n"
+" Recently we have allready charged your account the amount corresponding to your voluntary contribution to the share capital of <b><t t-out=\"object.company_id.comercial_name or object.company_id.name\"></t></b>.<br><br>\n"
+" We take this opportunity to <b>thank you</b>, once again, for your involvement with the objective to promote actions and projects that contribute to an energy and social transition.<br><br>\n"
+" Please find in attachment your <t t-out=\"object.company_id.comercial_name or object.company_id.name\"></t> cooperator certificate.<br><br>\n"
+" Get the word out by explaining the project to family and friends. The more we are, the further we will go!<br><br>\n"
" We keep in touch for any questions.<br><br>\n"
" Yours faithfully,<br>\n"
" </p>\n"
@@ -153,30 +112,20 @@ msgid ""
msgstr ""
"<p>Apreciat/ada <t t-out=\"object.name\"></t>,</p>\n"
" <p>\n"
-" Et confirmem que ja hem fet el càrrec al teu compte bancari "
-"corresponent a la teva aportació al capital voluntari de \n"
-" <b><t t-out=\"object.company_id.comercial_name or object.company_id."
-"name\"></t></b>.\n"
+" Et confirmem que ja hem fet el càrrec al teu compte bancari corresponent a la teva aportació al capital voluntari de \n"
+" <b><t t-out=\"object.company_id.comercial_name or object.company_id.name\"></t></b>.\n"
" </p>\n"
" <p>\n"
-"\tRestem a la teva disposició per qualsevol dubte o aclariment en relació a "
-"la aportació realitzada a través del nostre correu electrònic \n"
-" <a t-att-href=\"object.company_id.email\"><t t-out=\"object."
-"company_id.email\"></t></a> o la nostra pàgina web \n"
-" <a t-if=\"object.company_id.website\" t-att-href=\"object."
-"company_id.website\"><t t-out=\"object.company_id.website\"></t></a>.\n"
+"\tRestem a la teva disposició per qualsevol dubte o aclariment en relació a la aportació realitzada a través del nostre correu electrònic \n"
+" <a t-att-href=\"object.company_id.email\"><t t-out=\"object.company_id.email\"></t></a> o la nostra pàgina web \n"
+" <a t-if=\"object.company_id.website\" t-att-href=\"object.company_id.website\"><t t-out=\"object.company_id.website\"></t></a>.\n"
" </p>\n"
" <p>\n"
-" Aprofitem per agrair-te, un cop més, la teva implicació amb "
-"l'objectiu de <b><t t-out=\"object.company_id.comercial_name or object."
-"company_id.name\"></t></b>\n"
-" per impulsar aquelles accions o projecte que contribueixin a una "
-"transició energètica, economia i social a <t t-out=\"object.company_id."
-"city\"></t>.\n"
+" Aprofitem per agrair-te, un cop més, la teva implicació amb l'objectiu de <b><t t-out=\"object.company_id.comercial_name or object.company_id.name\"></t></b>\n"
+" per impulsar aquelles accions o projecte que contribueixin a una transició energètica, economia i social a <t t-out=\"object.company_id.city\"></t>.\n"
" </p>\n"
" <p>\n"
-"Fes que corri la veu explicant el nostre projecte a familiars i amics/"
-"amigues. Com més siguem, més lluny arribarem!\n"
+"Fes que corri la veu explicant el nostre projecte a familiars i amics/amigues. Com més siguem, més lluny arribarem!\n"
" </p>\n"
" <p>\n"
"Moltes gràcies i bona energia!\n"
@@ -204,10 +153,10 @@ msgid ""
" <t t-if=\"object.voluntary_share_interest_return_id\">\n"
" <li><strong>Period:</strong> from <t t-out=\"object.voluntary_share_interest_return_id.start_date_period.strftime('%d/%m/%Y')\"></t> to <t t-out=\"object.voluntary_share_interest_return_id.end_date_period.strftime('%d/%m/%Y')\"></t></li>\n"
" </t>\n"
-" <li><strong>Total contribution:</strong> <t t-out=\"('%.2f'% object.voluntary_share_total_contribution).replace('.',',')\"></t>€</li>\n"
-" <li><strong>Total interest:</strong> <t t-out=\"('%.2f'% object.amount_untaxed).replace('.',',')\"></t>€</li>\n"
-" <li><strong>Taxes:</strong> <t t-out=\"('%.2f'% object.amount_tax).replace('.',',')\"></t>€</li>\n"
-" <li><strong>Total to receive:</strong> <t t-out=\"('%.2f'% object.amount_total).replace('.',',')\"></t>€</li>\n"
+" <li><strong>Total contribution:</strong> <t t-out=\"str('%.2f' | format(object.voluntary_share_total_contribution)).replace('.',',')\"></t>€</li>\n"
+" <li><strong>Total interest:</strong> <t t-out=\"str('%.2f' | format(object.amount_untaxed)).replace('.',',')\"></t>€</li>\n"
+" <li><strong>Taxes:</strong> <t t-out=\"str('%.2f' | format(object.amount_tax)).replace('.',',')\"></t>€</li>\n"
+" <li><strong>Total to receive:</strong> <t t-out=\"str('%.2f' | format(object.amount_total)).replace('.',',')\"></t>€</li>\n"
" </ul>\n"
" <br>\n"
" Don't hesitate to contact us at <a t-if=\"object.company_id.email\" t-att-href=\"object.company_id.email\"><t t-out=\"object.company_id.email\"></t></a> for any question you might have using the code: <t t-out=\"object.name\"></t><br>\n"
@@ -217,32 +166,30 @@ msgid ""
" </div>\n"
" "
msgstr ""
-"<div style=\"margin: 0px; padding: 0px;\">\n"
-" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-" Hola <t t-out=\"object.partner_id.firstname\"></t>,<br><br>\n"
-" Acabem de generar el document i l'ordre de pagament corresponent al retorn anual dels interessos de les teves aportacions voluntàries.<br>\n"
-" <t t-if=\"object.partner_bank_id.acc_number\">\n"
-" Properament rebràs el pagament al teu compte amb IBAN finalitzat en: <t t-out=\"object.partner_bank_id.acc_number[-4:]\"></t><br><br>.\n"
-" </t>\n"
-" <t t-else=\"\">\n"
-" Properament rebràs el pagament al teu compte.<br><br>\n"
-" </t>\n"
-" El resum de l'operació:<br>\n"
-" <ul>\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+" <p><t t-out=\"object.partner_id.firstname\"></t>,</p><br/>\n"
+" <p>Acabem de generar el document i l'ordre de pagament corresponent al retorn anual dels interessos de les teves aportacions voluntàries.</p>\n"
+" <t t-if=\"object.partner_bank_id.acc_number\">\n"
+" <p>Properament rebràs el pagament al teu compte amb IBAN finalitzat en: <t t-out=\"object.partner_bank_id.acc_number[-4:]\"></t>.\n"
+" <t t-else=\"\">\n"
+" <p>Properament rebràs el pagament al teu compte.\n"
+" </t>\n"
+" <p>El resum de l'operació:</p>\n"
+" <p></p>\n"
+" <p><ul>\n"
" <t t-if=\"object.voluntary_share_interest_return_id\">\n"
-" <li><strong>Període:</strong> from <t t-out=\"object.voluntary_share_interest_return_id.start_date_period.strftime('%d/%m/%Y')\"></t> to <t t-out=\"object.voluntary_share_interest_return_id.end_date_period.strftime('%d/%m/%Y')\"></t></li>\n"
-" </t>\n"
-" <li><strong>Total de la teva aportació:</strong> <t t-out=\"('%.2f'% object.voluntary_share_total_contribution).replace('.',',')\"></t>€</li>\n"
-" <li><strong>Interessos generats:</strong> <t t-out=\"('%.2f'% object.amount_untaxed).replace('.',',')\"></t>€</li>\n"
-" <li><strong>Impostos (IRPF 19%):</strong> <t t-out=\"('%.2f'% object.amount_tax).replace('.',',')\"></t>€</li>\n"
-" <li><strong>Total a ingressar:</strong> <t t-out=\"('%.2f'% object.amount_total).replace('.',',')\"></t>€</li>\n"
-" </ul>\n"
-" <br>\n"
-" No dubtis a contactar amb nosaltres a <a t-if=\"object.company_id.email\" t-att-href=\"object.company_id.email\"><t t-out=\"object.company_id.email\"></t></a> per qualsevol dubte, fent servir la referència: <t t-out=\"object.name\"></t><br>\n"
-" Gràcies a les aportacions com la teva, la cooperativa finança projectes i pot generar cada vegada més energia provinent de fonts renovables.<br><br>\n"
-" Atentament,<br>\n"
-" </p>\n"
-" </div>\n"
+" <li><strong>Període:</strong> desde <t t-out=\"object.voluntary_share_interest_return_id.start_date_period.strftime('%d/%m/%Y')\"></t> fins al <t t-out=\"object.voluntary_share_interest_return_id.end_date_period.strftime('%d/%m/%Y')\"></t></li>\n"
+" </t>\n"
+" <li><strong>Total de la teva aportació:</strong> <t t-out=\"str('%.2f' | format(object.voluntary_share_total_contribution)).replace('.',',')\"></t>€</li>\n"
+" <li><strong>Interessos generats:</strong> <t t-out=\"str('%.2f' | format(object.amount_untaxed)).replace('.',',')\"></t>€</li>\n"
+" <li><strong>Impostos (IRPF 19%):</strong> <t t-out=\"str('%.2f' | format(object.amount_tax)).replace('.',',')\"></t>€</li>\n"
+" <li><strong>Total a ingressar:</strong> <t t-out=\"str('%.2f' | format(object.amount_total)).replace('.',',')\"></t>€</li>\n"
+" </ul></p>\n"
+" <p>No dubtis a contactar amb nosaltres a <a t-if=\"object.company_id.email\" t-att-href=\"object.company_id.email\"><t t-out=\"object.company_id.email\"></t></a> per qualsevol dubte, fent servir la referència: <t t-out=\"object.name\"></t></p>\n"
+" <p>Gràcies a les aportacions com la teva, la cooperativa finança projectes i pot generar cada vegada més energia provinent de fonts renovables.<p>\n"
+" <p>Atentament,</p>\n"
+" </div>\n"
+" \n"
" "
#. module: energy_communities_cooperator
@@ -339,6 +286,12 @@ msgstr "Companyies autoritzades"
msgid "Attachment Count"
msgstr "Número d'adjunts"
+#. module: energy_communities_cooperator
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_res_partner__no_member_autorized_in_energy_actions
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_res_users__no_member_autorized_in_energy_actions
+msgid "Authorized guest"
+msgstr "Convidat autoritzat"
+
#. module: energy_communities_cooperator
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.iban_template_es_ccee
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.voluntary_shares_template
@@ -431,8 +384,8 @@ msgstr "Contacte"
#. module: energy_communities_cooperator
#: model:mail.template,subject:energy_communities_cooperator.email_template_confirmation_voluntary_share
msgid ""
-"Contribute to {{object.company_id.comercial_name or object.company_id."
-"name}} Ref. ACSV{{object.id}}"
+"Contribute to {{object.company_id.comercial_name or object.company_id.name}}"
+" Ref. ACSV{{object.id}}"
msgstr ""
"Confirmació recepció sol·licitud d'aportació voluntària amb Ref. "
"ACSV{{object.id}}"
@@ -536,13 +489,6 @@ msgstr "Mostrar Nom"
msgid "Draft"
msgstr "Esborrany"
-#. module: energy_communities_cooperator
-#. odoo-python
-#: code:addons/energy_communities_cooperator/wizards/voluntary_share_interest_return.py:0
-#, python-format
-msgid "ERROR on Invoice {}. No related membership defined"
-msgstr "ERROR a factura {}. No existeix una membresia relacionada"
-
#. module: energy_communities_cooperator
#. odoo-python
#: code:addons/energy_communities_cooperator/wizards/voluntary_share_interest_return.py:0
@@ -571,8 +517,8 @@ msgid ""
"ERROR on Membership {membership_id}. More than one related invoice line for "
"voluntary share {share_id}"
msgstr ""
-"ERROR a la membresia {membership_id}. Més d'una línia de factura "
-"relacionada per a l'aportació {share_id}"
+"ERROR a la membresia {membership_id}. Més d'una línia de factura relacionada"
+" per a l'aportació {share_id}"
#. module: energy_communities_cooperator
#. odoo-python
@@ -597,6 +543,7 @@ msgstr ""
#. module: energy_communities_cooperator
#. odoo-python
#: code:addons/energy_communities_cooperator/wizards/voluntary_share_interest_return.py:0
+#: code:addons/energy_communities_cooperator/wizards/voluntary_share_interest_return.py:0
#, python-format
msgid "ERROR on partner {}. Related membership not found"
msgstr "ERROR al contacte {}. No hem trobat una membresia relacionada."
@@ -622,6 +569,16 @@ msgstr "El correu electrònic i el de confirmació no coincideixen."
msgid "Email not found"
msgstr "Email no trobat"
+#. module: energy_communities_cooperator
+#: model:ir.model.fields,help:energy_communities_cooperator.field_res_partner__no_member_autorized_in_energy_actions
+#: model:ir.model.fields,help:energy_communities_cooperator.field_res_users__no_member_autorized_in_energy_actions
+msgid ""
+"Enable the contact to participate in Community Energy Actions despite not "
+"being an effective member of the Community."
+msgstr ""
+"Habiliteu el contacte per participar en Accions d'Energia Comunitària tot i no"
+" ser un membre efectiu de la Comunitat."
+
#. module: energy_communities_cooperator
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.view_voluntary_share_interest_return_wizard_form
msgid "Execute"
@@ -679,6 +636,9 @@ msgid "I prefer to not share it"
msgstr "Prefereixo no compartir-ho"
#. module: energy_communities_cooperator
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_share_line__company_id_id
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_share_line__partner_id_id
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_share_line__share_product_id_id
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_voluntary_share_interest_return__id
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_voluntary_share_interest_return_wizard__id
msgid "ID"
@@ -792,6 +752,11 @@ msgstr "Darrera actualització per"
msgid "Last Updated on"
msgstr "Darrera actualització el"
+#. module: energy_communities_cooperator
+#: model:ir.model,name:energy_communities_cooperator.model_crm_lead
+msgid "Lead/Opportunity"
+msgstr "Iniciativa/Oportunitat"
+
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_cooperative_membership__representative
msgid "Legal Representative"
@@ -847,6 +812,9 @@ msgstr "No binari"
#. module: energy_communities_cooperator
#. odoo-python
#: code:addons/energy_communities_cooperator/controllers/website_subscription_main.py:0
+#: code:addons/energy_communities_cooperator/controllers/website_subscription_main.py:0
+#: code:addons/energy_communities_cooperator/controllers/website_subscription_main.py:0
+#: code:addons/energy_communities_cooperator/controllers/website_subscription_voluntary_share.py:0
#: code:addons/energy_communities_cooperator/controllers/website_subscription_voluntary_share.py:0
#, python-format
msgid "Not valid parameter value [odoo_company_id]"
@@ -899,8 +867,7 @@ msgstr "Socis antics"
#. module: energy_communities_cooperator
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.main_form_template_ccee
msgid ""
-"Once you are a member you can enjoy the services available from the "
-"community and be part of a movement\n"
+"Once you are a member you can enjoy the services available from the community and be part of a movement\n"
" of social and energy model transformation."
msgstr ""
"Una vegada siguis soci/a podràs gaudir dels serveis disponibles de la "
@@ -916,6 +883,11 @@ msgstr ""
"Un cop rebuda la teva sol·licitud, rebràs un correu electrònic de "
"confirmació amb les instruccions a seguir."
+#. module: energy_communities_cooperator
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_account_multicompany_easy_creation_wiz__parent_id_id
+msgid "Parent Id"
+msgstr ""
+
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_cooperative_membership__partner_id
msgid "Partner"
@@ -924,6 +896,10 @@ msgstr "Contacte"
#. module: energy_communities_cooperator
#. odoo-python
#: code:addons/energy_communities_cooperator/controllers/website_subscription_voluntary_share.py:0
+#: code:addons/energy_communities_cooperator/controllers/website_subscription_voluntary_share.py:0
+#: code:addons/energy_communities_cooperator/controllers/website_subscription_voluntary_share.py:0
+#: code:addons/energy_communities_cooperator/controllers/website_subscription_voluntary_share.py:0
+#: code:addons/energy_communities_cooperator/controllers/website_subscription_voluntary_share.py:0
#, python-format
msgid "Partner not found"
msgstr "Contacte no trobat"
@@ -1025,6 +1001,11 @@ msgstr "Plantilla de producte aportació"
msgid "Provided IBAN is not valid."
msgstr "L'IBAN proporcionat no és vàlid."
+#. module: energy_communities_cooperator
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_share_line__related_invoice_line
+msgid "Related invoice line"
+msgstr ""
+
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_account_bank_statement_line__membership_id
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_account_move__membership_id
@@ -1066,8 +1047,8 @@ msgstr "Enviar"
#. module: energy_communities_cooperator
#: model:mail.template,description:energy_communities_cooperator.email_template_conditions_voluntary_share
msgid ""
-"Sent to cooperators after its voluntary share have been received, with "
-"share voluntary conditions and certificate in attachment"
+"Sent to cooperators after its voluntary share have been received, with share"
+" voluntary conditions and certificate in attachment"
msgstr ""
"Correu que s'envia a les sòcies per informar-les que hem rebut correctament "
"l'ingrés de la seva aportació voluntària al capital social"
@@ -1108,6 +1089,14 @@ msgstr "Tipus aportació"
msgid "Some mandatory fields have not been filled."
msgstr "Alguns camps obligatoris no s'han omplert."
+#. module: energy_communities_cooperator
+#. odoo-python
+#: code:addons/energy_communities_cooperator/models/res_users.py:0
+#, python-format
+msgid ""
+"Something went wrong. Probably there is no website defined for company: {}"
+msgstr ""
+
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_voluntary_share_interest_return__state
msgid "State"
@@ -1178,8 +1167,8 @@ msgid ""
"This account will be the default one as the receivable account for the "
"cooperators"
msgstr ""
-"Aquest serà el compte per defecte per al cobrament de les aportacions de "
-"les sòcies"
+"Aquest serà el compte per defecte per al cobrament de les aportacions de les"
+" sòcies"
#. module: energy_communities_cooperator
#. odoo-python
@@ -1239,6 +1228,29 @@ msgstr ""
msgid "Total contribution"
msgstr "Aportació total"
+#. module: energy_communities_cooperator
+#. odoo-python
+#: code:addons/energy_communities_cooperator/models/res_users.py:0
+#, python-format
+msgid ""
+"Trying to create user from partner ID {partner_id} but user ID {user_id} is "
+"using the vat. Contact your system administrator if you have questions."
+msgstr ""
+
+#. module: energy_communities_cooperator
+#. odoo-python
+#: code:addons/energy_communities_cooperator/models/res_users.py:0
+#, python-format
+msgid ""
+"Trying to create user from partner ID {} but the partner doesn't have VAT "
+"defined"
+msgstr ""
+
+#. module: energy_communities_cooperator
+#: model:ir.model,name:energy_communities_cooperator.model_res_users
+msgid "User"
+msgstr "Usuaris"
+
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_account_move__user_current_company
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_cooperative_membership__user_current_company
@@ -1309,8 +1321,8 @@ msgstr "Formulari d'aportació voluntària per ensenyar a la web"
#: model:mail.template,name:energy_communities_cooperator.email_template_voluntary_share_interest_return
msgid "Voluntary shares interest return email"
msgstr ""
-"Correu d'avís de la imminent devolució dels interessos annuals "
-"d'aportacions voluntàries"
+"Correu d'avís de la imminent devolució dels interessos annuals d'aportacions"
+" voluntàries"
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_res_company__voluntary_share_journal_account
@@ -1320,8 +1332,9 @@ msgstr "Diari per a aportacions voluntàries"
#. module: energy_communities_cooperator
#: model:mail.template,subject:energy_communities_cooperator.email_template_conditions_voluntary_share
msgid ""
-"Voluntary social capital contribution done to {{object.company_id."
-"comercial_name or object.company_id.name}} with Ref. ACSV{{object.id}}"
+"Voluntary social capital contribution done to "
+"{{object.company_id.comercial_name or object.company_id.name}} with Ref. "
+"ACSV{{object.id}}"
msgstr "Aportació voluntària amb Ref. ACSV{{object.id}} rebuda !"
#. module: energy_communities_cooperator
@@ -1347,11 +1360,11 @@ msgstr ""
#: code:addons/energy_communities_cooperator/models/voluntary_share_interest_return.py:0
#, python-format
msgid ""
-"We have sent the voluntary share interest return document to related "
-"members via email."
+"We have sent the voluntary share interest return document to related members"
+" via email."
msgstr ""
-"S'han enviat correctament per email els documents pel retorn dels "
-"interessos de les aportacions voluntàries."
+"S'han enviat correctament per email els documents pel retorn dels interessos"
+" de les aportacions voluntàries."
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_voluntary_share_interest_return__website_message_ids
@@ -1442,8 +1455,9 @@ msgid ""
"{{(object.name or \"voluntary_share_interest_return\").replace(\"/\", "
"\"_\")}}{{object.state == \"draft\" and \"_draft\" or \"\"}}"
msgstr ""
-"{{(object.name or \"devolucio_interessos_aportacions_voluntaries\")."
-"replace(\"/\", \"_\")}}{{object.state == \"draft\" and \"_draft\" or \"\"}}"
+"{{(object.name or "
+"\"devolucio_interessos_aportacions_voluntaries\").replace(\"/\", "
+"\"_\")}}{{object.state == \"draft\" and \"_draft\" or \"\"}}"
#. module: energy_communities_cooperator
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.main_form_template_ccee
diff --git a/energy_communities_cooperator/i18n/energy_communities_cooperator.pot b/energy_communities_cooperator/i18n/energy_communities_cooperator.pot
index b6791ab20..4cf990934 100644
--- a/energy_communities_cooperator/i18n/energy_communities_cooperator.pot
+++ b/energy_communities_cooperator/i18n/energy_communities_cooperator.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-29 10:19+0000\n"
-"PO-Revision-Date: 2024-11-29 10:19+0000\n"
+"POT-Creation-Date: 2025-01-30 14:18+0000\n"
+"PO-Revision-Date: 2025-01-30 14:18+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -201,6 +201,12 @@ msgstr ""
msgid "Attachment Count"
msgstr ""
+#. module: energy_communities_cooperator
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_res_partner__no_member_autorized_in_energy_actions
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_res_users__no_member_autorized_in_energy_actions
+msgid "Authorized guest"
+msgstr ""
+
#. module: energy_communities_cooperator
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.iban_template_es_ccee
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.voluntary_shares_template
@@ -394,13 +400,6 @@ msgstr ""
msgid "Draft"
msgstr ""
-#. module: energy_communities_cooperator
-#. odoo-python
-#: code:addons/energy_communities_cooperator/wizards/voluntary_share_interest_return.py:0
-#, python-format
-msgid "ERROR on Invoice {}. No related membership defined"
-msgstr ""
-
#. module: energy_communities_cooperator
#. odoo-python
#: code:addons/energy_communities_cooperator/wizards/voluntary_share_interest_return.py:0
@@ -471,6 +470,14 @@ msgstr ""
msgid "Email not found"
msgstr ""
+#. module: energy_communities_cooperator
+#: model:ir.model.fields,help:energy_communities_cooperator.field_res_partner__no_member_autorized_in_energy_actions
+#: model:ir.model.fields,help:energy_communities_cooperator.field_res_users__no_member_autorized_in_energy_actions
+msgid ""
+"Enable the contact to participate in Community Energy Actions despite not "
+"being an effective member of the Community."
+msgstr ""
+
#. module: energy_communities_cooperator
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.view_voluntary_share_interest_return_wizard_form
msgid "Execute"
@@ -526,6 +533,9 @@ msgid "I prefer to not share it"
msgstr ""
#. module: energy_communities_cooperator
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_share_line__company_id_id
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_share_line__partner_id_id
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_share_line__share_product_id_id
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_voluntary_share_interest_return__id
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_voluntary_share_interest_return_wizard__id
msgid "ID"
@@ -638,6 +648,11 @@ msgstr ""
msgid "Last Updated on"
msgstr ""
+#. module: energy_communities_cooperator
+#: model:ir.model,name:energy_communities_cooperator.model_crm_lead
+msgid "Lead/Opportunity"
+msgstr ""
+
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_cooperative_membership__representative
msgid "Legal Representative"
@@ -757,6 +772,11 @@ msgid ""
"the instructions to follow."
msgstr ""
+#. module: energy_communities_cooperator
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_account_multicompany_easy_creation_wiz__parent_id_id
+msgid "Parent Id"
+msgstr ""
+
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_cooperative_membership__partner_id
msgid "Partner"
@@ -870,6 +890,11 @@ msgstr ""
msgid "Provided IBAN is not valid."
msgstr ""
+#. module: energy_communities_cooperator
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_share_line__related_invoice_line
+msgid "Related invoice line"
+msgstr ""
+
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_account_bank_statement_line__membership_id
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_account_move__membership_id
@@ -949,6 +974,14 @@ msgstr ""
msgid "Some mandatory fields have not been filled."
msgstr ""
+#. module: energy_communities_cooperator
+#. odoo-python
+#: code:addons/energy_communities_cooperator/models/res_users.py:0
+#, python-format
+msgid ""
+"Something went wrong. Probably there is no website defined for company: {}"
+msgstr ""
+
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_voluntary_share_interest_return__state
msgid "State"
@@ -1059,6 +1092,29 @@ msgstr ""
msgid "Total contribution"
msgstr ""
+#. module: energy_communities_cooperator
+#. odoo-python
+#: code:addons/energy_communities_cooperator/models/res_users.py:0
+#, python-format
+msgid ""
+"Trying to create user from partner ID {partner_id} but user ID {user_id} is "
+"using the vat. Contact your system administrator if you have questions."
+msgstr ""
+
+#. module: energy_communities_cooperator
+#. odoo-python
+#: code:addons/energy_communities_cooperator/models/res_users.py:0
+#, python-format
+msgid ""
+"Trying to create user from partner ID {} but the partner doesn't have VAT "
+"defined"
+msgstr ""
+
+#. module: energy_communities_cooperator
+#: model:ir.model,name:energy_communities_cooperator.model_res_users
+msgid "User"
+msgstr ""
+
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_account_move__user_current_company
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_cooperative_membership__user_current_company
diff --git a/energy_communities_cooperator/i18n/es.po b/energy_communities_cooperator/i18n/es.po
index 9efdbc785..c0789a7a7 100644
--- a/energy_communities_cooperator/i18n/es.po
+++ b/energy_communities_cooperator/i18n/es.po
@@ -6,23 +6,20 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-29 10:19+0000\n"
-"PO-Revision-Date: 2024-12-03 22:14+0100\n"
+"POT-Creation-Date: 2025-01-30 14:17+0000\n"
+"PO-Revision-Date: 2025-01-30 14:17+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
-"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.4.2\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
#. module: energy_communities_cooperator
#: model:ir.model.fields,help:energy_communities_cooperator.field_subscription_request__vat
msgid ""
"\n"
-" The Tax Identification Number. Complete it if the contact is "
-"subjected to\n"
+" The Tax Identification Number. Complete it if the contact is subjected to\n"
" government taxes. Used in some legal statements.\"\n"
" "
msgstr ""
@@ -35,44 +32,29 @@ msgstr ""
#: model:mail.template,body_html:energy_communities_cooperator.email_template_confirmation_voluntary_share
msgid ""
"<div style=\"margin: 0px; padding: 0px;\">\n"
-" <p style=\"margin: 0px; padding: 0px; font-size: 13px;"
-"\">\n"
+" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
" Dear <t t-out=\"object.firstname\"></t>,<br><br>\n"
-" We confirm that we have correctly received your "
-"request to make a voluntary contribution to the capital social of <b><t t-"
-"out=\"object.company_id.name\"></t></b>, with the following data:<br><br>\n"
+" We confirm that we have correctly received your request to make a voluntary contribution to the capital social of <b><t t-out=\"object.company_id.name\"></t></b>, with the following data:<br><br>\n"
" <ul>\n"
-" <li>Partner VAT: <b><t t-out=\"object.vat\"></"
-"t></b></li>\n"
-" <li>Partner name: <b><t t-out=\"object."
-"firstname\"></t> <t t-out=\"object.lastname\"></t></b></li>\n"
-" <li>Charging account finished on: <b><t t-"
-"out=\"object.iban[-4:]\"></t></b></li>\n"
-" <li>Subscription amount: <b><t t-out=\"object."
-"subscription_amount\"></t> €</b></li>\n"
+" <li>Partner VAT: <b><t t-out=\"object.vat\"></t></b></li>\n"
+" <li>Partner name: <b><t t-out=\"object.firstname\"></t> <t t-out=\"object.lastname\"></t></b></li>\n"
+" <li>Charging account finished on: <b><t t-out=\"object.iban[-4:]\"></t></b></li>\n"
+" <li>Subscription amount: <b><t t-out=\"object.subscription_amount\"></t> €</b></li>\n"
" </ul>\n"
" <br>\n"
-" In the next few days you will receive the bank "
-"charge in this account, please verify that all the data\n"
-" provided is correct and you have the money you want "
-"to invest, to avoid any incident in the\n"
+" In the next few days you will receive the bank charge in this account, please verify that all the data\n"
+" provided is correct and you have the money you want to invest, to avoid any incident in the\n"
" draft of the receipt.\n"
" <br><br>\n"
-" Once the validity of the payment has been verified, "
-"you will receive a new notification confirming the contribution made.\n"
+" Once the validity of the payment has been verified, you will receive a new notification confirming the contribution made.\n"
" <br><br>\n"
-" Thank you for your involvement and we inform you "
-"that for any doubt or clarification you can\n"
+" Thank you for your involvement and we inform you that for any doubt or clarification you can\n"
" <t t-if=\"object.company_id.website\">\n"
-" consult our website: <a t-if=\"object.company_id."
-"website\" t-att-href=\"object.company_id.website\"><t t-out=\"object."
-"company_id.website\"></t></a>\n"
+" consult our website: <a t-if=\"object.company_id.website\" t-att-href=\"object.company_id.website\"><t t-out=\"object.company_id.website\"></t></a>\n"
" or\n"
-" </t> send us an email to <t t-out=\"object."
-"company_id.email\"></t>.\n"
+" </t> send us an email to <t t-out=\"object.company_id.email\"></t>.\n"
" <br><br>\n"
-" Get the word out by explaining the project to "
-"family and friends. The more we are, the further we will go!\n"
+" Get the word out by explaining the project to family and friends. The more we are, the further we will go!\n"
" <br>\n"
" Thank you very much and good energy!\n"
" <br><br>\n"
@@ -84,44 +66,28 @@ msgid ""
msgstr ""
"<p>Apreciado/a <t t-out=\"object.firstname\"></t>,</p>\n"
" <p>\n"
-"Te confirmamos que hemos recibido correctamente tu solicitud para realizar "
-"una aportación voluntaria al capital social de <b style=\"font-weight:"
-"bolder;\"><t t-out=\"object.company_id.comercial_name or object.company_id."
-"name\"></t></b>, con los siguientes datos:\n"
+"Te confirmamos que hemos recibido correctamente tu solicitud para realizar una aportación voluntaria al capital social de <b style=\"font-weight:bolder;\"><t t-out=\"object.company_id.comercial_name or object.company_id.name\"></t></b>, con los siguientes datos:\n"
" </p>\n"
" <ul style=\"margin:0px 0 1rem 0;\">\n"
-" <li>Socio/a NIF: <b style=\"font-weight:bolder;\"><t t-out=\"object."
-"vat\"></t></b></li>\n"
-" <li>Socio/a: <b style=\"font-weight:bolder;\"><t t-out=\"object."
-"firstname\"></t> <t t-out=\"object.lastname\"></t></b></li>\n"
-" <li>Cuenta de cargo: <b style=\"font-weight:bolder;\"><t t-"
-"out=\"object.iban\"></t></b></li>\n"
-" <li>Importe aportación: <b style=\"font-weight:bolder;\"><t t-"
-"out=\"object.subscription_amount\"></t>€</b></li>\n"
+" <li>Socio/a NIF: <b style=\"font-weight:bolder;\"><t t-out=\"object.vat\"></t></b></li>\n"
+" <li>Socio/a: <b style=\"font-weight:bolder;\"><t t-out=\"object.firstname\"></t> <t t-out=\"object.lastname\"></t></b></li>\n"
+" <li>Cuenta de cargo: <b style=\"font-weight:bolder;\"><t t-out=\"object.iban\"></t></b></li>\n"
+" <li>Importe aportación: <b style=\"font-weight:bolder;\"><t t-out=\"object.subscription_amount\"></t>€</b></li>\n"
" </ul>\n"
" <p>\n"
-"En los próximos días recibirás el cargo bancario en esta cuenta, por favor "
-"verifica que todos los datos facilitados sean correctos y dispones del "
-"dinero que quieres invertir, para evitar cualquier incidencia en el giro "
-"del recibo.\n"
+"En los próximos días recibirás el cargo bancario en esta cuenta, por favor verifica que todos los datos facilitados sean correctos y dispones del dinero que quieres invertir, para evitar cualquier incidencia en el giro del recibo.\n"
" </p>\n"
" <p>\n"
-"Una vez verificada la validez del pago realizado recibirás una nueva "
-"notificación confirmando la aportación realizada y detallando las "
-"condiciones particulares de tu aportación.\n"
+"Una vez verificada la validez del pago realizado recibirás una nueva notificación confirmando la aportación realizada y detallando las condiciones particulares de tu aportación.\n"
" </p>\n"
" <p>\n"
-"Agradecer tu implicación con la cooperativa y informarte que para cualquier "
-"duda o aclaración puedes consultar nuestra web \n"
-" <a t-if=\"object.company_id.website\" t-att-href=\"object."
-"company_id.website\"><t t-out=\"object.company_id.website\"></t></a>\n"
+"Agradecer tu implicación con la cooperativa y informarte que para cualquier duda o aclaración puedes consultar nuestra web \n"
+" <a t-if=\"object.company_id.website\" t-att-href=\"object.company_id.website\"><t t-out=\"object.company_id.website\"></t></a>\n"
" o enviarnos un correo electrónico a\n"
-" <a t-att-href=\"object.company_id.email\"><t t-out=\"object."
-"company_id.email\"></t></a>\n"
+" <a t-att-href=\"object.company_id.email\"><t t-out=\"object.company_id.email\"></t></a>\n"
" </p>\n"
" <p>\n"
-"Haz que corra la voz explicando el proyecto a familiares y amigos/as. "
-"Cuantos más seamos, más lejos llegaremos!\n"
+"Haz que corra la voz explicando el proyecto a familiares y amigos/as. Cuantos más seamos, más lejos llegaremos!\n"
" </p>\n"
" <p>\n"
"¡Muchas gracias y buena energía!\n"
@@ -135,21 +101,12 @@ msgstr ""
#: model:mail.template,body_html:energy_communities_cooperator.email_template_conditions_voluntary_share
msgid ""
"<div style=\"margin: 0px; padding: 0px;\">\n"
-" <p style=\"margin: 0px; padding: 0px; font-size: 13px;"
-"\">\n"
+" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
" Hello <t t-out=\"object.name\"></t>,<br><br>\n"
-" Recently we have allready charged your account the "
-"amount corresponding to your voluntary contribution to the share capital of "
-"<b><t t-out=\"object.company_id.comercial_name or object.company_id."
-"name\"></t></b>.<br><br>\n"
-" We take this opportunity to <b>thank you</b>, once "
-"again, for your involvement with the objective to promote actions and "
-"projects that contribute to an energy and social transition.<br><br>\n"
-" Please find in attachment your <t t-out=\"object."
-"company_id.comercial_name or object.company_id.name\"></t> cooperator "
-"certificate.<br><br>\n"
-" Get the word out by explaining the project to family "
-"and friends. The more we are, the further we will go!<br><br>\n"
+" Recently we have allready charged your account the amount corresponding to your voluntary contribution to the share capital of <b><t t-out=\"object.company_id.comercial_name or object.company_id.name\"></t></b>.<br><br>\n"
+" We take this opportunity to <b>thank you</b>, once again, for your involvement with the objective to promote actions and projects that contribute to an energy and social transition.<br><br>\n"
+" Please find in attachment your <t t-out=\"object.company_id.comercial_name or object.company_id.name\"></t> cooperator certificate.<br><br>\n"
+" Get the word out by explaining the project to family and friends. The more we are, the further we will go!<br><br>\n"
" We keep in touch for any questions.<br><br>\n"
" Yours faithfully,<br>\n"
" </p>\n"
@@ -158,31 +115,20 @@ msgid ""
msgstr ""
"<p>Apreciado/a ${object.firstname} <t t-out=\"object.firstname\"></t>,</p>\n"
" <p>\n"
-" Te confirmamos que ya hemos hecho el cargo a tu cuenta bancaria "
-"correspondiente a tu aportación voluntaria al capital social de la "
-"cooperativa \n"
-" <b><t t-out=\"object.company_id.comercial_name or object.company_id."
-"name\"></t></b>.\n"
+" Te confirmamos que ya hemos hecho el cargo a tu cuenta bancaria correspondiente a tu aportación voluntaria al capital social de la cooperativa \n"
+" <b><t t-out=\"object.company_id.comercial_name or object.company_id.name\"></t></b>.\n"
" </p>\n"
" <p>\n"
-" Quedamos a tu disposición para cualquier duda o aclaración en "
-"relación a la aportación realizada a través de nuestro correo electrónico \n"
-" <a t-att-href=\"object.company_id.email\"><t t-out=\"object."
-"company_id.email\"></t></a> o consultando la web \n"
-" <a t-att-href=\"object.company_id.website\"><t t-out=\"object."
-"company_id.website\"></t></a>.\n"
+" Quedamos a tu disposición para cualquier duda o aclaración en relación a la aportación realizada a través de nuestro correo electrónico \n"
+" <a t-att-href=\"object.company_id.email\"><t t-out=\"object.company_id.email\"></t></a> o consultando la web \n"
+" <a t-att-href=\"object.company_id.website\"><t t-out=\"object.company_id.website\"></t></a>.\n"
" </p>\n"
" <p>\n"
-" Aprovechamos para agradecerte, una vez más, tu implicación con el "
-"objetivo de <b><t t-out=\"object.company_id.comercial_name or object."
-"company_id.name\"></t></b>\n"
-" para impulsar aquellas acciones o proyectos que contribuyan a una "
-"transición energética, económica y social en <t t-out=\"object.company_id."
-"city\"></t>.\n"
+" Aprovechamos para agradecerte, una vez más, tu implicación con el objetivo de <b><t t-out=\"object.company_id.comercial_name or object.company_id.name\"></t></b>\n"
+" para impulsar aquellas acciones o proyectos que contribuyan a una transición energética, económica y social en <t t-out=\"object.company_id.city\"></t>.\n"
" </p>\n"
" <p>\n"
-"Haz que corra la voz explicando el proyecto a familiares y amigos/as. "
-"Cuantos/as más seamos, más lejos podremos llegar.\n"
+"Haz que corra la voz explicando el proyecto a familiares y amigos/as. Cuantos/as más seamos, más lejos podremos llegar.\n"
" </p>\n"
" <p>\n"
"¡Muchas gracias y buena energía!\n"
@@ -210,10 +156,10 @@ msgid ""
" <t t-if=\"object.voluntary_share_interest_return_id\">\n"
" <li><strong>Period:</strong> from <t t-out=\"object.voluntary_share_interest_return_id.start_date_period.strftime('%d/%m/%Y')\"></t> to <t t-out=\"object.voluntary_share_interest_return_id.end_date_period.strftime('%d/%m/%Y')\"></t></li>\n"
" </t>\n"
-" <li><strong>Total contribution:</strong> <t t-out=\"('%.2f'% object.voluntary_share_total_contribution).replace('.',',')\"></t>€</li>\n"
-" <li><strong>Total interest:</strong> <t t-out=\"('%.2f'% object.amount_untaxed).replace('.',',')\"></t>€</li>\n"
-" <li><strong>Taxes:</strong> <t t-out=\"('%.2f'% object.amount_tax).replace('.',',')\"></t>€</li>\n"
-" <li><strong>Total to receive:</strong> <t t-out=\"('%.2f'% object.amount_total).replace('.',',')\"></t>€</li>\n"
+" <li><strong>Total contribution:</strong> <t t-out=\"str('%.2f' | format(object.voluntary_share_total_contribution)).replace('.',',')\"></t>€</li>\n"
+" <li><strong>Total interest:</strong> <t t-out=\"str('%.2f' | format(object.amount_untaxed)).replace('.',',')\"></t>€</li>\n"
+" <li><strong>Taxes:</strong> <t t-out=\"str('%.2f' | format(object.amount_tax)).replace('.',',')\"></t>€</li>\n"
+" <li><strong>Total to receive:</strong> <t t-out=\"str('%.2f' | format(object.amount_total)).replace('.',',')\"></t>€</li>\n"
" </ul>\n"
" <br>\n"
" Don't hesitate to contact us at <a t-if=\"object.company_id.email\" t-att-href=\"object.company_id.email\"><t t-out=\"object.company_id.email\"></t></a> for any question you might have using the code: <t t-out=\"object.name\"></t><br>\n"
@@ -223,32 +169,29 @@ msgid ""
" </div>\n"
" "
msgstr ""
-"<div style=\"margin: 0px; padding: 0px;\">\n"
-" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-" Hola <t t-out=\"object.partner_id.firstname\"></t>,<br><br>\n"
-" Acabamos de generar el documento y la orden de pago correspondiente al retorno anual de los intereses de tus aportaciones voluntarias.<br>\n"
-" <t t-if=\"object.partner_bank_id.acc_number\">\n"
-" Próximamente recibirás el pago en tu cuenta con IBAN finalizado en: <t t-out=\"object.partner_bank_id.acc_number[-4:]\"></t><br><br>.\n"
-" </t>\n"
-" <t t-else=\"\">\n"
-" Próximamente recibirás el pago en tu cuenta.<br><br>\n"
-" </t>\n"
-" El resumen de la operación:<br>\n"
-" <ul>\n"
-" <t t-if=\"object.voluntary_share_interest_return_id\">\n"
-" <li><strong>Periodo:</strong> desde <t t-out=\"object.voluntary_share_interest_return_id.start_date_period.strftime('%d/%m/%Y')\"></t> hasta el <t t-out=\"object.voluntary_share_interest_return_id.end_date_period.strftime('%d/%m/%Y')\"></t></li>\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+" <p>Hola <t t-out=\"object.partner_id.firstname\"></t>,</p><br/>\n"
+" <p>Acabamos de generar el documento y la orden de pago correspondiente al retorno anual de los intereses de tus aportaciones voluntarias.</p>\n"
+" <t t-if=\"object.partner_bank_id.acc_number\">\n"
+" <p>Próximamente recibirás el pago en tu cuenta con IBAN finalizado en: <t t-out=\"object.partner_bank_id.acc_number[-4:]\"></t>.\n"
+" <t t-else=\"\">\n"
+" <p>Próximamente recibirás el pago en tu cuenta.\n"
" </t>\n"
-" <li><strong>Total de tu aportación:</strong> <t t-out=\"('%.2f'% object.voluntary_share_total_contribution).replace('.',',')\"></t>€</li>\n"
-" <li><strong>Intereses generados:</strong> <t t-out=\"('%.2f'% object.amount_untaxed).replace('.',',')\"></t>€</li>\n"
-" <li><strong>Impuestos (IRPF 19%):</strong> <t t-out=\"('%.2f'% object.amount_tax).replace('.',',')\"></t>€</li>\n"
-" <li><strong>Total a ingresar:</strong> <t t-out=\"('%.2f'% object.amount_total).replace('.',',')\"></t>€</li>\n"
-" </ul>\n"
-" <br>\n"
-" No dudes en contactar con nosotros en <a t-if=\"object.company_id.email\" t-att-href=\"object.company_id.email\"><t t-out=\"object.company_id.email\"></t></a> para cualquier duda, utilizando la referencia: <t t-out=\"object.name\"></t><br>\n"
-" Gracias a las aportaciones como la tuya, la cooperativa financia proyectos y puede generar cada vez más energía proveniente de fuentes renovables.<br><br>\n"
-" Atentamente,<br>\n"
-" </p>\n"
-" </div>\n"
+" <p>El resumen de la operación:</p>\n"
+" <p></p>\n"
+" <p><ul>\n"
+" <t t-if=\"object.voluntary_share_interest_return_id\">\n"
+" <li><strong>Periodo:</strong> desde <t t-out=\"object.voluntary_share_interest_return_id.start_date_period.strftime('%d/%m/%Y')\"></t> hasta el <t t-out=\"object.voluntary_share_interest_return_id.end_date_period.strftime('%d/%m/%Y')\"></t></li>\n"
+" </t>\n"
+" <li><strong>Total de tu aportación:</strong> <t t-out=\"str('%.2f' | format(object.voluntary_share_total_contribution)).replace('.',',')\"></t>€</li>\n"
+" <li><strong>Intereses generados:</strong> <t t-out=\"str('%.2f' | format(object.amount_untaxed)).replace('.',',')\"></t>€</li>\n"
+" <li><strong>Impuestos (IRPF 19%):</strong> <t t-out=\"str('%.2f' | format(object.amount_tax)).replace('.',',')\"></t>€</li>\n"
+" <li><strong>Total a ingresar:</strong> <t t-out=\"str('%.2f' | format(object.amount_total)).replace('.',',')\"></t>€</li>\n"
+" </ul></p>\n"
+" <p>No dudes en contactar con nosotros en <a t-if=\"object.company_id.email\" t-att-href=\"object.company_id.email\"><t t-out=\"object.company_id.email\"></t></a> para cualquier duda, utilizando la referencia: <t t-out=\"object.name\"></t></p>\n"
+" <p>Gracias a las aportaciones como la tuya, la cooperativa financia proyectos y puede generar cada vez más energía proveniente de fuentes renovables.<p>\n"
+" <p>Atentamente,</p>\n"
+" </div>\n"
" "
#. module: energy_communities_cooperator
@@ -345,6 +288,12 @@ msgstr "Compañías permitidas"
msgid "Attachment Count"
msgstr "Número de adjuntos"
+#. module: energy_communities_cooperator
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_res_partner__no_member_autorized_in_energy_actions
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_res_users__no_member_autorized_in_energy_actions
+msgid "Authorized guest"
+msgstr "Invitado autorizado"
+
#. module: energy_communities_cooperator
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.iban_template_es_ccee
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.voluntary_shares_template
@@ -370,7 +319,7 @@ msgstr "Cancelar"
#. module: energy_communities_cooperator
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.view_voluntary_share_interest_return_wizard_form
msgid "Cancelar"
-msgstr "Cancelar"
+msgstr ""
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_product_product__mail_template
@@ -436,11 +385,11 @@ msgstr "Contacte"
#. module: energy_communities_cooperator
#: model:mail.template,subject:energy_communities_cooperator.email_template_confirmation_voluntary_share
msgid ""
-"Contribute to {{object.company_id.comercial_name or object.company_id."
-"name}} Ref. ACSV{{object.id}}"
+"Contribute to {{object.company_id.comercial_name or object.company_id.name}}"
+" Ref. ACSV{{object.id}}"
msgstr ""
-"Aportación voluntaria a {{object.company_id.comercial_name or object."
-"company_id.name}} Ref. ACSV{{object.id}}: Solicitud recibida"
+"Aportación voluntaria a {{object.company_id.comercial_name or "
+"object.company_id.name}} Ref. ACSV{{object.id}}: Solicitud recibida"
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_account_move_line__voluntary_share_contribution
@@ -541,13 +490,6 @@ msgstr "Nombre Mostrado"
msgid "Draft"
msgstr "Borrador"
-#. module: energy_communities_cooperator
-#. odoo-python
-#: code:addons/energy_communities_cooperator/wizards/voluntary_share_interest_return.py:0
-#, python-format
-msgid "ERROR on Invoice {}. No related membership defined"
-msgstr "ERROR en factura {}. No existe una membresía relacionada"
-
#. module: energy_communities_cooperator
#. odoo-python
#: code:addons/energy_communities_cooperator/wizards/voluntary_share_interest_return.py:0
@@ -597,12 +539,13 @@ msgstr ""
#, python-format
msgid "ERROR on Membership {}. No related invoice for voluntary share"
msgstr ""
-"ERROR en la membresía {}. No hemos encontrado una factura relacionada con "
-"la aportación"
+"ERROR en la membresía {}. No hemos encontrado una factura relacionada con la"
+" aportación"
#. module: energy_communities_cooperator
#. odoo-python
#: code:addons/energy_communities_cooperator/wizards/voluntary_share_interest_return.py:0
+#: code:addons/energy_communities_cooperator/wizards/voluntary_share_interest_return.py:0
#, python-format
msgid "ERROR on partner {}. Related membership not found"
msgstr ""
@@ -629,6 +572,16 @@ msgstr "El correo electrónico y el de confirmación no coinciden."
msgid "Email not found"
msgstr "Email no encontrado"
+#. module: energy_communities_cooperator
+#: model:ir.model.fields,help:energy_communities_cooperator.field_res_partner__no_member_autorized_in_energy_actions
+#: model:ir.model.fields,help:energy_communities_cooperator.field_res_users__no_member_autorized_in_energy_actions
+msgid ""
+"Enable the contact to participate in Community Energy Actions despite not "
+"being an effective member of the Community."
+msgstr ""
+"Permitir que la persona de contacto participe en las acciones comunitarias en el ámbito de la energía a pesar de no"
+" ser miembro efectivo de la Comunidad."
+
#. module: energy_communities_cooperator
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.view_voluntary_share_interest_return_wizard_form
msgid "Execute"
@@ -659,7 +612,7 @@ msgstr "Género"
#. module: energy_communities_cooperator
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.view_voluntary_share_interest_return_form
msgid "General"
-msgstr "General"
+msgstr ""
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_voluntary_share_interest_return__has_message
@@ -686,6 +639,9 @@ msgid "I prefer to not share it"
msgstr "Prefiero no compartirlo"
#. module: energy_communities_cooperator
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_share_line__company_id_id
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_share_line__partner_id_id
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_share_line__share_product_id_id
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_voluntary_share_interest_return__id
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_voluntary_share_interest_return_wizard__id
msgid "ID"
@@ -798,6 +754,11 @@ msgstr "Última actualización por"
msgid "Last Updated on"
msgstr "Última actualización el"
+#. module: energy_communities_cooperator
+#: model:ir.model,name:energy_communities_cooperator.model_crm_lead
+msgid "Lead/Opportunity"
+msgstr "Iniciativa/Oportunidad"
+
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_cooperative_membership__representative
msgid "Legal Representative"
@@ -853,6 +814,9 @@ msgstr "No binario"
#. module: energy_communities_cooperator
#. odoo-python
#: code:addons/energy_communities_cooperator/controllers/website_subscription_main.py:0
+#: code:addons/energy_communities_cooperator/controllers/website_subscription_main.py:0
+#: code:addons/energy_communities_cooperator/controllers/website_subscription_main.py:0
+#: code:addons/energy_communities_cooperator/controllers/website_subscription_voluntary_share.py:0
#: code:addons/energy_communities_cooperator/controllers/website_subscription_voluntary_share.py:0
#, python-format
msgid "Not valid parameter value [odoo_company_id]"
@@ -905,8 +869,7 @@ msgstr "Socios antiguos"
#. module: energy_communities_cooperator
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.main_form_template_ccee
msgid ""
-"Once you are a member you can enjoy the services available from the "
-"community and be part of a movement\n"
+"Once you are a member you can enjoy the services available from the community and be part of a movement\n"
" of social and energy model transformation."
msgstr ""
"Una vez ya seas socio/a podrás utilizar los servicios disponibles de la "
@@ -922,6 +885,11 @@ msgstr ""
"Una vez recibida tu petición recibirás un correo de confirmación con las "
"instrucciones a seguir."
+#. module: energy_communities_cooperator
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_account_multicompany_easy_creation_wiz__parent_id_id
+msgid "Parent Id"
+msgstr ""
+
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_cooperative_membership__partner_id
msgid "Partner"
@@ -930,6 +898,10 @@ msgstr "Contacto"
#. module: energy_communities_cooperator
#. odoo-python
#: code:addons/energy_communities_cooperator/controllers/website_subscription_voluntary_share.py:0
+#: code:addons/energy_communities_cooperator/controllers/website_subscription_voluntary_share.py:0
+#: code:addons/energy_communities_cooperator/controllers/website_subscription_voluntary_share.py:0
+#: code:addons/energy_communities_cooperator/controllers/website_subscription_voluntary_share.py:0
+#: code:addons/energy_communities_cooperator/controllers/website_subscription_voluntary_share.py:0
#, python-format
msgid "Partner not found"
msgstr "Contacto no encontrado"
@@ -998,7 +970,7 @@ msgstr "Teléfono"
#: code:addons/energy_communities_cooperator/controllers/website_subscription_main.py:0
#, python-format
msgid "Please upload a scan of your ID card."
-msgstr "Por favor sube una copia escaneada de tu tarjeta de identidad."
+msgstr "Por favor sube una copia escaneada de tu documento de identitat."
#. module: energy_communities_cooperator
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.view_voluntary_share_interest_return_form
@@ -1031,6 +1003,11 @@ msgstr "Plantilla de producto aportación"
msgid "Provided IBAN is not valid."
msgstr "El IBAN proporcionado no es válido."
+#. module: energy_communities_cooperator
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_share_line__related_invoice_line
+msgid "Related invoice line"
+msgstr ""
+
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_account_bank_statement_line__membership_id
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_account_move__membership_id
@@ -1072,8 +1049,8 @@ msgstr "Enviar"
#. module: energy_communities_cooperator
#: model:mail.template,description:energy_communities_cooperator.email_template_conditions_voluntary_share
msgid ""
-"Sent to cooperators after its voluntary share have been received, with "
-"share voluntary conditions and certificate in attachment"
+"Sent to cooperators after its voluntary share have been received, with share"
+" voluntary conditions and certificate in attachment"
msgstr ""
"Enviado a los miembros una vez la aportación voluntaria ha sido recivida. "
"Contiene las condiciones de la aportación i el certificado como adjunto"
@@ -1114,6 +1091,14 @@ msgstr "Tipo aportación"
msgid "Some mandatory fields have not been filled."
msgstr "Algunos campos obligatorios no se han rellenado."
+#. module: energy_communities_cooperator
+#. odoo-python
+#: code:addons/energy_communities_cooperator/models/res_users.py:0
+#, python-format
+msgid ""
+"Something went wrong. Probably there is no website defined for company: {}"
+msgstr ""
+
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_voluntary_share_interest_return__state
msgid "State"
@@ -1153,8 +1138,8 @@ msgid ""
"country format. You can use '/' to indicate that the partner is not subject "
"to tax."
msgstr ""
-"El número de identificación fiscal. Los valores seran validados basandose "
-"en el formato de país. Puedes usar '/' para indicar que el miembro no está "
+"El número de identificación fiscal. Los valores seran validados basandose en"
+" el formato de país. Puedes usar '/' para indicar que el miembro no está "
"sujeto a impuestos."
#. module: energy_communities_cooperator
@@ -1172,8 +1157,8 @@ msgid ""
"There is an existing account for this vat number on this community. Please "
"contact with the community administrators."
msgstr ""
-"Existe una cuenta para este número de identificación fiscal en la "
-"comunidad. Por favor contacta con el administrador de la comunidad."
+"Existe una cuenta para este número de identificación fiscal en la comunidad."
+" Por favor contacta con el administrador de la comunidad."
#. module: energy_communities_cooperator
#: model:ir.model.fields,help:energy_communities_cooperator.field_account_multicompany_easy_creation_wiz__property_cooperator_account
@@ -1241,6 +1226,29 @@ msgstr ""
msgid "Total contribution"
msgstr "Aportación total"
+#. module: energy_communities_cooperator
+#. odoo-python
+#: code:addons/energy_communities_cooperator/models/res_users.py:0
+#, python-format
+msgid ""
+"Trying to create user from partner ID {partner_id} but user ID {user_id} is "
+"using the vat. Contact your system administrator if you have questions."
+msgstr ""
+
+#. module: energy_communities_cooperator
+#. odoo-python
+#: code:addons/energy_communities_cooperator/models/res_users.py:0
+#, python-format
+msgid ""
+"Trying to create user from partner ID {} but the partner doesn't have VAT "
+"defined"
+msgstr ""
+
+#. module: energy_communities_cooperator
+#: model:ir.model,name:energy_communities_cooperator.model_res_users
+msgid "User"
+msgstr "Usuarios"
+
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_account_move__user_current_company
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_cooperative_membership__user_current_company
@@ -1321,11 +1329,12 @@ msgstr "Diario de aportaciones voluntarias"
#. module: energy_communities_cooperator
#: model:mail.template,subject:energy_communities_cooperator.email_template_conditions_voluntary_share
msgid ""
-"Voluntary social capital contribution done to {{object.company_id."
-"comercial_name or object.company_id.name}} with Ref. ACSV{{object.id}}"
+"Voluntary social capital contribution done to "
+"{{object.company_id.comercial_name or object.company_id.name}} with Ref. "
+"ACSV{{object.id}}"
msgstr ""
-"Aportación voluntaria para {{object.company_id.comercial_name or object."
-"company_id.name}} Ref. ACSV{{object.id}}: Aportación efectuada"
+"Aportación voluntaria para {{object.company_id.comercial_name or "
+"object.company_id.name}} Ref. ACSV{{object.id}}: Aportación efectuada"
#. module: energy_communities_cooperator
#. odoo-python
@@ -1350,11 +1359,11 @@ msgstr ""
#: code:addons/energy_communities_cooperator/models/voluntary_share_interest_return.py:0
#, python-format
msgid ""
-"We have sent the voluntary share interest return document to related "
-"members via email."
+"We have sent the voluntary share interest return document to related members"
+" via email."
msgstr ""
-"Se han enviado correctamente por email los documentos para el retorno de "
-"los intereses de las aportaciones voluntarias."
+"Se han enviado correctamente por email los documentos para el retorno de los"
+" intereses de las aportaciones voluntarias."
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_voluntary_share_interest_return__website_message_ids
@@ -1385,14 +1394,14 @@ msgstr "No puedes crear una aportación voluntaria para un miembro nuevo."
msgid ""
"You can't subscribe for an amount that exceeds {amount}{currency_symbol}."
msgstr ""
-"No puedes suscibirte por un importe superior a {amount}{currency_symbol}."
+"No puedes subscribirte por un importe superior a {amount}{currency_symbol}."
#. module: energy_communities_cooperator
#. odoo-python
#: code:addons/energy_communities_cooperator/controllers/website_subscription_main.py:0
#, python-format
msgid "You can't subscribe to two different types of share."
-msgstr "No puedes suscribirte a dos tipos distintos de aportación."
+msgstr "No puedes subscribirte a dos tipos de aportaciones diferentes."
#. module: energy_communities_cooperator
#. odoo-python
diff --git a/energy_communities_cooperator/i18n/eu_ES.po b/energy_communities_cooperator/i18n/eu_ES.po
index b6f2f1575..e34ddeccf 100644
--- a/energy_communities_cooperator/i18n/eu_ES.po
+++ b/energy_communities_cooperator/i18n/eu_ES.po
@@ -6,23 +6,20 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-29 10:20+0000\n"
-"PO-Revision-Date: 2024-12-03 22:26+0100\n"
+"POT-Creation-Date: 2025-01-30 14:17+0000\n"
+"PO-Revision-Date: 2025-01-30 14:17+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
-"Language: eu_ES\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.4.2\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
#. module: energy_communities_cooperator
#: model:ir.model.fields,help:energy_communities_cooperator.field_subscription_request__vat
msgid ""
"\n"
-" The Tax Identification Number. Complete it if the contact is "
-"subjected to\n"
+" The Tax Identification Number. Complete it if the contact is subjected to\n"
" government taxes. Used in some legal statements.\"\n"
" "
msgstr ""
@@ -35,44 +32,29 @@ msgstr ""
#: model:mail.template,body_html:energy_communities_cooperator.email_template_confirmation_voluntary_share
msgid ""
"<div style=\"margin: 0px; padding: 0px;\">\n"
-" <p style=\"margin: 0px; padding: 0px; font-size: 13px;"
-"\">\n"
+" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
" Dear <t t-out=\"object.firstname\"></t>,<br><br>\n"
-" We confirm that we have correctly received your "
-"request to make a voluntary contribution to the capital social of <b><t t-"
-"out=\"object.company_id.name\"></t></b>, with the following data:<br><br>\n"
+" We confirm that we have correctly received your request to make a voluntary contribution to the capital social of <b><t t-out=\"object.company_id.name\"></t></b>, with the following data:<br><br>\n"
" <ul>\n"
-" <li>Partner VAT: <b><t t-out=\"object.vat\"></"
-"t></b></li>\n"
-" <li>Partner name: <b><t t-out=\"object."
-"firstname\"></t> <t t-out=\"object.lastname\"></t></b></li>\n"
-" <li>Charging account finished on: <b><t t-"
-"out=\"object.iban[-4:]\"></t></b></li>\n"
-" <li>Subscription amount: <b><t t-out=\"object."
-"subscription_amount\"></t> €</b></li>\n"
+" <li>Partner VAT: <b><t t-out=\"object.vat\"></t></b></li>\n"
+" <li>Partner name: <b><t t-out=\"object.firstname\"></t> <t t-out=\"object.lastname\"></t></b></li>\n"
+" <li>Charging account finished on: <b><t t-out=\"object.iban[-4:]\"></t></b></li>\n"
+" <li>Subscription amount: <b><t t-out=\"object.subscription_amount\"></t> €</b></li>\n"
" </ul>\n"
" <br>\n"
-" In the next few days you will receive the bank "
-"charge in this account, please verify that all the data\n"
-" provided is correct and you have the money you want "
-"to invest, to avoid any incident in the\n"
+" In the next few days you will receive the bank charge in this account, please verify that all the data\n"
+" provided is correct and you have the money you want to invest, to avoid any incident in the\n"
" draft of the receipt.\n"
" <br><br>\n"
-" Once the validity of the payment has been verified, "
-"you will receive a new notification confirming the contribution made.\n"
+" Once the validity of the payment has been verified, you will receive a new notification confirming the contribution made.\n"
" <br><br>\n"
-" Thank you for your involvement and we inform you "
-"that for any doubt or clarification you can\n"
+" Thank you for your involvement and we inform you that for any doubt or clarification you can\n"
" <t t-if=\"object.company_id.website\">\n"
-" consult our website: <a t-if=\"object.company_id."
-"website\" t-att-href=\"object.company_id.website\"><t t-out=\"object."
-"company_id.website\"></t></a>\n"
+" consult our website: <a t-if=\"object.company_id.website\" t-att-href=\"object.company_id.website\"><t t-out=\"object.company_id.website\"></t></a>\n"
" or\n"
-" </t> send us an email to <t t-out=\"object."
-"company_id.email\"></t>.\n"
+" </t> send us an email to <t t-out=\"object.company_id.email\"></t>.\n"
" <br><br>\n"
-" Get the word out by explaining the project to "
-"family and friends. The more we are, the further we will go!\n"
+" Get the word out by explaining the project to family and friends. The more we are, the further we will go!\n"
" <br>\n"
" Thank you very much and good energy!\n"
" <br><br>\n"
@@ -84,40 +66,25 @@ msgid ""
msgstr ""
"<p>Apreciado/a <t t-out=\"object.firstname\"></t>,</p>\n"
" <p>\n"
-"Te confirmamos que hemos recibido correctamente tu solicitud para realizar "
-"una aportación voluntaria al capital social de <b style=\"font-weight:"
-"bolder;\"><t t-out=\"object.company_id.comercial_name or object.company_id."
-"name\"></t></b>, con los siguientes datos:\n"
+"Te confirmamos que hemos recibido correctamente tu solicitud para realizar una aportación voluntaria al capital social de <b style=\"font-weight:bolder;\"><t t-out=\"object.company_id.comercial_name or object.company_id.name\"></t></b>, con los siguientes datos:\n"
" </p>\n"
" <ul style=\"margin:0px 0 1rem 0;\">\n"
-" <li>Socio/a NIF: <b style=\"font-weight:bolder;\"><t t-out=\"object."
-"vat\"></t></b></li>\n"
-" <li>Socio/a: <b style=\"font-weight:bolder;\"><t t-out=\"object."
-"firstname\"></t> <t t-out=\"object.lastname\"></t></b></li>\n"
-" <li>Cuenta de cargo: <b style=\"font-weight:bolder;\"><t t-"
-"out=\"object.iban\"></t></b></li>\n"
-" <li>Importe aportación: <b style=\"font-weight:bolder;\"><t t-"
-"out=\"object.subscription_amount\"></t>€</b></li>\n"
+" <li>Socio/a NIF: <b style=\"font-weight:bolder;\"><t t-out=\"object.vat\"></t></b></li>\n"
+" <li>Socio/a: <b style=\"font-weight:bolder;\"><t t-out=\"object.firstname\"></t> <t t-out=\"object.lastname\"></t></b></li>\n"
+" <li>Cuenta de cargo: <b style=\"font-weight:bolder;\"><t t-out=\"object.iban\"></t></b></li>\n"
+" <li>Importe aportación: <b style=\"font-weight:bolder;\"><t t-out=\"object.subscription_amount\"></t>€</b></li>\n"
" </ul>\n"
" <p>\n"
-"En los próximos días recibirás el cargo bancario en esta cuenta, por favor "
-"verifica que todos los datos facilitados sean correctos y dispones del "
-"dinero que quieres invertir, para evitar cualquier incidencia en el giro "
-"del recibo.\n"
+"En los próximos días recibirás el cargo bancario en esta cuenta, por favor verifica que todos los datos facilitados sean correctos y dispones del dinero que quieres invertir, para evitar cualquier incidencia en el giro del recibo.\n"
" </p>\n"
" <p>\n"
-"Una vez verificada la validez del pago realizado recibirás una nueva "
-"notificación confirmando la aportación realizada y detallando las "
-"condiciones particulares de tu aportación.\n"
+"Una vez verificada la validez del pago realizado recibirás una nueva notificación confirmando la aportación realizada y detallando las condiciones particulares de tu aportación.\n"
" </p>\n"
" <p>\n"
-"Agradecer tu implicación con la cooperativa y informarte que para cualquier "
-"duda o aclaración puedes consultar nuestra web \n"
-" <a t-if=\"object.company_id.website\" t-att-href=\"object."
-"company_id.website\"><t t-out=\"object.company_id.website\"></t></a>\n"
+"Agradecer tu implicación con la cooperativa y informarte que para cualquier duda o aclaración puedes consultar nuestra web \n"
+" <a t-if=\"object.company_id.website\" t-att-href=\"object.company_id.website\"><t t-out=\"object.company_id.website\"></t></a>\n"
" o enviarnos un correo electrónico a\n"
-" <a t-att-href=\"object.company_id.email\"><t t-out=\"object."
-"company_id.email\"></t></a>\n"
+" <a t-att-href=\"object.company_id.email\"><t t-out=\"object.company_id.email\"></t></a>\n"
" </p>\n"
" "
@@ -125,21 +92,12 @@ msgstr ""
#: model:mail.template,body_html:energy_communities_cooperator.email_template_conditions_voluntary_share
msgid ""
"<div style=\"margin: 0px; padding: 0px;\">\n"
-" <p style=\"margin: 0px; padding: 0px; font-size: 13px;"
-"\">\n"
+" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
" Hello <t t-out=\"object.name\"></t>,<br><br>\n"
-" Recently we have allready charged your account the "
-"amount corresponding to your voluntary contribution to the share capital of "
-"<b><t t-out=\"object.company_id.comercial_name or object.company_id."
-"name\"></t></b>.<br><br>\n"
-" We take this opportunity to <b>thank you</b>, once "
-"again, for your involvement with the objective to promote actions and "
-"projects that contribute to an energy and social transition.<br><br>\n"
-" Please find in attachment your <t t-out=\"object."
-"company_id.comercial_name or object.company_id.name\"></t> cooperator "
-"certificate.<br><br>\n"
-" Get the word out by explaining the project to family "
-"and friends. The more we are, the further we will go!<br><br>\n"
+" Recently we have allready charged your account the amount corresponding to your voluntary contribution to the share capital of <b><t t-out=\"object.company_id.comercial_name or object.company_id.name\"></t></b>.<br><br>\n"
+" We take this opportunity to <b>thank you</b>, once again, for your involvement with the objective to promote actions and projects that contribute to an energy and social transition.<br><br>\n"
+" Please find in attachment your <t t-out=\"object.company_id.comercial_name or object.company_id.name\"></t> cooperator certificate.<br><br>\n"
+" Get the word out by explaining the project to family and friends. The more we are, the further we will go!<br><br>\n"
" We keep in touch for any questions.<br><br>\n"
" Yours faithfully,<br>\n"
" </p>\n"
@@ -149,30 +107,19 @@ msgstr ""
"<p><t t-out=\"object.firstname\"></t> estimatua,</p>\n"
" <p>\n"
" Jakinarazten dizuegu zuen bankuari igorri diogula \n"
-" <b><t t-out=\"object.company_id.comercial_name or object.company_id."
-"name\"></t></b> kooperatibaren kapital sozialari egin diozun borondatezko "
-"ekarpenari dagokion kargua.\n"
+" <b><t t-out=\"object.company_id.comercial_name or object.company_id.name\"></t></b> kooperatibaren kapital sozialari egin diozun borondatezko ekarpenari dagokion kargua.\n"
" </p>\n"
" <p>\n"
-" Zure inbertsioaren baldintzak jasotzen dituen kontratua eransten "
-"dizugu eta gogorarazten dizugu egindako ekarpenari buruzko edozein zalantza "
-"argitzeko posta elektroniko bat bidal dezakezula\n"
-" <a t-att-href=\"object.company_id.email\"><t t-out=\"object."
-"company_id.email\"></t></a> helbidera edo \n"
-" <a t-att-href=\"object.company_id.website\"><t t-out=\"object."
-"company_id.website\"></t></a> web orria kontsultatu.\n"
+" Zure inbertsioaren baldintzak jasotzen dituen kontratua eransten dizugu eta gogorarazten dizugu egindako ekarpenari buruzko edozein zalantza argitzeko posta elektroniko bat bidal dezakezula\n"
+" <a t-att-href=\"object.company_id.email\"><t t-out=\"object.company_id.email\"></t></a> helbidera edo \n"
+" <a t-att-href=\"object.company_id.website\"><t t-out=\"object.company_id.website\"></t></a> web orria kontsultatu.\n"
" </p>\n"
" <p>\n"
-" Bide batez eskerrak eman nahi dizkizugu beste behin ere, <b><t t-"
-"out=\"object.company_id.comercial_name or object.company_id.name\"></t></"
-"b>\n"
-" xedearekin duzun inplikazioagatik, <t t-out=\"object.company_id."
-"city\"></t> energia, ekonomia eta gizarte trantsizioan laguntzen duten "
-"ekintzak edo proiektuak bultzatzeko.\n"
+" Bide batez eskerrak eman nahi dizkizugu beste behin ere, <b><t t-out=\"object.company_id.comercial_name or object.company_id.name\"></t></b>\n"
+" xedearekin duzun inplikazioagatik, <t t-out=\"object.company_id.city\"></t> energia, ekonomia eta gizarte trantsizioan laguntzen duten ekintzak edo proiektuak bultzatzeko.\n"
" </p>\n"
" <p>\n"
-"Ahoz aho proiektua familiakoei, auzokideei eta lagunei azaldu. Zenbat eta "
-"gehiago izan, urrunago iritsiko gara.\n"
+"Ahoz aho proiektua familiakoei, auzokideei eta lagunei azaldu. Zenbat eta gehiago izan, urrunago iritsiko gara.\n"
" </p>\n"
" <p>\n"
"Eskerrik asko eta energia on!\n"
@@ -200,10 +147,10 @@ msgid ""
" <t t-if=\"object.voluntary_share_interest_return_id\">\n"
" <li><strong>Period:</strong> from <t t-out=\"object.voluntary_share_interest_return_id.start_date_period.strftime('%d/%m/%Y')\"></t> to <t t-out=\"object.voluntary_share_interest_return_id.end_date_period.strftime('%d/%m/%Y')\"></t></li>\n"
" </t>\n"
-" <li><strong>Total contribution:</strong> <t t-out=\"('%.2f'% object.voluntary_share_total_contribution).replace('.',',')\"></t>€</li>\n"
-" <li><strong>Total interest:</strong> <t t-out=\"('%.2f'% object.amount_untaxed).replace('.',',')\"></t>€</li>\n"
-" <li><strong>Taxes:</strong> <t t-out=\"('%.2f'% object.amount_tax).replace('.',',')\"></t>€</li>\n"
-" <li><strong>Total to receive:</strong> <t t-out=\"('%.2f'% object.amount_total).replace('.',',')\"></t>€</li>\n"
+" <li><strong>Total contribution:</strong> <t t-out=\"str('%.2f' | format(object.voluntary_share_total_contribution)).replace('.',',')\"></t>€</li>\n"
+" <li><strong>Total interest:</strong> <t t-out=\"str('%.2f' | format(object.amount_untaxed)).replace('.',',')\"></t>€</li>\n"
+" <li><strong>Taxes:</strong> <t t-out=\"str('%.2f' | format(object.amount_tax)).replace('.',',')\"></t>€</li>\n"
+" <li><strong>Total to receive:</strong> <t t-out=\"str('%.2f' | format(object.amount_total)).replace('.',',')\"></t>€</li>\n"
" </ul>\n"
" <br>\n"
" Don't hesitate to contact us at <a t-if=\"object.company_id.email\" t-att-href=\"object.company_id.email\"><t t-out=\"object.company_id.email\"></t></a> for any question you might have using the code: <t t-out=\"object.name\"></t><br>\n"
@@ -213,32 +160,29 @@ msgid ""
" </div>\n"
" "
msgstr ""
-"<div style=\"margin: 0px; padding: 0px;\">\n"
-" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-" Hola <t t-out=\"object.partner_id.firstname\"></t>,<br><br>\n"
-" Acabamos de generar el documento y la orden de pago correspondiente al retorno anual de los intereses de tus aportaciones voluntarias.<br>\n"
-" <t t-if=\"object.partner_bank_id.acc_number\">\n"
-" Próximamente recibirás el pago en tu cuenta con IBAN finalizado en: <t t-out=\"object.partner_bank_id.acc_number[-4:]\"></t><br><br>.\n"
-" </t>\n"
-" <t t-else=\"\">\n"
-" Próximamente recibirás el pago en tu cuenta.<br><br>\n"
-" </t>\n"
-" El resumen de la operación:<br>\n"
-" <ul>\n"
-" <t t-if=\"object.voluntary_share_interest_return_id\">\n"
-" <li><strong>Periodo:</strong> desde <t t-out=\"object.voluntary_share_interest_return_id.start_date_period.strftime('%d/%m/%Y')\"></t> hasta el <t t-out=\"object.voluntary_share_interest_return_id.end_date_period.strftime('%d/%m/%Y')\"></t></li>\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+" <p>Hola <t t-out=\"object.partner_id.firstname\"></t>,</p><br/>\n"
+" <p>Acabamos de generar el documento y la orden de pago correspondiente al retorno anual de los intereses de tus aportaciones voluntarias.</p>\n"
+" <t t-if=\"object.partner_bank_id.acc_number\">\n"
+" <p>Próximamente recibirás el pago en tu cuenta con IBAN finalizado en: <t t-out=\"object.partner_bank_id.acc_number[-4:]\"></t>.\n"
+" <t t-else=\"\">\n"
+" <p>Próximamente recibirás el pago en tu cuenta.\n"
" </t>\n"
-" <li><strong>Total de tu aportación:</strong> <t t-out=\"('%.2f'% object.voluntary_share_total_contribution).replace('.',',')\"></t>€</li>\n"
-" <li><strong>Intereses generados:</strong> <t t-out=\"('%.2f'% object.amount_untaxed).replace('.',',')\"></t>€</li>\n"
-" <li><strong>Impuestos (IRPF 19%):</strong> <t t-out=\"('%.2f'% object.amount_tax).replace('.',',')\"></t>€</li>\n"
-" <li><strong>Total a ingresar:</strong> <t t-out=\"('%.2f'% object.amount_total).replace('.',',')\"></t>€</li>\n"
-" </ul>\n"
-" <br>\n"
-" No dudes en contactar con nosotros en <a t-if=\"object.company_id.email\" t-att-href=\"object.company_id.email\"><t t-out=\"object.company_id.email\"></t></a> para cualquier duda, utilizando la referencia: <t t-out=\"object.name\"></t><br>\n"
-" Gracias a las aportaciones como la tuya, la cooperativa financia proyectos y puede generar cada vez más energía proveniente de fuentes renovables.<br><br>\n"
-" Atentamente,<br>\n"
-" </p>\n"
-" </div>\n"
+" <p>El resumen de la operación:</p>\n"
+" <p></p>\n"
+" <p><ul>\n"
+" <t t-if=\"object.voluntary_share_interest_return_id\">\n"
+" <li><strong>Periodo:</strong> desde <t t-out=\"object.voluntary_share_interest_return_id.start_date_period.strftime('%d/%m/%Y')\"></t> hasta el <t t-out=\"object.voluntary_share_interest_return_id.end_date_period.strftime('%d/%m/%Y')\"></t></li>\n"
+" </t>\n"
+" <li><strong>Total de tu aportación:</strong> <t t-out=\"str('%.2f' | format(object.voluntary_share_total_contribution)).replace('.',',')\"></t>€</li>\n"
+" <li><strong>Intereses generados:</strong> <t t-out=\"str('%.2f' | format(object.amount_untaxed)).replace('.',',')\"></t>€</li>\n"
+" <li><strong>Impuestos (IRPF 19%):</strong> <t t-out=\"str('%.2f' | format(object.amount_tax)).replace('.',',')\"></t>€</li>\n"
+" <li><strong>Total a ingresar:</strong> <t t-out=\"str('%.2f' | format(object.amount_total)).replace('.',',')\"></t>€</li>\n"
+" </ul></p>\n"
+" <p>No dudes en contactar con nosotros en <a t-if=\"object.company_id.email\" t-att-href=\"object.company_id.email\"><t t-out=\"object.company_id.email\"></t></a> para cualquier duda, utilizando la referencia: <t t-out=\"object.name\"></t></p>\n"
+" <p>Gracias a las aportaciones como la tuya, la cooperativa financia proyectos y puede generar cada vez más energía proveniente de fuentes renovables.<p>\n"
+" <p>Atentamente,</p>\n"
+" </div>\n"
" "
#. module: energy_communities_cooperator
@@ -335,6 +279,12 @@ msgstr "Compañías permitidas"
msgid "Attachment Count"
msgstr "Número de adjuntos"
+#. module: energy_communities_cooperator
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_res_partner__no_member_autorized_in_energy_actions
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_res_users__no_member_autorized_in_energy_actions
+msgid "Authorized guest"
+msgstr "Baimendutako gonbidatua"
+
#. module: energy_communities_cooperator
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.iban_template_es_ccee
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.voluntary_shares_template
@@ -360,7 +310,7 @@ msgstr "Cancelar"
#. module: energy_communities_cooperator
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.view_voluntary_share_interest_return_wizard_form
msgid "Cancelar"
-msgstr "Cancelar"
+msgstr ""
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_product_product__mail_template
@@ -426,8 +376,8 @@ msgstr "Kontaktua"
#. module: energy_communities_cooperator
#: model:mail.template,subject:energy_communities_cooperator.email_template_confirmation_voluntary_share
msgid ""
-"Contribute to {{object.company_id.comercial_name or object.company_id."
-"name}} Ref. ACSV{{object.id}}"
+"Contribute to {{object.company_id.comercial_name or object.company_id.name}}"
+" Ref. ACSV{{object.id}}"
msgstr ""
"{{object.company_id.comercial_name or object.company_id.name}} "
"autofinantzaketan ematea Erref. ACSV{{object.id}}: jasotako eskaera"
@@ -531,13 +481,6 @@ msgstr "Nombre Mostrado"
msgid "Draft"
msgstr "Borrador"
-#. module: energy_communities_cooperator
-#. odoo-python
-#: code:addons/energy_communities_cooperator/wizards/voluntary_share_interest_return.py:0
-#, python-format
-msgid "ERROR on Invoice {}. No related membership defined"
-msgstr "ERROR en factura {}. No existe una membresía relacionada"
-
#. module: energy_communities_cooperator
#. odoo-python
#: code:addons/energy_communities_cooperator/wizards/voluntary_share_interest_return.py:0
@@ -587,12 +530,13 @@ msgstr ""
#, python-format
msgid "ERROR on Membership {}. No related invoice for voluntary share"
msgstr ""
-"ERROR en la membresía {}. No hemos encontrado una factura relacionada con "
-"la aportación"
+"ERROR en la membresía {}. No hemos encontrado una factura relacionada con la"
+" aportación"
#. module: energy_communities_cooperator
#. odoo-python
#: code:addons/energy_communities_cooperator/wizards/voluntary_share_interest_return.py:0
+#: code:addons/energy_communities_cooperator/wizards/voluntary_share_interest_return.py:0
#, python-format
msgid "ERROR on partner {}. Related membership not found"
msgstr ""
@@ -619,6 +563,16 @@ msgstr "El correo electrónico y el de confirmación no coinciden."
msgid "Email not found"
msgstr "Email no encontrado"
+#. module: energy_communities_cooperator
+#: model:ir.model.fields,help:energy_communities_cooperator.field_res_partner__no_member_autorized_in_energy_actions
+#: model:ir.model.fields,help:energy_communities_cooperator.field_res_users__no_member_autorized_in_energy_actions
+msgid ""
+"Enable the contact to participate in Community Energy Actions despite not "
+"being an effective member of the Community."
+msgstr ""
+"Gaitu kontaktua Erkidegoko Energia Ekintzetan parte hartzeko"
+" Erkidegoko kide eraginkorra izan ez arren."
+
#. module: energy_communities_cooperator
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.view_voluntary_share_interest_return_wizard_form
msgid "Execute"
@@ -649,7 +603,7 @@ msgstr "Generoa"
#. module: energy_communities_cooperator
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.view_voluntary_share_interest_return_form
msgid "General"
-msgstr "General"
+msgstr ""
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_voluntary_share_interest_return__has_message
@@ -676,6 +630,9 @@ msgid "I prefer to not share it"
msgstr "Prefiero no compartirlo"
#. module: energy_communities_cooperator
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_share_line__company_id_id
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_share_line__partner_id_id
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_share_line__share_product_id_id
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_voluntary_share_interest_return__id
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_voluntary_share_interest_return_wizard__id
msgid "ID"
@@ -788,6 +745,11 @@ msgstr "Última actualización por"
msgid "Last Updated on"
msgstr "Última actualización el"
+#. module: energy_communities_cooperator
+#: model:ir.model,name:energy_communities_cooperator.model_crm_lead
+msgid "Lead/Opportunity"
+msgstr "Ekimena/Aukera"
+
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_cooperative_membership__representative
msgid "Legal Representative"
@@ -843,6 +805,9 @@ msgstr "No binario"
#. module: energy_communities_cooperator
#. odoo-python
#: code:addons/energy_communities_cooperator/controllers/website_subscription_main.py:0
+#: code:addons/energy_communities_cooperator/controllers/website_subscription_main.py:0
+#: code:addons/energy_communities_cooperator/controllers/website_subscription_main.py:0
+#: code:addons/energy_communities_cooperator/controllers/website_subscription_voluntary_share.py:0
#: code:addons/energy_communities_cooperator/controllers/website_subscription_voluntary_share.py:0
#, python-format
msgid "Not valid parameter value [odoo_company_id]"
@@ -854,8 +819,8 @@ msgid ""
"Note: Please, if you are not yet a member, you must process it through\n"
" these forms:"
msgstr ""
-"Oharra: Mesedez, oraindik bazkide ez bazara, formulario hauen bidez "
-"tramitea egin behar duzu:"
+"Oharra: Mesedez, oraindik bazkide ez bazara, formulario hauen bidez tramitea"
+" egin behar duzu:"
#. module: energy_communities_cooperator
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.view_voluntary_share_interest_return_form
@@ -895,8 +860,7 @@ msgstr "Socios antiguos"
#. module: energy_communities_cooperator
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.main_form_template_ccee
msgid ""
-"Once you are a member you can enjoy the services available from the "
-"community and be part of a movement\n"
+"Once you are a member you can enjoy the services available from the community and be part of a movement\n"
" of social and energy model transformation."
msgstr ""
"Bazkide zarenean, komunitate energetikoaren zerbitzuak erabili ahal izango "
@@ -912,6 +876,11 @@ msgstr ""
"Zure eskaera jasotakoan, berrespen mezu bat jasoko duzu, jarraitu beharreko "
"jarraibideekin."
+#. module: energy_communities_cooperator
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_account_multicompany_easy_creation_wiz__parent_id_id
+msgid "Parent Id"
+msgstr ""
+
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_cooperative_membership__partner_id
msgid "Partner"
@@ -920,6 +889,10 @@ msgstr "Contacto"
#. module: energy_communities_cooperator
#. odoo-python
#: code:addons/energy_communities_cooperator/controllers/website_subscription_voluntary_share.py:0
+#: code:addons/energy_communities_cooperator/controllers/website_subscription_voluntary_share.py:0
+#: code:addons/energy_communities_cooperator/controllers/website_subscription_voluntary_share.py:0
+#: code:addons/energy_communities_cooperator/controllers/website_subscription_voluntary_share.py:0
+#: code:addons/energy_communities_cooperator/controllers/website_subscription_voluntary_share.py:0
#, python-format
msgid "Partner not found"
msgstr "Contacto no encontrado"
@@ -988,7 +961,7 @@ msgstr "Telefonoa"
#: code:addons/energy_communities_cooperator/controllers/website_subscription_main.py:0
#, python-format
msgid "Please upload a scan of your ID card."
-msgstr "Por favor sube una copia escaneada de tu tarjeta de identidad."
+msgstr "Por favor sube una copia escaneada de tu documento de identitat."
#. module: energy_communities_cooperator
#: model_terms:ir.ui.view,arch_db:energy_communities_cooperator.view_voluntary_share_interest_return_form
@@ -1021,6 +994,11 @@ msgstr "Plantilla de producto aportación"
msgid "Provided IBAN is not valid."
msgstr "El IBAN proporcionado no es válido."
+#. module: energy_communities_cooperator
+#: model:ir.model.fields,field_description:energy_communities_cooperator.field_share_line__related_invoice_line
+msgid "Related invoice line"
+msgstr ""
+
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_account_bank_statement_line__membership_id
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_account_move__membership_id
@@ -1062,8 +1040,8 @@ msgstr "Bidali"
#. module: energy_communities_cooperator
#: model:mail.template,description:energy_communities_cooperator.email_template_conditions_voluntary_share
msgid ""
-"Sent to cooperators after its voluntary share have been received, with "
-"share voluntary conditions and certificate in attachment"
+"Sent to cooperators after its voluntary share have been received, with share"
+" voluntary conditions and certificate in attachment"
msgstr ""
"Enviado a los miembros una vez la aportación voluntaria ha sido recivida. "
"Contiene las condiciones de la aportación i el certificado como adjunto"
@@ -1102,7 +1080,15 @@ msgstr "Partekatze mota"
#: code:addons/energy_communities_cooperator/controllers/website_subscription_main.py:0
#, python-format
msgid "Some mandatory fields have not been filled."
-msgstr "Nahitaezko eremu batzuk ez dira bete."
+msgstr "Algunos campos obligatorios no se han rellenado."
+
+#. module: energy_communities_cooperator
+#. odoo-python
+#: code:addons/energy_communities_cooperator/models/res_users.py:0
+#, python-format
+msgid ""
+"Something went wrong. Probably there is no website defined for company: {}"
+msgstr ""
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_voluntary_share_interest_return__state
@@ -1143,8 +1129,8 @@ msgid ""
"country format. You can use '/' to indicate that the partner is not subject "
"to tax."
msgstr ""
-"El número de identificación fiscal. Los valores seran validados basandose "
-"en el formato de país. Puedes usar '/' para indicar que el miembro no está "
+"El número de identificación fiscal. Los valores seran validados basandose en"
+" el formato de país. Puedes usar '/' para indicar que el miembro no está "
"sujeto a impuestos."
#. module: energy_communities_cooperator
@@ -1162,8 +1148,8 @@ msgid ""
"There is an existing account for this vat number on this community. Please "
"contact with the community administrators."
msgstr ""
-"El número de identificación fiscal. Los valores seran validados basandose "
-"en el formato de país. Puedes usar '/' para indicar que el miembro no está "
+"El número de identificación fiscal. Los valores seran validados basandose en"
+" el formato de país. Puedes usar '/' para indicar que el miembro no está "
"sujeto a impuestos."
#. module: energy_communities_cooperator
@@ -1227,6 +1213,29 @@ msgstr "Guztira"
msgid "Total contribution"
msgstr "Aportación total"
+#. module: energy_communities_cooperator
+#. odoo-python
+#: code:addons/energy_communities_cooperator/models/res_users.py:0
+#, python-format
+msgid ""
+"Trying to create user from partner ID {partner_id} but user ID {user_id} is "
+"using the vat. Contact your system administrator if you have questions."
+msgstr ""
+
+#. module: energy_communities_cooperator
+#. odoo-python
+#: code:addons/energy_communities_cooperator/models/res_users.py:0
+#, python-format
+msgid ""
+"Trying to create user from partner ID {} but the partner doesn't have VAT "
+"defined"
+msgstr ""
+
+#. module: energy_communities_cooperator
+#: model:ir.model,name:energy_communities_cooperator.model_res_users
+msgid "User"
+msgstr "Erabiltzaileak"
+
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_account_move__user_current_company
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_cooperative_membership__user_current_company
@@ -1307,8 +1316,9 @@ msgstr "Diario de aportaciones voluntarias"
#. module: energy_communities_cooperator
#: model:mail.template,subject:energy_communities_cooperator.email_template_conditions_voluntary_share
msgid ""
-"Voluntary social capital contribution done to {{object.company_id."
-"comercial_name or object.company_id.name}} with Ref. ACSV{{object.id}}"
+"Voluntary social capital contribution done to "
+"{{object.company_id.comercial_name or object.company_id.name}} with Ref. "
+"ACSV{{object.id}}"
msgstr ""
"{{object.company_id.comercial_name or object.company_id.name}} "
"autofinantzaketan ematea Erref. ACSV{{object.id}}: egindako ekarpena"
@@ -1336,11 +1346,11 @@ msgstr ""
#: code:addons/energy_communities_cooperator/models/voluntary_share_interest_return.py:0
#, python-format
msgid ""
-"We have sent the voluntary share interest return document to related "
-"members via email."
+"We have sent the voluntary share interest return document to related members"
+" via email."
msgstr ""
-"Se han enviado correctamente por email los documentos para el retorno de "
-"los intereses de las aportaciones voluntarias."
+"Se han enviado correctamente por email los documentos para el retorno de los"
+" intereses de las aportaciones voluntarias."
#. module: energy_communities_cooperator
#: model:ir.model.fields,field_description:energy_communities_cooperator.field_voluntary_share_interest_return__website_message_ids
@@ -1373,14 +1383,14 @@ msgstr ""
msgid ""
"You can't subscribe for an amount that exceeds {amount}{currency_symbol}."
msgstr ""
-"No puedes suscibirte por un importe superior a {amount}{currency_symbol}."
+"No puedes subscribirte por un importe superior a {amount}{currency_symbol}."
#. module: energy_communities_cooperator
#. odoo-python
#: code:addons/energy_communities_cooperator/controllers/website_subscription_main.py:0
#, python-format
msgid "You can't subscribe to two different types of share."
-msgstr "No puedes suscribirte a dos tipos distintos de aportación."
+msgstr "No puedes subscribirte a dos tipos de aportaciones diferentes."
#. module: energy_communities_cooperator
#. odoo-python
diff --git a/energy_selfconsumption/i18n/ca_ES.po b/energy_selfconsumption/i18n/ca_ES.po
index 07143ad1c..d357ae347 100644
--- a/energy_selfconsumption/i18n/ca_ES.po
+++ b/energy_selfconsumption/i18n/ca_ES.po
@@ -6,13 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
-<<<<<<< Updated upstream
-"POT-Creation-Date: 2025-01-20 11:03+0000\n"
-"PO-Revision-Date: 2025-01-20 11:03+0000\n"
-=======
"POT-Creation-Date: 2025-01-30 11:36+0000\n"
"PO-Revision-Date: 2025-01-30 11:36+0000\n"
->>>>>>> Stashed changes
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/energy_selfconsumption/i18n/energy_selfconsumption.pot b/energy_selfconsumption/i18n/energy_selfconsumption.pot
index d45ae5ca1..2734a8c78 100644
--- a/energy_selfconsumption/i18n/energy_selfconsumption.pot
+++ b/energy_selfconsumption/i18n/energy_selfconsumption.pot
@@ -6,13 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
-<<<<<<< Updated upstream
-"POT-Creation-Date: 2025-01-20 11:03+0000\n"
-"PO-Revision-Date: 2025-01-20 11:03+0000\n"
-=======
"POT-Creation-Date: 2025-01-30 11:37+0000\n"
"PO-Revision-Date: 2025-01-30 11:37+0000\n"
->>>>>>> Stashed changes
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/energy_selfconsumption/i18n/es.po b/energy_selfconsumption/i18n/es.po
index 9c9afbb1b..9188d2ddd 100644
--- a/energy_selfconsumption/i18n/es.po
+++ b/energy_selfconsumption/i18n/es.po
@@ -6,13 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
-<<<<<<< Updated upstream
-"POT-Creation-Date: 2025-01-20 11:03+0000\n"
-"PO-Revision-Date: 2025-01-20 11:03+0000\n"
-=======
"POT-Creation-Date: 2025-01-30 11:37+0000\n"
"PO-Revision-Date: 2025-01-30 11:37+0000\n"
->>>>>>> Stashed changes
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -1404,13 +1399,8 @@ msgid ""
"Distribution coneffcient in kWh. The sum of all have to result in total "
"project power"
msgstr ""
-<<<<<<< Updated upstream
-"Coneficiente de distribución en kWh. La suma de todos tiene que dar como resultado total "
-"potencia del proyecto"
-=======
"Coneficiente de distribución en kWh. La suma de todos tiene que dar como "
"resultado total potencia del proyecto"
->>>>>>> Stashed changes
#. module: energy_selfconsumption
#. odoo-python
diff --git a/energy_selfconsumption/i18n/eu_ES.po b/energy_selfconsumption/i18n/eu_ES.po
index b68bddd4c..68785e5ef 100644
--- a/energy_selfconsumption/i18n/eu_ES.po
+++ b/energy_selfconsumption/i18n/eu_ES.po
@@ -6,13 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
-<<<<<<< Updated upstream
-"POT-Creation-Date: 2025-01-20 11:04+0000\n"
-"PO-Revision-Date: 2025-01-20 11:04+0000\n"
-=======
"POT-Creation-Date: 2025-01-30 11:36+0000\n"
"PO-Revision-Date: 2025-01-30 11:36+0000\n"
->>>>>>> Stashed changes
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
--
GitLab
From 64654c66aa46db5e11e27de056e18431091b1082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Garc=C3=ADa?= <alvarogruiz8@gmail.com>
Date: Mon, 10 Feb 2025 09:03:20 +0100
Subject: [PATCH 05/12] [IMP] Change literal, logic member and new data
controls
---
.../inscriptions_form_controllers.py | 33 +++++------
energy_selfconsumption/i18n/ca_ES.po | 4 +-
.../i18n/energy_selfconsumption.pot | 2 +-
energy_selfconsumption/i18n/es.po | 4 +-
energy_selfconsumption/i18n/eu_ES.po | 4 +-
.../models/selfconsumption.py | 2 +-
.../wizards/selfconsumption_import_wizard.py | 55 ++++++++++---------
.../selfconsumption_import_wizard_views.xml | 4 +-
8 files changed, 56 insertions(+), 52 deletions(-)
diff --git a/energy_selfconsumption/controllers/inscriptions_form_controllers.py b/energy_selfconsumption/controllers/inscriptions_form_controllers.py
index 18430dd9a..ee76d3270 100644
--- a/energy_selfconsumption/controllers/inscriptions_form_controllers.py
+++ b/energy_selfconsumption/controllers/inscriptions_form_controllers.py
@@ -72,23 +72,24 @@ class WebsiteInscriptionsFormController(WebsiteFormController):
"global_error": True,
}
partner = partner.get_partner_with_type()
- cooperator = (
- request.env["cooperative.membership"]
- .sudo()
- .search(
- [
- ("company_id", "=", project.company_id.id),
- ("partner_id", "=", partner.id),
- ("cooperator", "=", True),
- ("member", "=", True),
- ]
+ if not partner.no_member_autorized_in_energy_actions:
+ cooperator = (
+ request.env["cooperative.membership"]
+ .sudo()
+ .search(
+ [
+ ("company_id", "=", project.company_id.id),
+ ("partner_id", "=", partner.id),
+ ("cooperator", "=", True),
+ ("member", "=", True),
+ ]
+ )
)
- )
- if not cooperator:
- return {
- "error_msgs": [_("Partner is not cooperator.")],
- "global_error": True,
- }
+ if not cooperator:
+ return {
+ "error_msgs": [_("Partner is not cooperator.")],
+ "global_error": True,
+ }
inscription = (
request.env["energy_selfconsumption.inscription_selfconsumption"]
.sudo()
diff --git a/energy_selfconsumption/i18n/ca_ES.po b/energy_selfconsumption/i18n/ca_ES.po
index d357ae347..ee1b6b9e2 100644
--- a/energy_selfconsumption/i18n/ca_ES.po
+++ b/energy_selfconsumption/i18n/ca_ES.po
@@ -3047,8 +3047,8 @@ msgstr "Caràcter de citació al arxiu CSV d'importació."
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__power
-msgid "Rated Power (kWn)"
-msgstr "Potència nominal (kWn)"
+msgid "Power (kW)"
+msgstr "Potència (kW)"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_define_invoicing_mode_wizard__recurring_rule_type
diff --git a/energy_selfconsumption/i18n/energy_selfconsumption.pot b/energy_selfconsumption/i18n/energy_selfconsumption.pot
index 2734a8c78..df32da138 100644
--- a/energy_selfconsumption/i18n/energy_selfconsumption.pot
+++ b/energy_selfconsumption/i18n/energy_selfconsumption.pot
@@ -2797,7 +2797,7 @@ msgstr ""
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__power
-msgid "Rated Power (kWn)"
+msgid "Power (kW)"
msgstr ""
#. module: energy_selfconsumption
diff --git a/energy_selfconsumption/i18n/es.po b/energy_selfconsumption/i18n/es.po
index 9188d2ddd..624b448ae 100644
--- a/energy_selfconsumption/i18n/es.po
+++ b/energy_selfconsumption/i18n/es.po
@@ -2966,8 +2966,8 @@ msgstr "Quotechar en archivo CSV de importación."
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__power
-msgid "Rated Power (kWn)"
-msgstr "Potencia nominal (kWn)"
+msgid "Power (kW)"
+msgstr "Potencia (kW)"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_define_invoicing_mode_wizard__recurring_rule_type
diff --git a/energy_selfconsumption/i18n/eu_ES.po b/energy_selfconsumption/i18n/eu_ES.po
index 68785e5ef..740153d29 100644
--- a/energy_selfconsumption/i18n/eu_ES.po
+++ b/energy_selfconsumption/i18n/eu_ES.po
@@ -3030,8 +3030,8 @@ msgstr "Quotechar inportazio CSV fitxategian."
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__power
-msgid "Rated Power (kWn)"
-msgstr "Potentzia nominala (kWn)"
+msgid "Power (kW)"
+msgstr "Potentzia (kW)"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_define_invoicing_mode_wizard__recurring_rule_type
diff --git a/energy_selfconsumption/models/selfconsumption.py b/energy_selfconsumption/models/selfconsumption.py
index d6916637e..54eb65342 100644
--- a/energy_selfconsumption/models/selfconsumption.py
+++ b/energy_selfconsumption/models/selfconsumption.py
@@ -89,7 +89,7 @@ class Selfconsumption(models.Model):
required=True,
default=lambda self: self.env.company.partner_id,
)
- power = fields.Float(string="Rated Power (kWn)")
+ power = fields.Float(string="Power (kW)")
distribution_table_ids = fields.One2many(
"energy_selfconsumption.distribution_table",
"selfconsumption_project_id",
diff --git a/energy_selfconsumption/wizards/selfconsumption_import_wizard.py b/energy_selfconsumption/wizards/selfconsumption_import_wizard.py
index d269dae02..c1b1fee6f 100644
--- a/energy_selfconsumption/wizards/selfconsumption_import_wizard.py
+++ b/energy_selfconsumption/wizards/selfconsumption_import_wizard.py
@@ -289,9 +289,9 @@ class SelfconsumptionImportWizard(models.TransientModel):
logger.info(f"\n\n set_autogenerate_inscriptions_mandataris_supply_points")
for i in range(0, 500):
logger.info(f"\n\n Creando el cliente número {i}")
- country_id = self.env["res.country"].search([("code", "=", "ES")])[0].id
+ country_id = self.env["res.country"].sudo().search([("code", "=", "ES")])[0].id
vat = self.generar_vat_espanol()
- partner = self.env["res.partner"].create(
+ partner = self.env["res.partner"].sudo().create(
{
"name": f"Prueba {vat} {i}",
"vat": vat,
@@ -306,28 +306,29 @@ class SelfconsumptionImportWizard(models.TransientModel):
"company_id": self.env.company.id,
"company_type": "person",
"cooperative_membership_id": self.env.company.partner_id.id,
+ "no_member_autorized_in_energy_actions": True,
}
)
- bank_account = self.env["res.partner.bank"].create(
- {
- "acc_number": self.generar_iban_espanol(),
- "partner_id": partner.id,
- "company_id": self.env.company.id,
- }
- )
-
- mandate = self.env["account.banking.mandate"].create(
- {
- "format": "sepa",
- "type": "recurrent",
- "state": "valid",
- "signature_date": datetime.now().strftime("%Y-%m-%d"),
- "partner_bank_id": bank_account.id,
- "partner_id": partner.id,
- "company_id": self.env.company.id,
- }
- )
+ # bank_account = self.env["res.partner.bank"].create(
+ # {
+ # "acc_number": self.generar_iban_espanol(),
+ # "partner_id": partner.id,
+ # "company_id": self.env.company.id,
+ # }
+ # )
+
+ # mandate = self.env["account.banking.mandate"].create(
+ # {
+ # "format": "sepa",
+ # "type": "recurrent",
+ # "state": "valid",
+ # "signature_date": datetime.now().strftime("%Y-%m-%d"),
+ # "partner_bank_id": bank_account.id,
+ # "partner_id": partner.id,
+ # "company_id": self.env.company.id,
+ # }
+ # )
participation = (
self.env["energy_project.participation"]
@@ -362,7 +363,7 @@ class SelfconsumptionImportWizard(models.TransientModel):
else:
tariff = random.choice(_ACCESS_TARIFF_VALUES)[0]
- supply_point = self.env["energy_selfconsumption.supply_point"].create(
+ supply_point = self.env["energy_selfconsumption.supply_point"].sudo().create(
{
"code": self.generate_cups(),
"name": partner.street,
@@ -378,17 +379,18 @@ class SelfconsumptionImportWizard(models.TransientModel):
}
)
- self.env["energy_selfconsumption.inscription_selfconsumption"].create(
+ self.env["energy_selfconsumption.inscription_selfconsumption"].sudo().create(
{
"project_id": active_id,
"partner_id": partner.id,
"effective_date": datetime.now().strftime("%Y-%m-%d"),
- "mandate_id": mandate.id,
+ "mandate_id": False,
"supply_point_id": supply_point.id,
"participation": participation[0].id,
"annual_electricity_use": 1.0,
"accept": True,
"member": True,
+ "selfconsumption_project_id": active_id,
}
)
return True
@@ -401,7 +403,7 @@ class SelfconsumptionImportWizard(models.TransientModel):
for partner in partners_socios:
if count == 500:
break
- mandates = self.env["account.banking.mandate"].search(
+ mandates = self.env["account.banking.mandate"].sudo().search(
[
("partner_id", "=", partner.id),
("company_id", "=", partner.company_id.id),
@@ -425,7 +427,7 @@ class SelfconsumptionImportWizard(models.TransientModel):
if participation:
self.env[
"energy_selfconsumption.inscription_selfconsumption"
- ].create(
+ ].sudo().create(
{
"project_id": active_id,
"partner_id": partner.id,
@@ -436,6 +438,7 @@ class SelfconsumptionImportWizard(models.TransientModel):
"annual_electricity_use": 1.0,
"accept": True,
"member": True,
+ "selfconsumption_project_id": active_id,
}
)
count += 1
diff --git a/energy_selfconsumption/wizards/selfconsumption_import_wizard_views.xml b/energy_selfconsumption/wizards/selfconsumption_import_wizard_views.xml
index 99a31ccfb..3f87eae6e 100644
--- a/energy_selfconsumption/wizards/selfconsumption_import_wizard_views.xml
+++ b/energy_selfconsumption/wizards/selfconsumption_import_wizard_views.xml
@@ -25,11 +25,11 @@
name="download_template_button"
>Download
Template</button>
- <button
+ <!-- <button
type="object"
class="btn btn-secondary mr-1"
name="download_list_button"
- >Download State List</button>
+ >Download State List</button> -->
<button
type="object"
class="btn btn-secondary mr-1"
--
GitLab
From e819835dc3c5a292ed5d78c4bb2ced7924503836 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Garc=C3=ADa?= <alvarogruiz8@gmail.com>
Date: Mon, 10 Feb 2025 10:32:36 +0100
Subject: [PATCH 06/12] [IMP] Change fields on view tree inscription
---
energy_selfconsumption/views/inscription_views.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/energy_selfconsumption/views/inscription_views.xml b/energy_selfconsumption/views/inscription_views.xml
index 754f7ced5..bda2c184e 100644
--- a/energy_selfconsumption/views/inscription_views.xml
+++ b/energy_selfconsumption/views/inscription_views.xml
@@ -23,9 +23,9 @@
<field name="used_in_selfconsumption" width="6%" optional="show"/>
<field name="vulnerability_situation" width="6%" optional="show"/>
<field name="annual_electricity_use" width="6%" optional="show"/>
- <field name="supply_point_id" width="10%" optional="hide" />
+ <field name="supply_point_id" width="10%" optional="show" />
<field name="code" readonly="1" width="22%" optional="show"/>
- <field name="is_member" readonly="1" width="10%" optional="hide"/>
+ <field name="is_member" readonly="1" width="10%" optional="show"/>
<field name="effective_date" width="6%" optional="hide"/>
<field name="mandate_filtered_ids" invisible="True" />
<field name="acc_number" width="12%" optional="show"/>
--
GitLab
From d4fd0430fae73ec01b7c07f756c539b4f27514c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Garc=C3=ADa?= <alvarogruiz8@gmail.com>
Date: Mon, 10 Feb 2025 12:32:43 +0100
Subject: [PATCH 07/12] [IMP] Change ir_property_field
---
.../controllers/inscriptions_form_controllers.py | 3 ++-
energy_selfconsumption/models/create_inscription.py | 10 +++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/energy_selfconsumption/controllers/inscriptions_form_controllers.py b/energy_selfconsumption/controllers/inscriptions_form_controllers.py
index ee76d3270..f9ad08183 100644
--- a/energy_selfconsumption/controllers/inscriptions_form_controllers.py
+++ b/energy_selfconsumption/controllers/inscriptions_form_controllers.py
@@ -72,7 +72,7 @@ class WebsiteInscriptionsFormController(WebsiteFormController):
"global_error": True,
}
partner = partner.get_partner_with_type()
- if not partner.no_member_autorized_in_energy_actions:
+ if not partner.with_company(project.company_id.id).no_member_autorized_in_energy_actions:
cooperator = (
request.env["cooperative.membership"]
.sudo()
@@ -374,6 +374,7 @@ class WebsiteInscriptionsFormController(WebsiteFormController):
partner = (
request.env["res.partner"]
.sudo()
+ .with_company(model.company_id.id)
.search([
("vat", "=", values["inscription_partner_id_vat"]),
("parent_id", "=", False),
diff --git a/energy_selfconsumption/models/create_inscription.py b/energy_selfconsumption/models/create_inscription.py
index 34a51b033..68e087cdc 100644
--- a/energy_selfconsumption/models/create_inscription.py
+++ b/energy_selfconsumption/models/create_inscription.py
@@ -116,7 +116,7 @@ class CreateInscription(models.AbstractModel):
project,
):
"""Create an entry for self-consumption on a specific project."""
- partner = self._get_partner(values["inscription_partner_id_vat"])
+ partner = self._get_partner(values["inscription_partner_id_vat"], project.company_id.id)
if not partner:
return True, _("Partner with VAT:<b>{vat}</b> was not found.").format(
vat=values["inscription_partner_id_vat"]
@@ -153,16 +153,16 @@ class CreateInscription(models.AbstractModel):
tariff,
)
- def _get_partner(self, vat):
+ def _get_partner(self, vat, company_id):
"""Search for a partner based on the VAT provided."""
return (
self.env["res.partner"]
.sudo()
.search(
[
- "|",
("vat", "=", vat),
- ("vat", "=ilike", vat),
+ ("parent_id", "=", False),
+ ("company_ids", "in", (company_id))
],
limit=1,
)
@@ -170,7 +170,7 @@ class CreateInscription(models.AbstractModel):
def _is_cooperator(self, partner, project):
"""Verify if the partner is a cooperative member o no member but autorized in energy actions"""
- if partner.no_member_autorized_in_energy_actions:
+ if partner.with_company(project.company_id.id).no_member_autorized_in_energy_actions:
return True
return bool(
self.env["cooperative.membership"]
--
GitLab
From 873e6383bdf1aaa44da5497dc8305648a781e033 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Garc=C3=ADa?= <alvarogruiz8@gmail.com>
Date: Thu, 13 Feb 2025 11:26:45 +0100
Subject: [PATCH 08/12] [IMP] Implementation of status in the registration
lines and new action for the change of status in the registration lines
---
energy_selfconsumption/__manifest__.py | 1 +
.../inscriptions_form_controllers.py | 7 +-
energy_selfconsumption/i18n/ca_ES.po | 129 +++++++++++++-----
.../i18n/energy_selfconsumption.pot | 121 ++++++++++++----
energy_selfconsumption/i18n/es.po | 129 +++++++++++++-----
energy_selfconsumption/i18n/eu_ES.po | 128 ++++++++++++-----
.../models/create_inscription.py | 7 +-
energy_selfconsumption/models/inscription.py | 32 ++++-
.../models/participation.py | 2 +-
.../models/selfconsumption.py | 14 +-
.../security/ir.model.access.csv | 8 +-
.../views/inscription_views.xml | 14 ++
energy_selfconsumption/wizards/__init__.py | 1 +
.../change_state_inscription_wizard.py | 89 ++++++++++++
.../change_state_inscription_wizard_views.xml | 33 +++++
.../create_distribution_table_wizard.py | 6 +-
.../wizards/selfconsumption_import_wizard.py | 102 +++++++++-----
17 files changed, 641 insertions(+), 182 deletions(-)
create mode 100644 energy_selfconsumption/wizards/change_state_inscription_wizard.py
create mode 100644 energy_selfconsumption/wizards/change_state_inscription_wizard_views.xml
diff --git a/energy_selfconsumption/__manifest__.py b/energy_selfconsumption/__manifest__.py
index 836516ac5..91ce356ec 100644
--- a/energy_selfconsumption/__manifest__.py
+++ b/energy_selfconsumption/__manifest__.py
@@ -56,6 +56,7 @@
"wizards/invoicing_wizard_views.xml",
"wizards/clean_supply_point_assignation_wizard_views.xml",
"wizards/create_distribution_table_wizard_views.xml",
+ "wizards/change_state_inscription_wizard_views.xml",
"reports/selfconsumption_reports.xml",
"reports/invoice_template.xml",
],
diff --git a/energy_selfconsumption/controllers/inscriptions_form_controllers.py b/energy_selfconsumption/controllers/inscriptions_form_controllers.py
index f9ad08183..7059035d5 100644
--- a/energy_selfconsumption/controllers/inscriptions_form_controllers.py
+++ b/energy_selfconsumption/controllers/inscriptions_form_controllers.py
@@ -116,7 +116,7 @@ class WebsiteInscriptionsFormController(WebsiteFormController):
"global_error": True,
}
participation = (
- request.env["energy_project.participation"]
+ request.env["energy_selfconsumptions.participation"]
.sudo()
.search(
[
@@ -124,7 +124,8 @@ class WebsiteInscriptionsFormController(WebsiteFormController):
"quantity",
"=",
float(values["inscriptionselfconsumption_participation"]),
- )
+ ),
+ ("project_id", "=", int(values["model_id"])),
]
)
)
@@ -295,7 +296,7 @@ class WebsiteInscriptionsFormController(WebsiteFormController):
]
participations = (
- request.env["energy_project.participation"]
+ request.env["energy_selfconsumptions.participation"]
.sudo()
.search([("project_id", "=", int(values["model_id"]))])
)
diff --git a/energy_selfconsumption/i18n/ca_ES.po b/energy_selfconsumption/i18n/ca_ES.po
index ee1b6b9e2..80c3194b2 100644
--- a/energy_selfconsumption/i18n/ca_ES.po
+++ b/energy_selfconsumption/i18n/ca_ES.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-30 11:36+0000\n"
-"PO-Revision-Date: 2025-01-30 11:36+0000\n"
+"POT-Creation-Date: 2025-02-13 10:05+0000\n"
+"PO-Revision-Date: 2025-02-13 10:05+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -741,10 +741,14 @@ msgstr "Activa el formulari"
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/models/distribution_table.py:0
+#: code:addons/energy_selfconsumption/models/inscription.py:0
#: code:addons/energy_selfconsumption/models/selfconsumption.py:0
+#: code:addons/energy_selfconsumption/wizards/change_state_inscription_wizard.py:0
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__active
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__active
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_change_state_inscription_lines_wizard__state__active
#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_distribution_table__state__active
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_inscription_selfconsumption__state__active
#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_selfconsumption__conf_state__active
#, python-format
msgid "Active"
@@ -822,13 +826,6 @@ msgstr "Avança a Actiu"
msgid "Advance to In Inscription"
msgstr "Avançar en Inscripció"
-#. module: energy_selfconsumption
-#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_import_wizard_form_view
-msgid ""
-"Warning: In the configuration of this registration, importing bank account is not marked."
-msgstr ""
-"Avís: a la configuració d'aquest registre, no es marca el compte bancari d'importació."
-
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__annual_electricity_use
msgid "Annual electricity use"
@@ -994,6 +991,33 @@ msgstr "Referència cadastral de l'immoble"
msgid "Cancel"
msgstr "Cancel·lar"
+#. module: energy_selfconsumption
+#. odoo-python
+#: code:addons/energy_selfconsumption/models/inscription.py:0
+#: code:addons/energy_selfconsumption/wizards/change_state_inscription_wizard.py:0
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_change_state_inscription_lines_wizard__state__change
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_inscription_selfconsumption__state__change
+#, python-format
+msgid "Change"
+msgstr "Canviar"
+
+#. module: energy_selfconsumption
+#: model:ir.actions.act_window,name:energy_selfconsumption.change_state_inscription_wizard_action
+#: model:ir.actions.server,name:energy_selfconsumption.inscription_to_change_state_action
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.change_state_inscription_wizard_form_view
+msgid "Change state inscription"
+msgstr "Canviar estat d'inscripció"
+
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__change_state_inscription_lines_wizard_ids
+msgid "Change state inscription lines wizards"
+msgstr "Canviar estat d'inscripció"
+
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__change_state_inscription_wizard_id
+msgid "Change state inscription wizard"
+msgstr "Canviar estat d'inscripció"
+
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/controllers/inscriptions_form_controllers.py:0
@@ -1241,7 +1265,8 @@ msgstr "Crea una taula de participants"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__create_uid
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__create_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__create_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__create_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__create_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__create_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__create_uid
@@ -1254,12 +1279,14 @@ msgstr "Crea una taula de participants"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__create_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__create_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__create_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__create_uid
msgid "Created by"
msgstr "Creat per"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__create_date
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__create_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__create_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__create_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__create_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__create_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__create_date
@@ -1273,6 +1300,7 @@ msgstr "Creat per"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__create_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__create_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__distribution_table_create_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__create_date
msgid "Created on"
msgstr "Creat el"
@@ -1374,7 +1402,7 @@ msgid "Delimiter in import CSV file."
msgstr "Delimitador al fitxer CSV d'importació."
#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__name
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__name
msgid "Description"
msgstr "Descripció"
@@ -1385,7 +1413,8 @@ msgstr "Formulari de descripció"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__display_name
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__display_name
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__display_name
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__display_name
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__display_name
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__display_name
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__display_name
@@ -1398,6 +1427,7 @@ msgstr "Formulari de descripció"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__display_name
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__display_name
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__display_name
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__display_name
msgid "Display Name"
msgstr "Mostrar Nom"
@@ -1491,11 +1521,6 @@ msgstr "Descarregar l'Acord de repartiment de poders"
msgid "Download Self-consumption Manager Authorization"
msgstr "Descarregar Autorització del Gestor d'Autoconsum"
-#. module: energy_selfconsumption
-#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_import_wizard_form_view
-msgid "Download State List"
-msgstr "Descarrega la llista de províncies"
-
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/models/distribution_table.py:0
@@ -2001,7 +2026,8 @@ msgstr ""
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__id
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__id
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__id
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__id
@@ -2014,6 +2040,7 @@ msgstr ""
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__id
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__id
msgid "ID"
msgstr ""
@@ -2121,7 +2148,11 @@ msgstr ""
#. module: energy_selfconsumption
#. odoo-python
+#: code:addons/energy_selfconsumption/models/inscription.py:0
#: code:addons/energy_selfconsumption/models/selfconsumption.py:0
+#: code:addons/energy_selfconsumption/wizards/change_state_inscription_wizard.py:0
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_change_state_inscription_lines_wizard__state__inactive
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_inscription_selfconsumption__state__inactive
#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_selfconsumption__conf_state__inactive
#, python-format
msgid "Inactive"
@@ -2139,6 +2170,7 @@ msgstr ""
"encontrarlo en cadastro.es"
#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__inscription_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__inscription_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__inscription_ids
msgid "Inscription"
@@ -2404,7 +2436,8 @@ msgstr "Última data facturada"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard____last_update
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation____last_update
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard____last_update
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard____last_update
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report____last_update
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard____last_update
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard____last_update
@@ -2417,6 +2450,7 @@ msgstr "Última data facturada"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard____last_update
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point____last_update
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation____last_update
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation____last_update
msgid "Last Modified on"
msgstr "Última modificació el "
@@ -2432,7 +2466,8 @@ msgstr "Inici de l'últim període"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__write_uid
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__write_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__write_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__write_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__write_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__write_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__write_uid
@@ -2445,12 +2480,14 @@ msgstr "Inici de l'últim període"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__write_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__write_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__write_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__write_uid
msgid "Last Updated by"
msgstr "Última actualització per"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__write_date
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__write_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__write_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__write_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__write_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__write_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__write_date
@@ -2463,6 +2500,7 @@ msgstr "Última actualització per"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__write_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__write_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__write_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__write_date
msgid "Last Updated on"
msgstr "Última actualització el"
@@ -2846,7 +2884,7 @@ msgid "Owners"
msgstr "Titulars"
#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__participation
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__participation_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__participation_quantity
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__conf_participation_ids
#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_form_view
@@ -2861,10 +2899,16 @@ msgid "Participation does not exist."
msgstr "La participació no existeix."
#. module: energy_selfconsumption
-#: model:ir.model,name:energy_selfconsumption.model_energy_project_participation
+#: model:ir.model,name:energy_selfconsumption.model_energy_selfconsumptions_participation
msgid "Participation inscription"
msgstr "Inscripció de participació"
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__participation_real_quantity
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__participation_real_quantity
+msgid "Participation real quantity"
+msgstr "Quantitat real de participació"
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__partner_id
msgid "Partner"
@@ -2936,6 +2980,11 @@ msgstr "Percentatge de potència distribuïda"
msgid "Phone"
msgstr "Telèfon"
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__power
+msgid "Power (kW)"
+msgstr "Potència (kW)"
+
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/models/selfconsumption.py:0
@@ -2994,8 +3043,8 @@ msgid "Production facility code for liquidation purposes"
msgstr "Codi de la instal·lació de producció a efectes de liquidació"
#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__project_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__project_id
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__project_id
#: model:ir.ui.menu,name:energy_selfconsumption.project_menu
msgid "Project"
msgstr "Projecte"
@@ -3033,7 +3082,7 @@ msgid "Proportional"
msgstr "Proporcional"
#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__quantity
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__quantity
msgid "Quantity"
msgstr "Quantitat"
@@ -3045,11 +3094,6 @@ msgstr "Quantitat"
msgid "Quotechar in import CSV file."
msgstr "Caràcter de citació al arxiu CSV d'importació."
-#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__power
-msgid "Power (kW)"
-msgstr "Potència (kW)"
-
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_define_invoicing_mode_wizard__recurring_rule_type
msgid "Recurrence"
@@ -3148,8 +3192,9 @@ msgid ""
"Select when you want to make the payment by bank transfer. If not requested,"
" the payment must be made by bank transfer by the member."
msgstr ""
-"Seleccioneu quan voleu fer el pagament per transferència bancària. Si no es demana,"
-" el pagament s'ha de fer mitjançant transferència bancària per part del soci."
+"Seleccioneu quan voleu fer el pagament per transferència bancària. Si no es "
+"demana, el pagament s'ha de fer mitjançant transferència bancària per part "
+"del soci."
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_invoicing_wizard__num_contracts
@@ -3294,6 +3339,11 @@ msgstr ""
msgid "Service Contract"
msgstr "Contracte de serveis"
+#. module: energy_selfconsumption
+#: model:ir.model,name:energy_selfconsumption.model_energy_selfconsumption_change_state_inscription_lines_wizard
+msgid "Service to change state of inscription lines"
+msgstr "Servei per canviar l'estat de les línies d'inscripció"
+
#. module: energy_selfconsumption
#: model:ir.model,name:energy_selfconsumption.model_energy_selfconsumption_create_distribution_table
msgid "Service to create distribution table for a self-consumption"
@@ -3311,6 +3361,7 @@ msgid "Service to generate contract"
msgstr "energy_selfconsumption.contract_generation.wizard"
#. module: energy_selfconsumption
+#: model:ir.model,name:energy_selfconsumption.model_energy_selfconsumption_change_state_inscription_wizard
#: model:ir.model,name:energy_selfconsumption.model_energy_selfconsumption_create_distribution_table_wizard
msgid "Service to generate distribution table"
msgstr "Servei per generar taula de distribució"
@@ -3389,8 +3440,10 @@ msgid "Starting date of the invoicing"
msgstr "Data d’inici de la facturació"
#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__selfconsumption_project_state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__state
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__state_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__state_id
@@ -3805,6 +3858,15 @@ msgstr "Veure formulari d'inscripció"
msgid "Vulnerability situation"
msgstr "Situació de vulnerabilitat"
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_import_wizard_form_view
+msgid ""
+"Warning: In the configuration of this registration, importing bank account "
+"is not marked."
+msgstr ""
+"Avís: a la configuració d'aquest registre, no es marca el compte bancari "
+"d'importació."
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__website_message_ids
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__website_message_ids
@@ -3924,6 +3986,7 @@ msgstr "Us heu registrat correctament."
#. module: energy_selfconsumption
#. odoo-python
+#: code:addons/energy_selfconsumption/wizards/change_state_inscription_wizard.py:0
#: code:addons/energy_selfconsumption/wizards/create_distribution_table_wizard.py:0
#, python-format
msgid "You have to select at least one entry."
diff --git a/energy_selfconsumption/i18n/energy_selfconsumption.pot b/energy_selfconsumption/i18n/energy_selfconsumption.pot
index df32da138..1f0ec5fb0 100644
--- a/energy_selfconsumption/i18n/energy_selfconsumption.pot
+++ b/energy_selfconsumption/i18n/energy_selfconsumption.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-30 11:37+0000\n"
-"PO-Revision-Date: 2025-01-30 11:37+0000\n"
+"POT-Creation-Date: 2025-02-13 10:06+0000\n"
+"PO-Revision-Date: 2025-02-13 10:06+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -592,10 +592,14 @@ msgstr ""
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/models/distribution_table.py:0
+#: code:addons/energy_selfconsumption/models/inscription.py:0
#: code:addons/energy_selfconsumption/models/selfconsumption.py:0
+#: code:addons/energy_selfconsumption/wizards/change_state_inscription_wizard.py:0
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__active
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__active
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_change_state_inscription_lines_wizard__state__active
#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_distribution_table__state__active
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_inscription_selfconsumption__state__active
#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_selfconsumption__conf_state__active
#, python-format
msgid "Active"
@@ -670,12 +674,6 @@ msgstr ""
msgid "Advance to In Inscription"
msgstr ""
-#. module: energy_selfconsumption
-#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_import_wizard_form_view
-msgid ""
-"Warning: In the configuration of this registration, importing bank account is not marked."
-msgstr ""
-
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__annual_electricity_use
msgid "Annual electricity use"
@@ -834,6 +832,33 @@ msgstr ""
msgid "Cancel"
msgstr ""
+#. module: energy_selfconsumption
+#. odoo-python
+#: code:addons/energy_selfconsumption/models/inscription.py:0
+#: code:addons/energy_selfconsumption/wizards/change_state_inscription_wizard.py:0
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_change_state_inscription_lines_wizard__state__change
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_inscription_selfconsumption__state__change
+#, python-format
+msgid "Change"
+msgstr ""
+
+#. module: energy_selfconsumption
+#: model:ir.actions.act_window,name:energy_selfconsumption.change_state_inscription_wizard_action
+#: model:ir.actions.server,name:energy_selfconsumption.inscription_to_change_state_action
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.change_state_inscription_wizard_form_view
+msgid "Change state inscription"
+msgstr ""
+
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__change_state_inscription_lines_wizard_ids
+msgid "Change state inscription lines wizards"
+msgstr ""
+
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__change_state_inscription_wizard_id
+msgid "Change state inscription wizard"
+msgstr ""
+
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/controllers/inscriptions_form_controllers.py:0
@@ -1069,7 +1094,8 @@ msgstr ""
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__create_uid
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__create_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__create_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__create_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__create_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__create_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__create_uid
@@ -1082,12 +1108,14 @@ msgstr ""
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__create_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__create_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__create_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__create_uid
msgid "Created by"
msgstr ""
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__create_date
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__create_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__create_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__create_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__create_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__create_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__create_date
@@ -1101,6 +1129,7 @@ msgstr ""
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__create_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__create_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__distribution_table_create_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__create_date
msgid "Created on"
msgstr ""
@@ -1192,7 +1221,7 @@ msgid "Delimiter in import CSV file."
msgstr ""
#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__name
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__name
msgid "Description"
msgstr ""
@@ -1203,7 +1232,8 @@ msgstr ""
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__display_name
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__display_name
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__display_name
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__display_name
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__display_name
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__display_name
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__display_name
@@ -1216,6 +1246,7 @@ msgstr ""
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__display_name
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__display_name
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__display_name
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__display_name
msgid "Display Name"
msgstr ""
@@ -1305,11 +1336,6 @@ msgstr ""
msgid "Download Self-consumption Manager Authorization"
msgstr ""
-#. module: energy_selfconsumption
-#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_import_wizard_form_view
-msgid "Download State List"
-msgstr ""
-
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/models/distribution_table.py:0
@@ -1769,7 +1795,8 @@ msgstr ""
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__id
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__id
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__id
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__id
@@ -1782,6 +1809,7 @@ msgstr ""
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__id
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__id
msgid "ID"
msgstr ""
@@ -1887,7 +1915,11 @@ msgstr ""
#. module: energy_selfconsumption
#. odoo-python
+#: code:addons/energy_selfconsumption/models/inscription.py:0
#: code:addons/energy_selfconsumption/models/selfconsumption.py:0
+#: code:addons/energy_selfconsumption/wizards/change_state_inscription_wizard.py:0
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_change_state_inscription_lines_wizard__state__inactive
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_inscription_selfconsumption__state__inactive
#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_selfconsumption__conf_state__inactive
#, python-format
msgid "Inactive"
@@ -1903,6 +1935,7 @@ msgid ""
msgstr ""
#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__inscription_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__inscription_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__inscription_ids
msgid "Inscription"
@@ -2164,7 +2197,8 @@ msgstr ""
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard____last_update
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation____last_update
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard____last_update
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard____last_update
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report____last_update
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard____last_update
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard____last_update
@@ -2177,6 +2211,7 @@ msgstr ""
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard____last_update
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point____last_update
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation____last_update
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation____last_update
msgid "Last Modified on"
msgstr ""
@@ -2192,7 +2227,8 @@ msgstr ""
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__write_uid
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__write_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__write_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__write_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__write_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__write_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__write_uid
@@ -2205,12 +2241,14 @@ msgstr ""
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__write_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__write_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__write_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__write_uid
msgid "Last Updated by"
msgstr ""
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__write_date
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__write_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__write_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__write_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__write_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__write_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__write_date
@@ -2223,6 +2261,7 @@ msgstr ""
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__write_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__write_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__write_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__write_date
msgid "Last Updated on"
msgstr ""
@@ -2597,7 +2636,7 @@ msgid "Owners"
msgstr ""
#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__participation
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__participation_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__participation_quantity
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__conf_participation_ids
#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_form_view
@@ -2612,10 +2651,16 @@ msgid "Participation does not exist."
msgstr ""
#. module: energy_selfconsumption
-#: model:ir.model,name:energy_selfconsumption.model_energy_project_participation
+#: model:ir.model,name:energy_selfconsumption.model_energy_selfconsumptions_participation
msgid "Participation inscription"
msgstr ""
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__participation_real_quantity
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__participation_real_quantity
+msgid "Participation real quantity"
+msgstr ""
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__partner_id
msgid "Partner"
@@ -2687,6 +2732,11 @@ msgstr ""
msgid "Phone"
msgstr ""
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__power
+msgid "Power (kW)"
+msgstr ""
+
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/models/selfconsumption.py:0
@@ -2745,8 +2795,8 @@ msgid "Production facility code for liquidation purposes"
msgstr ""
#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__project_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__project_id
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__project_id
#: model:ir.ui.menu,name:energy_selfconsumption.project_menu
msgid "Project"
msgstr ""
@@ -2783,7 +2833,7 @@ msgid "Proportional"
msgstr ""
#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__quantity
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__quantity
msgid "Quantity"
msgstr ""
@@ -2795,11 +2845,6 @@ msgstr ""
msgid "Quotechar in import CSV file."
msgstr ""
-#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__power
-msgid "Power (kW)"
-msgstr ""
-
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_define_invoicing_mode_wizard__recurring_rule_type
msgid "Recurrence"
@@ -3036,6 +3081,11 @@ msgstr ""
msgid "Service Contract"
msgstr ""
+#. module: energy_selfconsumption
+#: model:ir.model,name:energy_selfconsumption.model_energy_selfconsumption_change_state_inscription_lines_wizard
+msgid "Service to change state of inscription lines"
+msgstr ""
+
#. module: energy_selfconsumption
#: model:ir.model,name:energy_selfconsumption.model_energy_selfconsumption_create_distribution_table
msgid "Service to create distribution table for a self-consumption"
@@ -3053,6 +3103,7 @@ msgid "Service to generate contract"
msgstr ""
#. module: energy_selfconsumption
+#: model:ir.model,name:energy_selfconsumption.model_energy_selfconsumption_change_state_inscription_wizard
#: model:ir.model,name:energy_selfconsumption.model_energy_selfconsumption_create_distribution_table_wizard
msgid "Service to generate distribution table"
msgstr ""
@@ -3127,8 +3178,10 @@ msgid "Starting date of the invoicing"
msgstr ""
#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__selfconsumption_project_state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__state
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__state_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__state_id
@@ -3517,6 +3570,13 @@ msgstr ""
msgid "Vulnerability situation"
msgstr ""
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_import_wizard_form_view
+msgid ""
+"Warning: In the configuration of this registration, importing bank account "
+"is not marked."
+msgstr ""
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__website_message_ids
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__website_message_ids
@@ -3624,6 +3684,7 @@ msgstr ""
#. module: energy_selfconsumption
#. odoo-python
+#: code:addons/energy_selfconsumption/wizards/change_state_inscription_wizard.py:0
#: code:addons/energy_selfconsumption/wizards/create_distribution_table_wizard.py:0
#, python-format
msgid "You have to select at least one entry."
diff --git a/energy_selfconsumption/i18n/es.po b/energy_selfconsumption/i18n/es.po
index 624b448ae..23554fa9f 100644
--- a/energy_selfconsumption/i18n/es.po
+++ b/energy_selfconsumption/i18n/es.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-30 11:37+0000\n"
-"PO-Revision-Date: 2025-01-30 11:37+0000\n"
+"POT-Creation-Date: 2025-02-13 10:04+0000\n"
+"PO-Revision-Date: 2025-02-13 10:04+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -708,10 +708,14 @@ msgstr "Activar formulario"
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/models/distribution_table.py:0
+#: code:addons/energy_selfconsumption/models/inscription.py:0
#: code:addons/energy_selfconsumption/models/selfconsumption.py:0
+#: code:addons/energy_selfconsumption/wizards/change_state_inscription_wizard.py:0
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__active
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__active
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_change_state_inscription_lines_wizard__state__active
#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_distribution_table__state__active
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_inscription_selfconsumption__state__active
#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_selfconsumption__conf_state__active
#, python-format
msgid "Active"
@@ -788,13 +792,6 @@ msgstr "Avance a activo"
msgid "Advance to In Inscription"
msgstr "Avance a inscripción"
-#. module: energy_selfconsumption
-#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_import_wizard_form_view
-msgid ""
-"Warning: In the configuration of this registration, importing bank account is not marked."
-msgstr ""
-"Alerta: En la configuración de esta inscripción no está marcado importar cuenta bancaria."
-
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__annual_electricity_use
msgid "Annual electricity use"
@@ -963,6 +960,33 @@ msgstr "Referencia catastral de la propiedad"
msgid "Cancel"
msgstr "Cancelar"
+#. module: energy_selfconsumption
+#. odoo-python
+#: code:addons/energy_selfconsumption/models/inscription.py:0
+#: code:addons/energy_selfconsumption/wizards/change_state_inscription_wizard.py:0
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_change_state_inscription_lines_wizard__state__change
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_inscription_selfconsumption__state__change
+#, python-format
+msgid "Change"
+msgstr "Cambiar"
+
+#. module: energy_selfconsumption
+#: model:ir.actions.act_window,name:energy_selfconsumption.change_state_inscription_wizard_action
+#: model:ir.actions.server,name:energy_selfconsumption.inscription_to_change_state_action
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.change_state_inscription_wizard_form_view
+msgid "Change state inscription"
+msgstr "Cambiar estado de inscripción"
+
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__change_state_inscription_lines_wizard_ids
+msgid "Change state inscription lines wizards"
+msgstr "Cambiar estado de inscripción"
+
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__change_state_inscription_wizard_id
+msgid "Change state inscription wizard"
+msgstr "Cambiar estado de inscripción"
+
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/controllers/inscriptions_form_controllers.py:0
@@ -1202,7 +1226,8 @@ msgstr "Crear tabla de participantes"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__create_uid
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__create_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__create_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__create_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__create_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__create_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__create_uid
@@ -1215,12 +1240,14 @@ msgstr "Crear tabla de participantes"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__create_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__create_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__create_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__create_uid
msgid "Created by"
msgstr "Creado por"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__create_date
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__create_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__create_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__create_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__create_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__create_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__create_date
@@ -1234,6 +1261,7 @@ msgstr "Creado por"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__create_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__create_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__distribution_table_create_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__create_date
msgid "Created on"
msgstr "Creado en"
@@ -1325,7 +1353,7 @@ msgid "Delimiter in import CSV file."
msgstr "Delimitador en archivo CSV de importación."
#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__name
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__name
msgid "Description"
msgstr "Descripción"
@@ -1336,7 +1364,8 @@ msgstr "Descripción del formulario"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__display_name
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__display_name
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__display_name
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__display_name
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__display_name
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__display_name
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__display_name
@@ -1349,6 +1378,7 @@ msgstr "Descripción del formulario"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__display_name
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__display_name
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__display_name
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__display_name
msgid "Display Name"
msgstr "Nombre Mostrado"
@@ -1442,11 +1472,6 @@ msgstr "Descargar el Acuerdo de reparto de poderes"
msgid "Download Self-consumption Manager Authorization"
msgstr "Descargar Autorización del Gestor de Autoconsumo"
-#. module: energy_selfconsumption
-#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_import_wizard_form_view
-msgid "Download State List"
-msgstr "Descargar lista de estados"
-
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/models/distribution_table.py:0
@@ -1925,7 +1950,8 @@ msgstr ""
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__id
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__id
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__id
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__id
@@ -1938,6 +1964,7 @@ msgstr ""
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__id
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__id
msgid "ID"
msgstr "Identificador"
@@ -2045,7 +2072,11 @@ msgstr ""
#. module: energy_selfconsumption
#. odoo-python
+#: code:addons/energy_selfconsumption/models/inscription.py:0
#: code:addons/energy_selfconsumption/models/selfconsumption.py:0
+#: code:addons/energy_selfconsumption/wizards/change_state_inscription_wizard.py:0
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_change_state_inscription_lines_wizard__state__inactive
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_inscription_selfconsumption__state__inactive
#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_selfconsumption__conf_state__inactive
#, python-format
msgid "Inactive"
@@ -2063,6 +2094,7 @@ msgstr ""
"encontrarlo en cadastro.es"
#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__inscription_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__inscription_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__inscription_ids
msgid "Inscription"
@@ -2328,7 +2360,8 @@ msgstr "Última fecha facturada"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard____last_update
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation____last_update
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard____last_update
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard____last_update
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report____last_update
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard____last_update
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard____last_update
@@ -2341,6 +2374,7 @@ msgstr "Última fecha facturada"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard____last_update
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point____last_update
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation____last_update
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation____last_update
msgid "Last Modified on"
msgstr "Última modificación el"
@@ -2356,7 +2390,8 @@ msgstr "Inicio del último período"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__write_uid
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__write_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__write_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__write_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__write_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__write_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__write_uid
@@ -2369,12 +2404,14 @@ msgstr "Inicio del último período"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__write_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__write_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__write_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__write_uid
msgid "Last Updated by"
msgstr "Última actualización por"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__write_date
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__write_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__write_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__write_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__write_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__write_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__write_date
@@ -2387,6 +2424,7 @@ msgstr "Última actualización por"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__write_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__write_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__write_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__write_date
msgid "Last Updated on"
msgstr "Ultima actualización en"
@@ -2764,7 +2802,7 @@ msgid "Owners"
msgstr "Titulares"
#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__participation
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__participation_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__participation_quantity
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__conf_participation_ids
#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_form_view
@@ -2779,10 +2817,16 @@ msgid "Participation does not exist."
msgstr "La participación no existe."
#. module: energy_selfconsumption
-#: model:ir.model,name:energy_selfconsumption.model_energy_project_participation
+#: model:ir.model,name:energy_selfconsumption.model_energy_selfconsumptions_participation
msgid "Participation inscription"
msgstr "Inscripción de participación"
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__participation_real_quantity
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__participation_real_quantity
+msgid "Participation real quantity"
+msgstr "Cantidad real de participación"
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__partner_id
msgid "Partner"
@@ -2854,6 +2898,11 @@ msgstr "Porcentaje de energía distribuida"
msgid "Phone"
msgstr "Teléfono"
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__power
+msgid "Power (kW)"
+msgstr "Potencia (kW)"
+
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/models/selfconsumption.py:0
@@ -2912,8 +2961,8 @@ msgid "Production facility code for liquidation purposes"
msgstr "Código de la instalación de producción a efectos de liquidación"
#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__project_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__project_id
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__project_id
#: model:ir.ui.menu,name:energy_selfconsumption.project_menu
msgid "Project"
msgstr "Proyecto"
@@ -2952,7 +3001,7 @@ msgid "Proportional"
msgstr "Proporcional"
#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__quantity
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__quantity
msgid "Quantity"
msgstr "Cantidad"
@@ -2964,11 +3013,6 @@ msgstr "Cantidad"
msgid "Quotechar in import CSV file."
msgstr "Quotechar en archivo CSV de importación."
-#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__power
-msgid "Power (kW)"
-msgstr "Potencia (kW)"
-
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_define_invoicing_mode_wizard__recurring_rule_type
msgid "Recurrence"
@@ -3068,8 +3112,9 @@ msgid ""
"Select when you want to make the payment by bank transfer. If not requested,"
" the payment must be made by bank transfer by the member."
msgstr ""
-"Seleccione cuándo desea realizar el pago por transferencia bancaria. Si no se solicita,"
-" el pago debe ser realizado por transferencia bancaria por el afiliado."
+"Seleccione cuándo desea realizar el pago por transferencia bancaria. Si no "
+"se solicita, el pago debe ser realizado por transferencia bancaria por el "
+"afiliado."
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_invoicing_wizard__num_contracts
@@ -3215,6 +3260,11 @@ msgstr ""
msgid "Service Contract"
msgstr "Contrato de servicios"
+#. module: energy_selfconsumption
+#: model:ir.model,name:energy_selfconsumption.model_energy_selfconsumption_change_state_inscription_lines_wizard
+msgid "Service to change state of inscription lines"
+msgstr "Servicio para cambiar el estado de las inscripciones"
+
#. module: energy_selfconsumption
#: model:ir.model,name:energy_selfconsumption.model_energy_selfconsumption_create_distribution_table
msgid "Service to create distribution table for a self-consumption"
@@ -3232,6 +3282,7 @@ msgid "Service to generate contract"
msgstr "energy_selfconsumption.contract_generation.wizard"
#. module: energy_selfconsumption
+#: model:ir.model,name:energy_selfconsumption.model_energy_selfconsumption_change_state_inscription_wizard
#: model:ir.model,name:energy_selfconsumption.model_energy_selfconsumption_create_distribution_table_wizard
msgid "Service to generate distribution table"
msgstr "Servicio para generar la tabla de distribución"
@@ -3308,8 +3359,10 @@ msgid "Starting date of the invoicing"
msgstr "Fecha de inicio de la facturación"
#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__selfconsumption_project_state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__state
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__state_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__state_id
@@ -3727,6 +3780,15 @@ msgstr "Ver formulario de inscripción"
msgid "Vulnerability situation"
msgstr "Situación de vulnerabilidad"
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_import_wizard_form_view
+msgid ""
+"Warning: In the configuration of this registration, importing bank account "
+"is not marked."
+msgstr ""
+"Alerta: En la configuración de esta inscripción no está marcado importar "
+"cuenta bancaria."
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__website_message_ids
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__website_message_ids
@@ -3846,6 +3908,7 @@ msgstr "Se ha registrado correctamente."
#. module: energy_selfconsumption
#. odoo-python
+#: code:addons/energy_selfconsumption/wizards/change_state_inscription_wizard.py:0
#: code:addons/energy_selfconsumption/wizards/create_distribution_table_wizard.py:0
#, python-format
msgid "You have to select at least one entry."
diff --git a/energy_selfconsumption/i18n/eu_ES.po b/energy_selfconsumption/i18n/eu_ES.po
index 740153d29..834956d50 100644
--- a/energy_selfconsumption/i18n/eu_ES.po
+++ b/energy_selfconsumption/i18n/eu_ES.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-30 11:36+0000\n"
-"PO-Revision-Date: 2025-01-30 11:36+0000\n"
+"POT-Creation-Date: 2025-02-13 10:05+0000\n"
+"PO-Revision-Date: 2025-02-13 10:05+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -729,10 +729,14 @@ msgstr "Aktibatu formularioa"
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/models/distribution_table.py:0
+#: code:addons/energy_selfconsumption/models/inscription.py:0
#: code:addons/energy_selfconsumption/models/selfconsumption.py:0
+#: code:addons/energy_selfconsumption/wizards/change_state_inscription_wizard.py:0
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__active
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__active
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_change_state_inscription_lines_wizard__state__active
#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_distribution_table__state__active
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_inscription_selfconsumption__state__active
#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_selfconsumption__conf_state__active
#, python-format
msgid "Active"
@@ -811,13 +815,6 @@ msgstr "Aktibora aurreratu"
msgid "Advance to In Inscription"
msgstr "Izen-ematearen aurrerapena"
-#. module: energy_selfconsumption
-#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_import_wizard_form_view
-msgid ""
-"Warning: In the configuration of this registration, importing bank account is not marked."
-msgstr ""
-"Abisua: Erregistro honen konfigurazioan, banku-kontua inportatzea ez dago markatuta."
-
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__annual_electricity_use
msgid "Annual electricity use"
@@ -983,6 +980,33 @@ msgstr "Erreferentzia katastrala del inmueble"
msgid "Cancel"
msgstr "Indargabetu"
+#. module: energy_selfconsumption
+#. odoo-python
+#: code:addons/energy_selfconsumption/models/inscription.py:0
+#: code:addons/energy_selfconsumption/wizards/change_state_inscription_wizard.py:0
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_change_state_inscription_lines_wizard__state__change
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_inscription_selfconsumption__state__change
+#, python-format
+msgid "Change"
+msgstr "Aldatu"
+
+#. module: energy_selfconsumption
+#: model:ir.actions.act_window,name:energy_selfconsumption.change_state_inscription_wizard_action
+#: model:ir.actions.server,name:energy_selfconsumption.inscription_to_change_state_action
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.change_state_inscription_wizard_form_view
+msgid "Change state inscription"
+msgstr "Aldatu inscriptzioaren egoera"
+
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__change_state_inscription_lines_wizard_ids
+msgid "Change state inscription lines wizards"
+msgstr "Aldatu inscriptzioaren egoera lerroak"
+
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__change_state_inscription_wizard_id
+msgid "Change state inscription wizard"
+msgstr "Aldatu inscriptzioaren egoera lerroak"
+
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/controllers/inscriptions_form_controllers.py:0
@@ -1228,7 +1252,8 @@ msgstr "Sortu parte-hartzaileen taula"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__create_uid
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__create_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__create_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__create_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__create_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__create_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__create_uid
@@ -1241,12 +1266,14 @@ msgstr "Sortu parte-hartzaileen taula"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__create_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__create_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__create_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__create_uid
msgid "Created by"
msgstr "Sortua"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__create_date
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__create_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__create_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__create_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__create_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__create_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__create_date
@@ -1260,6 +1287,7 @@ msgstr "Sortua"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__create_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__create_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__distribution_table_create_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__create_date
msgid "Created on"
msgstr "Urtean sortua"
@@ -1361,7 +1389,7 @@ msgid "Delimiter in import CSV file."
msgstr "Mugatzailea inportazio CSV fitxategian."
#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__name
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__name
msgid "Description"
msgstr "Deskribapena"
@@ -1372,7 +1400,8 @@ msgstr "Deskribapen formularioa"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__display_name
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__display_name
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__display_name
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__display_name
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__display_name
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__display_name
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__display_name
@@ -1385,6 +1414,7 @@ msgstr "Deskribapen formularioa"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__display_name
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__display_name
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__display_name
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__display_name
msgid "Display Name"
msgstr "Nombre Mostrado"
@@ -1478,11 +1508,6 @@ msgstr "Deskargatu boterea partekatzeko akordioa"
msgid "Download Self-consumption Manager Authorization"
msgstr "Deskargatu Autokontsumo Kudeatzailearen Baimena"
-#. module: energy_selfconsumption
-#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_import_wizard_form_view
-msgid "Download State List"
-msgstr "Deskargatu probintzien zerrenda"
-
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/models/distribution_table.py:0
@@ -1984,7 +2009,8 @@ msgstr ""
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__id
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__id
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__id
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__id
@@ -1997,6 +2023,7 @@ msgstr ""
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__id
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__id
msgid "ID"
msgstr "Identificador"
@@ -2104,7 +2131,11 @@ msgstr ""
#. module: energy_selfconsumption
#. odoo-python
+#: code:addons/energy_selfconsumption/models/inscription.py:0
#: code:addons/energy_selfconsumption/models/selfconsumption.py:0
+#: code:addons/energy_selfconsumption/wizards/change_state_inscription_wizard.py:0
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_change_state_inscription_lines_wizard__state__inactive
+#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_inscription_selfconsumption__state__inactive
#: model:ir.model.fields.selection,name:energy_selfconsumption.selection__energy_selfconsumption_selfconsumption__conf_state__inactive
#, python-format
msgid "Inactive"
@@ -2122,6 +2153,7 @@ msgstr ""
"helbidean aurkituko duzu"
#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__inscription_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__inscription_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__inscription_ids
msgid "Inscription"
@@ -2388,7 +2420,8 @@ msgstr "Azken data fakturatua"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard____last_update
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation____last_update
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard____last_update
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard____last_update
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report____last_update
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard____last_update
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard____last_update
@@ -2401,6 +2434,7 @@ msgstr "Azken data fakturatua"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard____last_update
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point____last_update
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation____last_update
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation____last_update
msgid "Last Modified on"
msgstr "Última modificación el"
@@ -2416,7 +2450,8 @@ msgstr "Azken aldia hasiera"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__write_uid
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__write_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__write_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__write_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__write_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__write_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__write_uid
@@ -2429,12 +2464,14 @@ msgstr "Azken aldia hasiera"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__write_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__write_uid
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__write_uid
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__write_uid
msgid "Last Updated by"
msgstr "Azken eguneratua"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_clean_supply_point_assignation_wizard__write_date
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__write_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__write_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_wizard__write_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_coefficient_report__write_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_contract_generation_wizard__write_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_create_distribution_table_wizard__write_date
@@ -2447,6 +2484,7 @@ msgstr "Azken eguneratua"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__write_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__write_date
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__write_date
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__write_date
msgid "Last Updated on"
msgstr "Azken eguneratzea egunean"
@@ -2829,7 +2867,7 @@ msgid "Owners"
msgstr "Titularrak"
#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__participation
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__participation_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__participation_quantity
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__conf_participation_ids
#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_form_view
@@ -2844,10 +2882,16 @@ msgid "Participation does not exist."
msgstr "Parte hartzea ez da existitzen."
#. module: energy_selfconsumption
-#: model:ir.model,name:energy_selfconsumption.model_energy_project_participation
+#: model:ir.model,name:energy_selfconsumption.model_energy_selfconsumptions_participation
msgid "Participation inscription"
msgstr "Parte hartzeko inskripzioa"
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__participation_real_quantity
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__participation_real_quantity
+msgid "Participation real quantity"
+msgstr "Parte hartzeko kantitatea"
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__partner_id
msgid "Partner"
@@ -2920,6 +2964,11 @@ msgstr "Banatutako potentziaren ehunekoa"
msgid "Phone"
msgstr "Telefonoa"
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__power
+msgid "Power (kW)"
+msgstr "Potentzia (kW)"
+
#. module: energy_selfconsumption
#. odoo-python
#: code:addons/energy_selfconsumption/models/selfconsumption.py:0
@@ -2978,8 +3027,8 @@ msgid "Production facility code for liquidation purposes"
msgstr "Ekoizpen-instalazioaren kodea likidazio-ondorioetarako"
#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__project_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__project_id
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__project_id
#: model:ir.ui.menu,name:energy_selfconsumption.project_menu
msgid "Project"
msgstr "Proiektua"
@@ -3016,7 +3065,7 @@ msgid "Proportional"
msgstr "Proportzionala"
#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_project_participation__quantity
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumptions_participation__quantity
msgid "Quantity"
msgstr "Kantitatea"
@@ -3028,11 +3077,6 @@ msgstr "Kantitatea"
msgid "Quotechar in import CSV file."
msgstr "Quotechar inportazio CSV fitxategian."
-#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__power
-msgid "Power (kW)"
-msgstr "Potentzia (kW)"
-
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_define_invoicing_mode_wizard__recurring_rule_type
msgid "Recurrence"
@@ -3131,8 +3175,8 @@ msgid ""
"Select when you want to make the payment by bank transfer. If not requested,"
" the payment must be made by bank transfer by the member."
msgstr ""
-"Hautatu noiz egin nahi duzun ordainketa banku-transferentzia bidez. Ez bada eskatu,"
-" ordainketa banku-transferentzia bidez egin beharko du bazkideak."
+"Hautatu noiz egin nahi duzun ordainketa banku-transferentzia bidez. Ez bada "
+"eskatu, ordainketa banku-transferentzia bidez egin beharko du bazkideak."
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_invoicing_wizard__num_contracts
@@ -3278,6 +3322,11 @@ msgstr ""
msgid "Service Contract"
msgstr "Zerbitzu-kontratua"
+#. module: energy_selfconsumption
+#: model:ir.model,name:energy_selfconsumption.model_energy_selfconsumption_change_state_inscription_lines_wizard
+msgid "Service to change state of inscription lines"
+msgstr "Inscriptzioaren egoera aldatzeko zerbitzua"
+
#. module: energy_selfconsumption
#: model:ir.model,name:energy_selfconsumption.model_energy_selfconsumption_create_distribution_table
msgid "Service to create distribution table for a self-consumption"
@@ -3295,6 +3344,7 @@ msgid "Service to generate contract"
msgstr "energy_selfconsum.contrat_generation.wizard"
#. module: energy_selfconsumption
+#: model:ir.model,name:energy_selfconsumption.model_energy_selfconsumption_change_state_inscription_wizard
#: model:ir.model,name:energy_selfconsumption.model_energy_selfconsumption_create_distribution_table_wizard
msgid "Service to generate distribution table"
msgstr "Banaketa taula sortzeko zerbitzua"
@@ -3373,8 +3423,10 @@ msgid "Starting date of the invoicing"
msgstr "Fakturaren hasiera data"
#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__selfconsumption_project_state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__state
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__state_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__state_id
@@ -3789,6 +3841,15 @@ msgstr "Ikusi formularioaren inskripzioa"
msgid "Vulnerability situation"
msgstr "Zaurgarritasun egoera"
+#. module: energy_selfconsumption
+#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_import_wizard_form_view
+msgid ""
+"Warning: In the configuration of this registration, importing bank account "
+"is not marked."
+msgstr ""
+"Abisua: Erregistro honen konfigurazioan, banku-kontua inportatzea ez dago "
+"markatuta."
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__website_message_ids
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__website_message_ids
@@ -3906,6 +3967,7 @@ msgstr "Behar bezala erregistratu zara."
#. module: energy_selfconsumption
#. odoo-python
+#: code:addons/energy_selfconsumption/wizards/change_state_inscription_wizard.py:0
#: code:addons/energy_selfconsumption/wizards/create_distribution_table_wizard.py:0
#, python-format
msgid "You have to select at least one entry."
diff --git a/energy_selfconsumption/models/create_inscription.py b/energy_selfconsumption/models/create_inscription.py
index 68e087cdc..35eb772f2 100644
--- a/energy_selfconsumption/models/create_inscription.py
+++ b/energy_selfconsumption/models/create_inscription.py
@@ -232,7 +232,7 @@ class CreateInscription(models.AbstractModel):
("partner_bank_id", "=", bank_account.id),
("partner_id", "=", partner.id),
("company_id", "=", project.company_id.id),
- ])
+ ], limit=1)
)
if mandate_obj:
return False, mandate_obj
@@ -280,7 +280,7 @@ class CreateInscription(models.AbstractModel):
float(values["inscriptionselfconsumption_participation"]),
)
)
- return self.env["energy_project.participation"].sudo().search(domain, limit=1)
+ return self.env["energy_selfconsumptions.participation"].sudo().search(domain, limit=1)
def _get_effective_date(self, values):
"""Gets the effective date."""
@@ -309,7 +309,8 @@ class CreateInscription(models.AbstractModel):
"partner_id": partner.id,
"effective_date": effective_date,
"mandate_id": mandate.id if mandate else False,
- "participation": participation.id,
+ "participation_id": participation.id,
+ "participation_real_quantity": participation.quantity,
"annual_electricity_use": annual_electricity_use,
"accept": True,
"member": True,
diff --git a/energy_selfconsumption/models/inscription.py b/energy_selfconsumption/models/inscription.py
index 493649445..3902e5375 100644
--- a/energy_selfconsumption/models/inscription.py
+++ b/energy_selfconsumption/models/inscription.py
@@ -1,6 +1,11 @@
from odoo import _, api, fields, models
from odoo.exceptions import ValidationError
+STATE_VALUES = [
+ ("active", _("Active")),
+ ("inactive", _("Inactive")),
+ ("change", _("Change")),
+]
class Inscription(models.Model):
_name = "energy_selfconsumption.inscription_selfconsumption"
@@ -20,11 +25,19 @@ class Inscription(models.Model):
check_company=True,
)
annual_electricity_use = fields.Float(string="Annual electricity use")
- participation = fields.Many2one(
- comodel_name="energy_project.participation", string="Participation"
+ participation_id = fields.Many2one(
+ comodel_name="energy_selfconsumptions.participation", string="Participation"
)
participation_quantity = fields.Float(
- string="Participation", related="participation.quantity"
+ string="Participation", related="participation_id.quantity"
+ )
+ participation_real_quantity = fields.Float(
+ string="Participation real quantity", default=lambda self: self.participation_id.quantity
+ )
+ state = fields.Selection(
+ string="State",
+ selection=STATE_VALUES,
+ default="inactive",
)
accept = fields.Boolean(
string="I accept and authorize being able to issue payments"
@@ -50,6 +63,11 @@ class Inscription(models.Model):
related="supply_point_id.owner_id.vulnerability_situation",
)
+ @api.onchange("participation_real_quantity")
+ def _onchange_participation_real_quantity(self):
+ if self.participation_real_quantity != self.participation_quantity and self.state == "active":
+ self.state = "change"
+
@api.constrains("project_id", "partner_id", "supply_point_id")
def _constraint_unique(self):
for record in self:
@@ -73,6 +91,14 @@ class Inscription(models.Model):
).read()[0]
action["context"] = ctx
return action
+
+ def change_state_inscription(self):
+ ctx = self.env.context.copy()
+ action = self.env.ref(
+ "energy_selfconsumption.change_state_inscription_wizard_action"
+ ).read()[0]
+ action["context"] = ctx
+ return action
def unlink(self):
for inscription in self:
diff --git a/energy_selfconsumption/models/participation.py b/energy_selfconsumption/models/participation.py
index 45f30364e..2a3377458 100644
--- a/energy_selfconsumption/models/participation.py
+++ b/energy_selfconsumption/models/participation.py
@@ -2,7 +2,7 @@ from odoo import fields, models
class Participation(models.Model):
- _name = "energy_project.participation"
+ _name = "energy_selfconsumptions.participation"
_description = "Participation inscription"
name = fields.Char(string="Description")
diff --git a/energy_selfconsumption/models/selfconsumption.py b/energy_selfconsumption/models/selfconsumption.py
index 54eb65342..066435b31 100644
--- a/energy_selfconsumption/models/selfconsumption.py
+++ b/energy_selfconsumption/models/selfconsumption.py
@@ -128,7 +128,7 @@ class Selfconsumption(models.Model):
required=True,
)
conf_participation_ids = fields.One2many(
- "energy_project.participation",
+ "energy_selfconsumptions.participation",
"project_id",
string="Participation",
)
@@ -217,6 +217,10 @@ class Selfconsumption(models.Model):
lambda table: table.state == actual_state
)
distribution_table_to_activate.write({"state": new_state})
+ if new_state == "active":
+ self.inscription_ids.filtered_domain(
+ [("supply_point_id", "in", self.distribution_table_ids.mapped("supply_point_assignation_ids.supply_point_id"))]
+ ).write({"state": "active"})
def set_in_activation_state(self):
for record in self:
@@ -234,28 +238,28 @@ class Selfconsumption(models.Model):
@api.model_create_multi
def create(self, values):
res = super().create(values)
- self.env["energy_project.participation"].create(
+ self.env["energy_selfconsumptions.participation"].create(
{
"name": "0,5 kW",
"quantity": 0.5,
"project_id": res.id,
}
)
- self.env["energy_project.participation"].create(
+ self.env["energy_selfconsumptions.participation"].create(
{
"name": "1,0 kW",
"quantity": 1.0,
"project_id": res.id,
}
)
- self.env["energy_project.participation"].create(
+ self.env["energy_selfconsumptions.participation"].create(
{
"name": "1,5 kW",
"quantity": 1.5,
"project_id": res.id,
}
)
- self.env["energy_project.participation"].create(
+ self.env["energy_selfconsumptions.participation"].create(
{
"name": "2,0 kW",
"quantity": 2.0,
diff --git a/energy_selfconsumption/security/ir.model.access.csv b/energy_selfconsumption/security/ir.model.access.csv
index 532740d8a..ce40451eb 100644
--- a/energy_selfconsumption/security/ir.model.access.csv
+++ b/energy_selfconsumption/security/ir.model.access.csv
@@ -1,11 +1,11 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_energy_project_participation_user,energy_project.participation.user,model_energy_project_participation,energy_project.group_user,1,0,0,0
+access_energy_selfconsumptions_participation_user,energy_selfconsumptions.participation.user,model_energy_selfconsumptions_participation,energy_project.group_user,1,0,0,0
access_energy_selfconsumption_selfconsumption_user,energy_selfconsumption.selfconsumption.user,model_energy_selfconsumption_selfconsumption,energy_project.group_user,1,0,0,0
access_energy_selfconsumption_supply_point_user,energy_selfconsumption.supply_point.user,model_energy_selfconsumption_supply_point,energy_project.group_user,1,0,0,0
access_energy_selfconsumption_distribution_table_user,energy_selfconsumption.distribution_table.user,model_energy_selfconsumption_distribution_table,energy_project.group_user,1,0,0,0
access_energy_selfconsumption_supply_point_assignation_user,energy_selfconsumption.supply_point_assignation.user,model_energy_selfconsumption_supply_point_assignation,energy_project.group_user,1,0,0,0
access_energy_selfconsumption_inscription_selfconsumption_user,energy_selfconsumption.inscription_selfconsumption.user,model_energy_selfconsumption_inscription_selfconsumption,energy_project.group_user,1,0,0,0
-access_energy_project_participation_admin,energy_project.participation.admin,model_energy_project_participation,energy_project.group_admin,1,1,1,1
+access_energy_selfconsumptions_participation_admin,energy_selfconsumptions.participation.admin,model_energy_selfconsumptions_participation,energy_project.group_admin,1,1,1,1
access_energy_selfconsumption_selfconsumption_admin,energy_selfconsumption.selfconsumption.admin,model_energy_selfconsumption_selfconsumption,energy_project.group_admin,1,1,1,1
access_energy_selfconsumption_supply_point_admin,energy_selfconsumption.supply_point.admin,model_energy_selfconsumption_supply_point,energy_project.group_admin,1,1,1,1
access_energy_selfconsumption_inscription_selfconsumption_admin,energy_selfconsumption.inscription_selfconsumption.admin,model_energy_selfconsumption_inscription_selfconsumption,energy_project.group_admin,1,1,1,1
@@ -25,3 +25,7 @@ access_energy_selfconsumption_create_distribution_table_user,energy.selfconsumpt
access_energy_selfconsumption_create_distribution_table_admin,energy.selfconsumption.create.distribution.table.admin,model_energy_selfconsumption_create_distribution_table,energy_project.group_admin,1,1,1,1
access_energy_selfconsumption_create_distribution_table_wizard_user,energy.selfconsumption.create.distribution.table.wizard.user,model_energy_selfconsumption_create_distribution_table_wizard,energy_project.group_user,1,1,1,1
access_energy_selfconsumption_create_distribution_table_wizard_admin,energy.selfconsumption.create.distribution.table.wizard.admin,model_energy_selfconsumption_create_distribution_table_wizard,energy_project.group_admin,1,1,1,1
+access_energy_selfconsumption_change_state_inscription_wizard_user,energy.selfconsumption.change.state.inscription.wizard.user,model_energy_selfconsumption_change_state_inscription_wizard,energy_project.group_user,1,1,1,1
+access_energy_selfconsumption_change_state_inscription_wizard_admin,energy.selfconsumption.change.state.inscription.wizard.admin,model_energy_selfconsumption_change_state_inscription_wizard,energy_project.group_admin,1,1,1,1
+access_energy_selfconsumption_change_state_inscription_lines_wizard_user,energy.selfconsumption.change.state.inscription.lines.wizard.user,model_energy_selfconsumption_change_state_inscription_lines_wizard,energy_project.group_user,1,1,1,1
+access_energy_selfconsumption_change_state_inscription_lines_wizard_admin,energy.selfconsumption.change.state.inscription.lines.wizard.admin,model_energy_selfconsumption_change_state_inscription_lines_wizard,energy_project.group_admin,1,1,1,1
diff --git a/energy_selfconsumption/views/inscription_views.xml b/energy_selfconsumption/views/inscription_views.xml
index bda2c184e..9b18beb39 100644
--- a/energy_selfconsumption/views/inscription_views.xml
+++ b/energy_selfconsumption/views/inscription_views.xml
@@ -8,6 +8,7 @@
>energy_selfconsumption.inscription_selfconsumption</field>
<field name="arch" type="xml">
<tree create="false" editable="bottom">
+ <field name="state" width="6%" optional="show" readonly="1"/>
<field
name="partner_id"
options="{'no_create': True}"
@@ -39,6 +40,7 @@
<field name="member" readonly="1" width="6%" optional="hide"/>
<field name="accept" string="Accept terms" readonly="1" width="6%" optional="hide"/>
<field name="participation_quantity" sum="True" width="6%" optional="show"/>
+ <field name="participation_real_quantity" sum="True" width="6%" optional="show" attrs="{'readonly': [('state', '=', 'active')]}" />
</tree>
</field>
</record>
@@ -60,5 +62,17 @@
action = record.create_participant_table()
</field>
</record>
+
+ <record model="ir.actions.server" id="inscription_to_change_state_action">
+ <field name="name">Change state inscription</field>
+ <field name="model_id" ref="model_energy_selfconsumption_inscription_selfconsumption" />
+ <field name="binding_model_id" ref="model_energy_selfconsumption_inscription_selfconsumption" />
+ <field name="binding_type">action</field>
+ <field name="binding_view_types">list,form</field>
+ <field name="state">code</field>
+ <field name="code">
+ action = record.change_state_inscription()
+ </field>
+ </record>
</data>
</odoo>
diff --git a/energy_selfconsumption/wizards/__init__.py b/energy_selfconsumption/wizards/__init__.py
index 3928941e1..cbdff2620 100644
--- a/energy_selfconsumption/wizards/__init__.py
+++ b/energy_selfconsumption/wizards/__init__.py
@@ -5,3 +5,4 @@ from . import define_invoicing_mode_wizard
from . import distribution_table_import_wizard
from . import invoicing_wizard
from . import selfconsumption_import_wizard
+from . import change_state_inscription_wizard
\ No newline at end of file
diff --git a/energy_selfconsumption/wizards/change_state_inscription_wizard.py b/energy_selfconsumption/wizards/change_state_inscription_wizard.py
new file mode 100644
index 000000000..d5da46aed
--- /dev/null
+++ b/energy_selfconsumption/wizards/change_state_inscription_wizard.py
@@ -0,0 +1,89 @@
+import logging
+
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
+
+logger = logging.getLogger(__name__)
+
+STATE_VALUES = [
+ ("active", _("Active")),
+ ("inactive", _("Inactive")),
+ ("change", _("Change")),
+]
+
+
+class ChangeStateInscriptionWizard(models.TransientModel):
+ _name = "energy_selfconsumption.change_state_inscription.wizard"
+ _description = "Service to generate distribution table"
+
+ change_state_inscription_lines_wizard_ids = fields.One2many(
+ "energy_selfconsumption.change_state_inscription_lines.wizard",
+ "change_state_inscription_wizard_id",
+ string="Change state inscription lines wizards",
+ )
+
+ @api.model
+ def default_get(self, default_fields):
+ # OVERRIDE
+ default_fields = super().default_get(default_fields)
+
+ if len(self.env.context.get("active_ids", [])) == 0:
+ raise ValidationError(_("You have to select at least one entry."))
+
+ lines = []
+ for inscription_id in self.env.context["active_ids"]:
+ inscription = self.env["energy_selfconsumption.inscription_selfconsumption"].browse(inscription_id)
+ lines.append((0, 0, {
+ "change_state_inscription_wizard_id": self.id,
+ "inscription_id": inscription.id,
+ "state": inscription.state,
+ "participation_real_quantity": inscription.participation_real_quantity,
+ }))
+
+ default_fields["change_state_inscription_lines_wizard_ids"] = lines
+
+ return default_fields
+
+ def change_state_inscription(self):
+ for change_state_inscription_lines_wizard in self.change_state_inscription_lines_wizard_ids:
+ inscription = self.env["energy_selfconsumption.inscription_selfconsumption"].browse(change_state_inscription_lines_wizard.inscription_id.id)
+ vals = {}
+ if inscription.state != change_state_inscription_lines_wizard.state:
+ vals["state"] = change_state_inscription_lines_wizard.state
+ if inscription.participation_real_quantity != change_state_inscription_lines_wizard.participation_real_quantity:
+ vals["participation_real_quantity"] = change_state_inscription_lines_wizard.participation_real_quantity
+ if vals != {}:
+ inscription.update(vals)
+ return True
+
+
+class ChangeStateInscriptionLinesWizard(models.TransientModel):
+ _name = "energy_selfconsumption.change_state_inscription_lines.wizard"
+ _description = "Service to change state of inscription lines"
+
+ change_state_inscription_wizard_id = fields.Many2one(
+ "energy_selfconsumption.change_state_inscription.wizard",
+ string="Change state inscription wizard",
+ required=True,
+ )
+
+ inscription_id = fields.Many2one(
+ "energy_selfconsumption.inscription_selfconsumption",
+ string="Inscription",
+ required=True,
+ )
+
+ state = fields.Selection(
+ STATE_VALUES, required=True, string="State"
+ )
+
+ participation_real_quantity = fields.Float(
+ string="Participation real quantity", required=True
+ )
+
+ @api.onchange("participation_real_quantity")
+ def _onchange_participation_real_quantity(self):
+ if self.participation_real_quantity != self.inscription_id.participation_quantity and self.state == "active":
+ self.state = "change"
+ if self.participation_real_quantity == self.inscription_id.participation_quantity and self.state == "change":
+ self.state = "active"
diff --git a/energy_selfconsumption/wizards/change_state_inscription_wizard_views.xml b/energy_selfconsumption/wizards/change_state_inscription_wizard_views.xml
new file mode 100644
index 000000000..404256686
--- /dev/null
+++ b/energy_selfconsumption/wizards/change_state_inscription_wizard_views.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+ <data>
+
+ <record id="change_state_inscription_wizard_form_view" model="ir.ui.view">
+ <field name="name">change_state_inscription_wizard_form</field>
+ <field name="model">energy_selfconsumption.change_state_inscription.wizard</field>
+ <field name="arch" type="xml">
+ <form>
+ <sheet>
+ <field name="change_state_inscription_lines_wizard_ids" nolabel="1">
+ <tree editable="bottom">
+ <field name="inscription_id" readonly="1" force_save="1"/>
+ <field name="state" readonly="1" force_save="1" />
+ <field name="participation_real_quantity" />
+ </tree>
+ </field>
+ </sheet>
+ <footer>
+ <button type="object" name="change_state_inscription">Change state inscription</button>
+ </footer>
+ </form>
+ </field>
+ </record>
+
+ <record id="change_state_inscription_wizard_action" model="ir.actions.act_window">
+ <field name="name">Change state inscription</field>
+ <field name="res_model">energy_selfconsumption.change_state_inscription.wizard</field>
+ <field name="view_mode">form</field>
+ <field name="target">new</field>
+ </record>
+ </data>
+</odoo>
diff --git a/energy_selfconsumption/wizards/create_distribution_table_wizard.py b/energy_selfconsumption/wizards/create_distribution_table_wizard.py
index 9faf01bb6..e14c90956 100644
--- a/energy_selfconsumption/wizards/create_distribution_table_wizard.py
+++ b/energy_selfconsumption/wizards/create_distribution_table_wizard.py
@@ -72,7 +72,7 @@ class CreateDistributionTableWizard(models.TransientModel):
default_fields["max_distributed_power"] = selfconsumption.power
default_fields["distributed_power"] = sum(
- map(lambda inscription: inscription.participation_quantity, inscriptions)
+ map(lambda inscription: inscription.participation_real_quantity, inscriptions)
)
default_fields["percentage_of_distributed_power"] = (
@@ -127,7 +127,7 @@ class CreateDistributionTableWizard(models.TransientModel):
def get_supply_point_assignation_values(
self, inscription, distribution_table, len_inscriptions
):
- coefficient = inscription.participation_quantity
+ coefficient = inscription.participation_real_quantity
if self.distribute_excess == "yes":
distribute_excess_float = (
@@ -136,7 +136,7 @@ class CreateDistributionTableWizard(models.TransientModel):
if self.type_distribute_excess == "proportional":
coefficient += distribute_excess_float * (
- inscription.participation_quantity / self.distributed_power
+ inscription.participation_real_quantity / self.distributed_power
)
else:
coefficient += distribute_excess_float / len_inscriptions
diff --git a/energy_selfconsumption/wizards/selfconsumption_import_wizard.py b/energy_selfconsumption/wizards/selfconsumption_import_wizard.py
index c1b1fee6f..924b2322c 100644
--- a/energy_selfconsumption/wizards/selfconsumption_import_wizard.py
+++ b/energy_selfconsumption/wizards/selfconsumption_import_wizard.py
@@ -331,7 +331,7 @@ class SelfconsumptionImportWizard(models.TransientModel):
# )
participation = (
- self.env["energy_project.participation"]
+ self.env["energy_selfconsumptions.participation"]
.sudo()
.search(
[
@@ -386,7 +386,8 @@ class SelfconsumptionImportWizard(models.TransientModel):
"effective_date": datetime.now().strftime("%Y-%m-%d"),
"mandate_id": False,
"supply_point_id": supply_point.id,
- "participation": participation[0].id,
+ "participation_id": participation[0].id,
+ "participation_real_quantity": participation[0].quantity,
"annual_electricity_use": 1.0,
"accept": True,
"member": True,
@@ -410,37 +411,72 @@ class SelfconsumptionImportWizard(models.TransientModel):
("state", "=", "valid"),
]
)
- if mandates:
- participation = (
- self.env["energy_project.participation"]
- .sudo()
- .search(
- [
- (
- "project_id",
- "=",
- active_id,
- )
- ]
- )
+ participation = (
+ self.env["energy_selfconsumptions.participation"]
+ .sudo()
+ .search(
+ [
+ (
+ "project_id",
+ "=",
+ active_id,
+ )
+ ]
)
- if participation:
- self.env[
- "energy_selfconsumption.inscription_selfconsumption"
- ].sudo().create(
- {
- "project_id": active_id,
- "partner_id": partner.id,
- "effective_date": datetime.now().strftime("%Y-%m-%d"),
- "mandate_id": mandates[0].id,
- "code": self.generate_cups(),
- "participation": participation[0].id,
- "annual_electricity_use": 1.0,
- "accept": True,
- "member": True,
- "selfconsumption_project_id": active_id,
- }
- )
- count += 1
+ )
+ supply_point = self.env["energy_selfconsumption.supply_point"].sudo().search([("partner_id", "=", partner.id)])
+ if not supply_point:
+ _ACCESS_TARIFF_VALUES = [
+ ("6.1TD", "6.1TD"),
+ ("6.2TD", "6.2TD"),
+ ("6.3TD", "6.3TD"),
+ ("6.4TD", "6.4TD"),
+ ]
+
+ contracted_power = round(random.uniform(1, 100), 2)
+
+ if contracted_power <= 15:
+ tariff = "2.0TD"
+ elif contracted_power <= 50:
+ tariff = "3.0TD"
+ else:
+ tariff = random.choice(_ACCESS_TARIFF_VALUES)[0]
+
+ supply_point = [self.env["energy_selfconsumption.supply_point"].sudo().create(
+ {
+ "code": self.generate_cups(),
+ "name": partner.name or "Prueba",
+ "street": partner.street or "Calle prueba",
+ "city": partner.city or "Madrid",
+ "zip": partner.zip or 28221,
+ "state_id": partner.state_id.id or self.env["res.country.state"].sudo().search([("code", "=", "MA")])[0].id,
+ "country_id": partner.country_id.id or self.env["res.country"].sudo().search([("code", "=", "ES")])[0].id,
+ "owner_id": partner.id,
+ "partner_id": partner.id,
+ "contracted_power": contracted_power,
+ "tariff": tariff,
+ }
+ )]
+
+ if participation:
+ self.env[
+ "energy_selfconsumption.inscription_selfconsumption"
+ ].sudo().create(
+ {
+ "project_id": active_id,
+ "partner_id": partner.id,
+ "effective_date": datetime.now().strftime("%Y-%m-%d"),
+ "mandate_id": mandates[0].id if mandates else False,
+ "code": self.generate_cups(),
+ "participation_id": participation[0].id,
+ "participation_real_quantity": participation[0].quantity,
+ "supply_point_id": supply_point[0].id,
+ "annual_electricity_use": 1.0,
+ "accept": True,
+ "member": True,
+ "selfconsumption_project_id": active_id,
+ }
+ )
+ count += 1
return True
--
GitLab
From 85c4353369fbc91fbe48654cea08300af9f87a75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Garc=C3=ADa?= <alvarogruiz8@gmail.com>
Date: Thu, 13 Feb 2025 11:28:38 +0100
Subject: [PATCH 09/12] [IMP] Pre-commit
---
energy_communities/models/mail_channel.py | 9 +-
.../models/partner.py | 2 +-
.../inscriptions_form_controllers.py | 28 +--
.../models/contract_line.py | 4 +-
.../models/create_inscription.py | 33 ++--
energy_selfconsumption/models/inscription.py | 11 +-
.../models/selfconsumption.py | 29 ++-
energy_selfconsumption/wizards/__init__.py | 2 +-
.../change_state_inscription_wizard.py | 59 +++++--
.../create_distribution_table_wizard.py | 5 +-
.../wizards/selfconsumption_import_wizard.py | 166 +++++++++++-------
11 files changed, 230 insertions(+), 118 deletions(-)
diff --git a/energy_communities/models/mail_channel.py b/energy_communities/models/mail_channel.py
index 4c5f4874b..3beced4ff 100644
--- a/energy_communities/models/mail_channel.py
+++ b/energy_communities/models/mail_channel.py
@@ -1,14 +1,15 @@
from odoo import models
+
class Channel(models.Model):
- _inherit = 'mail.channel'
-
+ _inherit = "mail.channel"
+
def _subscribe_users_automatically(self):
new_members = self.sudo()._subscribe_users_automatically_get_members()
if new_members:
to_create = [
- {'channel_id': channel_id, 'partner_id': partner_id}
+ {"channel_id": channel_id, "partner_id": partner_id}
for channel_id in new_members
for partner_id in new_members[channel_id]
]
- self.env['mail.channel.member'].sudo().create(to_create)
\ No newline at end of file
+ self.env["mail.channel.member"].sudo().create(to_create)
diff --git a/energy_communities_cooperator/models/partner.py b/energy_communities_cooperator/models/partner.py
index 51c7123dd..f344e2b6b 100644
--- a/energy_communities_cooperator/models/partner.py
+++ b/energy_communities_cooperator/models/partner.py
@@ -20,7 +20,7 @@ class ResPartner(models.Model):
no_member_autorized_in_energy_actions = fields.Boolean(
string="Authorized guest",
company_dependent=True,
- help="Enable the contact to participate in Community Energy Actions despite not being an effective member of the Community."
+ help="Enable the contact to participate in Community Energy Actions despite not being an effective member of the Community.",
)
@api.depends("vat")
diff --git a/energy_selfconsumption/controllers/inscriptions_form_controllers.py b/energy_selfconsumption/controllers/inscriptions_form_controllers.py
index 7059035d5..4265dbf5e 100644
--- a/energy_selfconsumption/controllers/inscriptions_form_controllers.py
+++ b/energy_selfconsumption/controllers/inscriptions_form_controllers.py
@@ -62,9 +62,13 @@ class WebsiteInscriptionsFormController(WebsiteFormController):
partner = (
request.env["res.partner"]
.sudo()
- .search([("vat", "=", values["inscription_partner_id_vat"]),
- ("parent_id", "=", False),
- ("company_ids", "in", (project.company_id.id))])
+ .search(
+ [
+ ("vat", "=", values["inscription_partner_id_vat"]),
+ ("parent_id", "=", False),
+ ("company_ids", "in", (project.company_id.id)),
+ ]
+ )
)
if not partner:
return {
@@ -72,7 +76,9 @@ class WebsiteInscriptionsFormController(WebsiteFormController):
"global_error": True,
}
partner = partner.get_partner_with_type()
- if not partner.with_company(project.company_id.id).no_member_autorized_in_energy_actions:
+ if not partner.with_company(
+ project.company_id.id
+ ).no_member_autorized_in_energy_actions:
cooperator = (
request.env["cooperative.membership"]
.sudo()
@@ -375,12 +381,14 @@ class WebsiteInscriptionsFormController(WebsiteFormController):
partner = (
request.env["res.partner"]
.sudo()
- .with_company(model.company_id.id)
- .search([
- ("vat", "=", values["inscription_partner_id_vat"]),
- ("parent_id", "=", False),
- ("company_ids", "in", (model.company_id.id))
- ])
+ .with_company(model.company_id.id)
+ .search(
+ [
+ ("vat", "=", values["inscription_partner_id_vat"]),
+ ("parent_id", "=", False),
+ ("company_ids", "in", (model.company_id.id)),
+ ]
+ )
)
self.send_email(model, partner)
return values
diff --git a/energy_selfconsumption/models/contract_line.py b/energy_selfconsumption/models/contract_line.py
index 8ebf84cd5..2b8b031b5 100644
--- a/energy_selfconsumption/models/contract_line.py
+++ b/energy_selfconsumption/models/contract_line.py
@@ -56,5 +56,7 @@ class ContractLine(models.Model):
)
record.days_invoiced = (
- (last_date_invoiced - first_date_invoiced).days + 1 if first_date_invoiced and last_date_invoiced else 0
+ (last_date_invoiced - first_date_invoiced).days + 1
+ if first_date_invoiced and last_date_invoiced
+ else 0
)
diff --git a/energy_selfconsumption/models/create_inscription.py b/energy_selfconsumption/models/create_inscription.py
index 35eb772f2..c6282b9a0 100644
--- a/energy_selfconsumption/models/create_inscription.py
+++ b/energy_selfconsumption/models/create_inscription.py
@@ -116,7 +116,9 @@ class CreateInscription(models.AbstractModel):
project,
):
"""Create an entry for self-consumption on a specific project."""
- partner = self._get_partner(values["inscription_partner_id_vat"], project.company_id.id)
+ partner = self._get_partner(
+ values["inscription_partner_id_vat"], project.company_id.id
+ )
if not partner:
return True, _("Partner with VAT:<b>{vat}</b> was not found.").format(
vat=values["inscription_partner_id_vat"]
@@ -142,7 +144,9 @@ class CreateInscription(models.AbstractModel):
if not owner:
return True, _("Owner could not be created or found.")
- contracted_power = float(str(values.get("supplypoint_contracted_power", "0")).replace(",", "."))
+ contracted_power = float(
+ str(values.get("supplypoint_contracted_power", "0")).replace(",", ".")
+ )
tariff = self._determine_tariff(contracted_power, values)
return self._create_supply_point(
@@ -162,7 +166,7 @@ class CreateInscription(models.AbstractModel):
[
("vat", "=", vat),
("parent_id", "=", False),
- ("company_ids", "in", (company_id))
+ ("company_ids", "in", (company_id)),
],
limit=1,
)
@@ -170,7 +174,9 @@ class CreateInscription(models.AbstractModel):
def _is_cooperator(self, partner, project):
"""Verify if the partner is a cooperative member o no member but autorized in energy actions"""
- if partner.with_company(project.company_id.id).no_member_autorized_in_energy_actions:
+ if partner.with_company(
+ project.company_id.id
+ ).no_member_autorized_in_energy_actions:
return True
return bool(
self.env["cooperative.membership"]
@@ -228,11 +234,14 @@ class CreateInscription(models.AbstractModel):
self.env["account.banking.mandate"]
.with_company(project.company_id)
.sudo()
- .search([
- ("partner_bank_id", "=", bank_account.id),
- ("partner_id", "=", partner.id),
- ("company_id", "=", project.company_id.id),
- ], limit=1)
+ .search(
+ [
+ ("partner_bank_id", "=", bank_account.id),
+ ("partner_id", "=", partner.id),
+ ("company_id", "=", project.company_id.id),
+ ],
+ limit=1,
+ )
)
if mandate_obj:
return False, mandate_obj
@@ -280,7 +289,11 @@ class CreateInscription(models.AbstractModel):
float(values["inscriptionselfconsumption_participation"]),
)
)
- return self.env["energy_selfconsumptions.participation"].sudo().search(domain, limit=1)
+ return (
+ self.env["energy_selfconsumptions.participation"]
+ .sudo()
+ .search(domain, limit=1)
+ )
def _get_effective_date(self, values):
"""Gets the effective date."""
diff --git a/energy_selfconsumption/models/inscription.py b/energy_selfconsumption/models/inscription.py
index 3902e5375..644d685ed 100644
--- a/energy_selfconsumption/models/inscription.py
+++ b/energy_selfconsumption/models/inscription.py
@@ -7,6 +7,7 @@ STATE_VALUES = [
("change", _("Change")),
]
+
class Inscription(models.Model):
_name = "energy_selfconsumption.inscription_selfconsumption"
_inherits = {
@@ -32,7 +33,8 @@ class Inscription(models.Model):
string="Participation", related="participation_id.quantity"
)
participation_real_quantity = fields.Float(
- string="Participation real quantity", default=lambda self: self.participation_id.quantity
+ string="Participation real quantity",
+ default=lambda self: self.participation_id.quantity,
)
state = fields.Selection(
string="State",
@@ -65,7 +67,10 @@ class Inscription(models.Model):
@api.onchange("participation_real_quantity")
def _onchange_participation_real_quantity(self):
- if self.participation_real_quantity != self.participation_quantity and self.state == "active":
+ if (
+ self.participation_real_quantity != self.participation_quantity
+ and self.state == "active"
+ ):
self.state = "change"
@api.constrains("project_id", "partner_id", "supply_point_id")
@@ -91,7 +96,7 @@ class Inscription(models.Model):
).read()[0]
action["context"] = ctx
return action
-
+
def change_state_inscription(self):
ctx = self.env.context.copy()
action = self.env.ref(
diff --git a/energy_selfconsumption/models/selfconsumption.py b/energy_selfconsumption/models/selfconsumption.py
index 066435b31..0a0028167 100644
--- a/energy_selfconsumption/models/selfconsumption.py
+++ b/energy_selfconsumption/models/selfconsumption.py
@@ -134,7 +134,11 @@ class Selfconsumption(models.Model):
)
conf_used_in_selfconsumption = fields.Boolean("Show used in selfconsumption")
conf_vulnerability_situation = fields.Boolean("Show vulnerability situation")
- conf_bank_details = fields.Boolean("Request bank details", default=True, help="Select when you want to make the payment by bank transfer. If not requested, the payment must be made by bank transfer by the member.")
+ conf_bank_details = fields.Boolean(
+ "Request bank details",
+ default=True,
+ help="Select when you want to make the payment by bank transfer. If not requested, the payment must be made by bank transfer by the member.",
+ )
conf_url_form = fields.Char(string="URL")
def activate_form(self):
@@ -156,7 +160,7 @@ class Selfconsumption(models.Model):
model_id=self._origin.id,
)
)
-
+
def unactivate_form(self):
self.ensure_one() # Ensures only one record is selected
if self.conf_state == "active":
@@ -189,8 +193,15 @@ class Selfconsumption(models.Model):
"name": "Inscriptions",
"view_mode": "tree,form",
"res_model": "energy_selfconsumption.inscription_selfconsumption",
- "domain": [("project_id", "=", self.project_id.id), ("selfconsumption_project_id", "=", self.id)],
- "context": {"create": True, "default_project_id": self.project_id.id, "default_selfconsumption_project_id": self.id},
+ "domain": [
+ ("project_id", "=", self.project_id.id),
+ ("selfconsumption_project_id", "=", self.id),
+ ],
+ "context": {
+ "create": True,
+ "default_project_id": self.project_id.id,
+ "default_selfconsumption_project_id": self.id,
+ },
}
def get_contracts(self):
@@ -219,7 +230,15 @@ class Selfconsumption(models.Model):
distribution_table_to_activate.write({"state": new_state})
if new_state == "active":
self.inscription_ids.filtered_domain(
- [("supply_point_id", "in", self.distribution_table_ids.mapped("supply_point_assignation_ids.supply_point_id"))]
+ [
+ (
+ "supply_point_id",
+ "in",
+ self.distribution_table_ids.mapped(
+ "supply_point_assignation_ids.supply_point_id"
+ ),
+ )
+ ]
).write({"state": "active"})
def set_in_activation_state(self):
diff --git a/energy_selfconsumption/wizards/__init__.py b/energy_selfconsumption/wizards/__init__.py
index cbdff2620..4787ed8ec 100644
--- a/energy_selfconsumption/wizards/__init__.py
+++ b/energy_selfconsumption/wizards/__init__.py
@@ -5,4 +5,4 @@ from . import define_invoicing_mode_wizard
from . import distribution_table_import_wizard
from . import invoicing_wizard
from . import selfconsumption_import_wizard
-from . import change_state_inscription_wizard
\ No newline at end of file
+from . import change_state_inscription_wizard
diff --git a/energy_selfconsumption/wizards/change_state_inscription_wizard.py b/energy_selfconsumption/wizards/change_state_inscription_wizard.py
index d5da46aed..64c4446f0 100644
--- a/energy_selfconsumption/wizards/change_state_inscription_wizard.py
+++ b/energy_selfconsumption/wizards/change_state_inscription_wizard.py
@@ -29,33 +29,50 @@ class ChangeStateInscriptionWizard(models.TransientModel):
if len(self.env.context.get("active_ids", [])) == 0:
raise ValidationError(_("You have to select at least one entry."))
-
+
lines = []
for inscription_id in self.env.context["active_ids"]:
- inscription = self.env["energy_selfconsumption.inscription_selfconsumption"].browse(inscription_id)
- lines.append((0, 0, {
- "change_state_inscription_wizard_id": self.id,
- "inscription_id": inscription.id,
- "state": inscription.state,
- "participation_real_quantity": inscription.participation_real_quantity,
- }))
+ inscription = self.env[
+ "energy_selfconsumption.inscription_selfconsumption"
+ ].browse(inscription_id)
+ lines.append(
+ (
+ 0,
+ 0,
+ {
+ "change_state_inscription_wizard_id": self.id,
+ "inscription_id": inscription.id,
+ "state": inscription.state,
+ "participation_real_quantity": inscription.participation_real_quantity,
+ },
+ )
+ )
default_fields["change_state_inscription_lines_wizard_ids"] = lines
return default_fields
def change_state_inscription(self):
- for change_state_inscription_lines_wizard in self.change_state_inscription_lines_wizard_ids:
- inscription = self.env["energy_selfconsumption.inscription_selfconsumption"].browse(change_state_inscription_lines_wizard.inscription_id.id)
+ for (
+ change_state_inscription_lines_wizard
+ ) in self.change_state_inscription_lines_wizard_ids:
+ inscription = self.env[
+ "energy_selfconsumption.inscription_selfconsumption"
+ ].browse(change_state_inscription_lines_wizard.inscription_id.id)
vals = {}
if inscription.state != change_state_inscription_lines_wizard.state:
vals["state"] = change_state_inscription_lines_wizard.state
- if inscription.participation_real_quantity != change_state_inscription_lines_wizard.participation_real_quantity:
- vals["participation_real_quantity"] = change_state_inscription_lines_wizard.participation_real_quantity
+ if (
+ inscription.participation_real_quantity
+ != change_state_inscription_lines_wizard.participation_real_quantity
+ ):
+ vals[
+ "participation_real_quantity"
+ ] = change_state_inscription_lines_wizard.participation_real_quantity
if vals != {}:
inscription.update(vals)
return True
-
+
class ChangeStateInscriptionLinesWizard(models.TransientModel):
_name = "energy_selfconsumption.change_state_inscription_lines.wizard"
@@ -73,9 +90,7 @@ class ChangeStateInscriptionLinesWizard(models.TransientModel):
required=True,
)
- state = fields.Selection(
- STATE_VALUES, required=True, string="State"
- )
+ state = fields.Selection(STATE_VALUES, required=True, string="State")
participation_real_quantity = fields.Float(
string="Participation real quantity", required=True
@@ -83,7 +98,15 @@ class ChangeStateInscriptionLinesWizard(models.TransientModel):
@api.onchange("participation_real_quantity")
def _onchange_participation_real_quantity(self):
- if self.participation_real_quantity != self.inscription_id.participation_quantity and self.state == "active":
+ if (
+ self.participation_real_quantity
+ != self.inscription_id.participation_quantity
+ and self.state == "active"
+ ):
self.state = "change"
- if self.participation_real_quantity == self.inscription_id.participation_quantity and self.state == "change":
+ if (
+ self.participation_real_quantity
+ == self.inscription_id.participation_quantity
+ and self.state == "change"
+ ):
self.state = "active"
diff --git a/energy_selfconsumption/wizards/create_distribution_table_wizard.py b/energy_selfconsumption/wizards/create_distribution_table_wizard.py
index e14c90956..4d604ee62 100644
--- a/energy_selfconsumption/wizards/create_distribution_table_wizard.py
+++ b/energy_selfconsumption/wizards/create_distribution_table_wizard.py
@@ -72,7 +72,10 @@ class CreateDistributionTableWizard(models.TransientModel):
default_fields["max_distributed_power"] = selfconsumption.power
default_fields["distributed_power"] = sum(
- map(lambda inscription: inscription.participation_real_quantity, inscriptions)
+ map(
+ lambda inscription: inscription.participation_real_quantity,
+ inscriptions,
+ )
)
default_fields["percentage_of_distributed_power"] = (
diff --git a/energy_selfconsumption/wizards/selfconsumption_import_wizard.py b/energy_selfconsumption/wizards/selfconsumption_import_wizard.py
index 924b2322c..95d062b15 100644
--- a/energy_selfconsumption/wizards/selfconsumption_import_wizard.py
+++ b/energy_selfconsumption/wizards/selfconsumption_import_wizard.py
@@ -51,7 +51,9 @@ class SelfconsumptionImportWizard(models.TransientModel):
def default_get(self, fields):
defaults = super().default_get(fields)
defaults["user_current_role"] = self.env.user.user_current_role
- project = self.env["energy_selfconsumption.selfconsumption"].browse(self.env.context.get("active_id"))
+ project = self.env["energy_selfconsumption.selfconsumption"].browse(
+ self.env.context.get("active_id")
+ )
if project:
defaults["conf_bank_details"] = project.conf_bank_details
return defaults
@@ -129,11 +131,7 @@ class SelfconsumptionImportWizard(models.TransientModel):
def _get_state(self, name):
"""Gets the state based on values and country."""
state = (
- self.env["res.country.state"]
- .sudo()
- .search(
- [("name", "=", name)], limit=1
- )
+ self.env["res.country.state"].sudo().search([("name", "=", name)], limit=1)
)
if state:
return state.code
@@ -174,17 +172,23 @@ class SelfconsumptionImportWizard(models.TransientModel):
"supplypoint_owner_id_name": line.get(header[13], False),
"supplypoint_owner_id_lastname": line.get(header[14], False),
"supplypoint_owner_id_gender": line.get(header[15], False), # New
- "supplypoint_owner_id_birthdate_date": line.get(header[16], False), # New
+ "supplypoint_owner_id_birthdate_date": line.get(
+ header[16], False
+ ), # New
"supplypoint_owner_id_phone": line.get(header[17], False), # New
"supplypoint_owner_id_lang": line.get(header[18], False), # New
"supplypoint_owner_id_email": line.get(header[19], False), # New
- "supplypoint_owner_id_vulnerability_situation": line.get(header[20], False), # New
+ "supplypoint_owner_id_vulnerability_situation": line.get(
+ header[20], False
+ ), # New
"inscription_project_privacy": line.get(header[21], False), # New
"inscription_acc_number": line.get(header[22], False),
"mandate_auth_date": line.get(header[23], False),
"date_format": self.date_format,
"supplypoint_owner_id_same": supplypoint_owner_id_same,
- "supplypoint_used_in_selfconsumption": line.get(header[24], False), # New
+ "supplypoint_used_in_selfconsumption": line.get(
+ header[24], False
+ ), # New
"inscriptionselfconsumption_annual_electricity_use": float(
str(line.get(header[25], 0.0)).replace(",", ".")
), # New
@@ -289,25 +293,33 @@ class SelfconsumptionImportWizard(models.TransientModel):
logger.info(f"\n\n set_autogenerate_inscriptions_mandataris_supply_points")
for i in range(0, 500):
logger.info(f"\n\n Creando el cliente número {i}")
- country_id = self.env["res.country"].sudo().search([("code", "=", "ES")])[0].id
+ country_id = (
+ self.env["res.country"].sudo().search([("code", "=", "ES")])[0].id
+ )
vat = self.generar_vat_espanol()
- partner = self.env["res.partner"].sudo().create(
- {
- "name": f"Prueba {vat} {i}",
- "vat": vat,
- "country_id": country_id,
- "state_id": self.env["res.country.state"]
- .search([("code", "=", "MA"), ("country_id", "=", country_id)])[0]
- .id,
- "street": f"Calle imaginación {i}",
- "city": "Madrid",
- "zip": 28221,
- "type": "contact",
- "company_id": self.env.company.id,
- "company_type": "person",
- "cooperative_membership_id": self.env.company.partner_id.id,
- "no_member_autorized_in_energy_actions": True,
- }
+ partner = (
+ self.env["res.partner"]
+ .sudo()
+ .create(
+ {
+ "name": f"Prueba {vat} {i}",
+ "vat": vat,
+ "country_id": country_id,
+ "state_id": self.env["res.country.state"]
+ .search([("code", "=", "MA"), ("country_id", "=", country_id)])[
+ 0
+ ]
+ .id,
+ "street": f"Calle imaginación {i}",
+ "city": "Madrid",
+ "zip": 28221,
+ "type": "contact",
+ "company_id": self.env.company.id,
+ "company_type": "person",
+ "cooperative_membership_id": self.env.company.partner_id.id,
+ "no_member_autorized_in_energy_actions": True,
+ }
+ )
)
# bank_account = self.env["res.partner.bank"].create(
@@ -363,23 +375,29 @@ class SelfconsumptionImportWizard(models.TransientModel):
else:
tariff = random.choice(_ACCESS_TARIFF_VALUES)[0]
- supply_point = self.env["energy_selfconsumption.supply_point"].sudo().create(
- {
- "code": self.generate_cups(),
- "name": partner.street,
- "street": partner.street,
- "city": partner.city,
- "zip": partner.zip,
- "state_id": partner.state_id.id,
- "country_id": partner.country_id.id,
- "owner_id": partner.id,
- "partner_id": partner.id,
- "contracted_power": contracted_power,
- "tariff": tariff,
- }
+ supply_point = (
+ self.env["energy_selfconsumption.supply_point"]
+ .sudo()
+ .create(
+ {
+ "code": self.generate_cups(),
+ "name": partner.street,
+ "street": partner.street,
+ "city": partner.city,
+ "zip": partner.zip,
+ "state_id": partner.state_id.id,
+ "country_id": partner.country_id.id,
+ "owner_id": partner.id,
+ "partner_id": partner.id,
+ "contracted_power": contracted_power,
+ "tariff": tariff,
+ }
+ )
)
- self.env["energy_selfconsumption.inscription_selfconsumption"].sudo().create(
+ self.env[
+ "energy_selfconsumption.inscription_selfconsumption"
+ ].sudo().create(
{
"project_id": active_id,
"partner_id": partner.id,
@@ -404,12 +422,16 @@ class SelfconsumptionImportWizard(models.TransientModel):
for partner in partners_socios:
if count == 500:
break
- mandates = self.env["account.banking.mandate"].sudo().search(
- [
- ("partner_id", "=", partner.id),
- ("company_id", "=", partner.company_id.id),
- ("state", "=", "valid"),
- ]
+ mandates = (
+ self.env["account.banking.mandate"]
+ .sudo()
+ .search(
+ [
+ ("partner_id", "=", partner.id),
+ ("company_id", "=", partner.company_id.id),
+ ("state", "=", "valid"),
+ ]
+ )
)
participation = (
self.env["energy_selfconsumptions.participation"]
@@ -424,7 +446,11 @@ class SelfconsumptionImportWizard(models.TransientModel):
]
)
)
- supply_point = self.env["energy_selfconsumption.supply_point"].sudo().search([("partner_id", "=", partner.id)])
+ supply_point = (
+ self.env["energy_selfconsumption.supply_point"]
+ .sudo()
+ .search([("partner_id", "=", partner.id)])
+ )
if not supply_point:
_ACCESS_TARIFF_VALUES = [
("6.1TD", "6.1TD"),
@@ -442,21 +468,33 @@ class SelfconsumptionImportWizard(models.TransientModel):
else:
tariff = random.choice(_ACCESS_TARIFF_VALUES)[0]
- supply_point = [self.env["energy_selfconsumption.supply_point"].sudo().create(
- {
- "code": self.generate_cups(),
- "name": partner.name or "Prueba",
- "street": partner.street or "Calle prueba",
- "city": partner.city or "Madrid",
- "zip": partner.zip or 28221,
- "state_id": partner.state_id.id or self.env["res.country.state"].sudo().search([("code", "=", "MA")])[0].id,
- "country_id": partner.country_id.id or self.env["res.country"].sudo().search([("code", "=", "ES")])[0].id,
- "owner_id": partner.id,
- "partner_id": partner.id,
- "contracted_power": contracted_power,
- "tariff": tariff,
- }
- )]
+ supply_point = [
+ self.env["energy_selfconsumption.supply_point"]
+ .sudo()
+ .create(
+ {
+ "code": self.generate_cups(),
+ "name": partner.name or "Prueba",
+ "street": partner.street or "Calle prueba",
+ "city": partner.city or "Madrid",
+ "zip": partner.zip or 28221,
+ "state_id": partner.state_id.id
+ or self.env["res.country.state"]
+ .sudo()
+ .search([("code", "=", "MA")])[0]
+ .id,
+ "country_id": partner.country_id.id
+ or self.env["res.country"]
+ .sudo()
+ .search([("code", "=", "ES")])[0]
+ .id,
+ "owner_id": partner.id,
+ "partner_id": partner.id,
+ "contracted_power": contracted_power,
+ "tariff": tariff,
+ }
+ )
+ ]
if participation:
self.env[
--
GitLab
From a5a0695a9d03401053ba00da5d98f4a9da2d4df5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Garc=C3=ADa?= <alvarogruiz8@gmail.com>
Date: Mon, 17 Feb 2025 10:29:09 +0100
Subject: [PATCH 10/12] [IMP] Repositioning of columns of insertions.
Translation fixes. Now the action to change enrollment status also changes
the status manually. Added pre-migration.py script
---
energy_selfconsumption/i18n/ca_ES.po | 12 ++++---
.../i18n/energy_selfconsumption.pot | 8 +++--
energy_selfconsumption/i18n/es.po | 12 ++++---
energy_selfconsumption/i18n/eu_ES.po | 12 ++++---
.../migrations/16.0.0.1.2/pre-migration.py | 23 +++++++++++++
energy_selfconsumption/models/inscription.py | 2 +-
.../models/selfconsumption.py | 4 +--
.../views/inscription_views.xml | 32 +++++--------------
.../change_state_inscription_wizard.py | 2 +-
.../change_state_inscription_wizard_views.xml | 2 +-
10 files changed, 66 insertions(+), 43 deletions(-)
create mode 100644 energy_selfconsumption/migrations/16.0.0.1.2/pre-migration.py
diff --git a/energy_selfconsumption/i18n/ca_ES.po b/energy_selfconsumption/i18n/ca_ES.po
index 80c3194b2..9d3ae7601 100644
--- a/energy_selfconsumption/i18n/ca_ES.po
+++ b/energy_selfconsumption/i18n/ca_ES.po
@@ -3440,10 +3440,8 @@ msgid "Starting date of the invoicing"
msgstr "Data d’inici de la facturació"
#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__selfconsumption_project_state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__state
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__state_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__state_id
@@ -3453,6 +3451,12 @@ msgstr "Data d’inici de la facturació"
msgid "State"
msgstr "Província"
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__state
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__state
+msgid "Status"
+msgstr "Estat"
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__supply_point_state
msgid "State Name"
@@ -3811,7 +3815,7 @@ msgstr "Desactiva el formulari"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__used_in_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__used_in_selfconsumption
msgid "Used in selfconsumption"
-msgstr "S'utilitza en autoconsum"
+msgstr "Ja té autoconsum"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__user_current_role
@@ -3856,7 +3860,7 @@ msgstr "Veure formulari d'inscripció"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_res_partner__vulnerability_situation
#: model:ir.model.fields,field_description:energy_selfconsumption.field_res_users__vulnerability_situation
msgid "Vulnerability situation"
-msgstr "Situació de vulnerabilitat"
+msgstr "En situació de vulnerabilitat"
#. module: energy_selfconsumption
#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_import_wizard_form_view
diff --git a/energy_selfconsumption/i18n/energy_selfconsumption.pot b/energy_selfconsumption/i18n/energy_selfconsumption.pot
index 1f0ec5fb0..32b4c4509 100644
--- a/energy_selfconsumption/i18n/energy_selfconsumption.pot
+++ b/energy_selfconsumption/i18n/energy_selfconsumption.pot
@@ -3178,10 +3178,8 @@ msgid "Starting date of the invoicing"
msgstr ""
#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__selfconsumption_project_state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__state
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__state_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__state_id
@@ -3191,6 +3189,12 @@ msgstr ""
msgid "State"
msgstr ""
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__state
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__state
+msgid "Status"
+msgstr ""
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__supply_point_state
msgid "State Name"
diff --git a/energy_selfconsumption/i18n/es.po b/energy_selfconsumption/i18n/es.po
index 23554fa9f..37f5a4743 100644
--- a/energy_selfconsumption/i18n/es.po
+++ b/energy_selfconsumption/i18n/es.po
@@ -3359,10 +3359,8 @@ msgid "Starting date of the invoicing"
msgstr "Fecha de inicio de la facturación"
#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__selfconsumption_project_state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__state
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__state_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__state_id
@@ -3372,6 +3370,12 @@ msgstr "Fecha de inicio de la facturación"
msgid "State"
msgstr "Provincia"
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__state
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__state
+msgid "Status"
+msgstr "Estado"
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__supply_point_state
msgid "State Name"
@@ -3733,7 +3737,7 @@ msgstr "Desactivar formulario"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__used_in_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__used_in_selfconsumption
msgid "Used in selfconsumption"
-msgstr "Utilizado en autoconsumo"
+msgstr "Ya tiene autoconsumo"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__user_current_role
@@ -3778,7 +3782,7 @@ msgstr "Ver formulario de inscripción"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_res_partner__vulnerability_situation
#: model:ir.model.fields,field_description:energy_selfconsumption.field_res_users__vulnerability_situation
msgid "Vulnerability situation"
-msgstr "Situación de vulnerabilidad"
+msgstr "En situación de vulnerabilidad"
#. module: energy_selfconsumption
#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_import_wizard_form_view
diff --git a/energy_selfconsumption/i18n/eu_ES.po b/energy_selfconsumption/i18n/eu_ES.po
index 834956d50..47ddfa4a2 100644
--- a/energy_selfconsumption/i18n/eu_ES.po
+++ b/energy_selfconsumption/i18n/eu_ES.po
@@ -3423,10 +3423,8 @@ msgid "Starting date of the invoicing"
msgstr "Fakturaren hasiera data"
#. module: energy_selfconsumption
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__selfconsumption_project_state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_distribution_table__state
-#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__state
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption__state_id
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__state_id
@@ -3436,6 +3434,12 @@ msgstr "Fakturaren hasiera data"
msgid "State"
msgstr "Probintzia"
+#. module: energy_selfconsumption
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_change_state_inscription_lines_wizard__state
+#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__state
+msgid "Status"
+msgstr "Egoera"
+
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point_assignation__supply_point_state
msgid "State Name"
@@ -3794,7 +3798,7 @@ msgstr "Desaktibatu inprimakia"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_inscription_selfconsumption__used_in_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_supply_point__used_in_selfconsumption
msgid "Used in selfconsumption"
-msgstr "Autokontsumoan erabiltzen da"
+msgstr "Dagoeneko autokontsumoa du"
#. module: energy_selfconsumption
#: model:ir.model.fields,field_description:energy_selfconsumption.field_energy_selfconsumption_selfconsumption_import_wizard__user_current_role
@@ -3839,7 +3843,7 @@ msgstr "Ikusi formularioaren inskripzioa"
#: model:ir.model.fields,field_description:energy_selfconsumption.field_res_partner__vulnerability_situation
#: model:ir.model.fields,field_description:energy_selfconsumption.field_res_users__vulnerability_situation
msgid "Vulnerability situation"
-msgstr "Zaurgarritasun egoera"
+msgstr "Egoera zaurgarrian"
#. module: energy_selfconsumption
#: model_terms:ir.ui.view,arch_db:energy_selfconsumption.selfconsumption_import_wizard_form_view
diff --git a/energy_selfconsumption/migrations/16.0.0.1.2/pre-migration.py b/energy_selfconsumption/migrations/16.0.0.1.2/pre-migration.py
new file mode 100644
index 000000000..dcc135c1b
--- /dev/null
+++ b/energy_selfconsumption/migrations/16.0.0.1.2/pre-migration.py
@@ -0,0 +1,23 @@
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+def migrate(cr, version):
+ logger.info(f"Starting migration from version {version}.")
+ cr.execute("""ALTER TABLE energy_project_participation RENAME TO energy_selfconsumptions_participation;""")
+ logger.info("Renamed energy_project_participation to energy_selfconsumptions_participation.")
+ cr.execute("""ALTER TABLE energy_selfconsumption_inscription_selfconsumption RENAME COLUMN participation TO participation_id;""")
+ logger.info("Renamed column participation to participation_id.")
+ cr.execute("""update energy_selfconsumption_inscription_selfconsumption set participation_real_quantity = (
+ select quantity from energy_selfconsumptions_participation where id = participation_id
+ );""")
+ logger.info("Updated participation_real_quantity.")
+ cr.execute("""update energy_selfconsumption_inscription_selfconsumption set state = 'active' where supply_point_id in (
+ select supply_point_id from energy_selfconsumption_supply_point_assignation where distribution_table_id in (
+ select id from energy_selfconsumption_distribution_table where state = 'active' and active = true
+ and selfconsumption_project_id = energy_selfconsumption_inscription_selfconsumption.selfconsumption_project_id
+ )
+ );""")
+ logger.info("Updated state.")
+ logger.info("Migration completed.")
diff --git a/energy_selfconsumption/models/inscription.py b/energy_selfconsumption/models/inscription.py
index 644d685ed..d17b31b03 100644
--- a/energy_selfconsumption/models/inscription.py
+++ b/energy_selfconsumption/models/inscription.py
@@ -37,7 +37,7 @@ class Inscription(models.Model):
default=lambda self: self.participation_id.quantity,
)
state = fields.Selection(
- string="State",
+ string="Status",
selection=STATE_VALUES,
default="inactive",
)
diff --git a/energy_selfconsumption/models/selfconsumption.py b/energy_selfconsumption/models/selfconsumption.py
index 0a0028167..4c5a243b0 100644
--- a/energy_selfconsumption/models/selfconsumption.py
+++ b/energy_selfconsumption/models/selfconsumption.py
@@ -234,9 +234,9 @@ class Selfconsumption(models.Model):
(
"supply_point_id",
"in",
- self.distribution_table_ids.mapped(
+ distribution_table_to_activate.mapped(
"supply_point_assignation_ids.supply_point_id"
- ),
+ ).ids,
)
]
).write({"state": "active"})
diff --git a/energy_selfconsumption/views/inscription_views.xml b/energy_selfconsumption/views/inscription_views.xml
index 9b18beb39..caae60211 100644
--- a/energy_selfconsumption/views/inscription_views.xml
+++ b/energy_selfconsumption/views/inscription_views.xml
@@ -9,34 +9,18 @@
<field name="arch" type="xml">
<tree create="false" editable="bottom">
<field name="state" width="6%" optional="show" readonly="1"/>
- <field
- name="partner_id"
- options="{'no_create': True}"
- width="14%"
- optional="show"
- />
- <field
- name="owner_id"
- options="{'no_create': True}"
- width="14%"
- optional="show"
- />
- <field name="used_in_selfconsumption" width="6%" optional="show"/>
- <field name="vulnerability_situation" width="6%" optional="show"/>
- <field name="annual_electricity_use" width="6%" optional="show"/>
+ <field name="partner_id" options="{'no_create': True}" width="14%" optional="show" />
+ <field name="is_member" readonly="1" width="10%" optional="show"/>
<field name="supply_point_id" width="10%" optional="show" />
<field name="code" readonly="1" width="22%" optional="show"/>
- <field name="is_member" readonly="1" width="10%" optional="show"/>
- <field name="effective_date" width="6%" optional="hide"/>
+ <field name="owner_id" options="{'no_create': True}" width="14%" optional="show" />
+ <field name="annual_electricity_use" width="6%" optional="show"/>
+ <field name="used_in_selfconsumption" width="6%" optional="show"/>
+ <field name="vulnerability_situation" width="6%" optional="show"/>
<field name="mandate_filtered_ids" invisible="True" />
<field name="acc_number" width="12%" optional="show"/>
- <field
- name="mandate_id"
- domain="[('id', 'in', mandate_filtered_ids)]"
- context="{'default_partner_id': partner_id}"
- width="14%"
- optional="hide"
- />
+ <field name="mandate_id" domain="[('id', 'in', mandate_filtered_ids)]" context="{'default_partner_id': partner_id}" width="14%" optional="hide" />
+ <field name="effective_date" width="6%" optional="hide"/>
<field name="member" readonly="1" width="6%" optional="hide"/>
<field name="accept" string="Accept terms" readonly="1" width="6%" optional="hide"/>
<field name="participation_quantity" sum="True" width="6%" optional="show"/>
diff --git a/energy_selfconsumption/wizards/change_state_inscription_wizard.py b/energy_selfconsumption/wizards/change_state_inscription_wizard.py
index 64c4446f0..8152ba46d 100644
--- a/energy_selfconsumption/wizards/change_state_inscription_wizard.py
+++ b/energy_selfconsumption/wizards/change_state_inscription_wizard.py
@@ -90,7 +90,7 @@ class ChangeStateInscriptionLinesWizard(models.TransientModel):
required=True,
)
- state = fields.Selection(STATE_VALUES, required=True, string="State")
+ state = fields.Selection(STATE_VALUES, required=True, string="Status")
participation_real_quantity = fields.Float(
string="Participation real quantity", required=True
diff --git a/energy_selfconsumption/wizards/change_state_inscription_wizard_views.xml b/energy_selfconsumption/wizards/change_state_inscription_wizard_views.xml
index 404256686..45f83e8c1 100644
--- a/energy_selfconsumption/wizards/change_state_inscription_wizard_views.xml
+++ b/energy_selfconsumption/wizards/change_state_inscription_wizard_views.xml
@@ -11,7 +11,7 @@
<field name="change_state_inscription_lines_wizard_ids" nolabel="1">
<tree editable="bottom">
<field name="inscription_id" readonly="1" force_save="1"/>
- <field name="state" readonly="1" force_save="1" />
+ <field name="state" />
<field name="participation_real_quantity" />
</tree>
</field>
--
GitLab
From 13d9c9ee17ac790c3fd34c0e72b43c98afcbcb76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Pedro=20S=C3=A1nchez?= <juanpe.sn@gmail.com>
Date: Mon, 17 Feb 2025 14:52:01 +0100
Subject: [PATCH 11/12] =?UTF-8?q?[REL]=20=F0=9F=8F=97=EF=B8=8F=20energy=5F?=
=?UTF-8?q?communities:=20bump=20energy=5Fcommunities,=20energy=5Fcommunit?=
=?UTF-8?q?ies=5Fcooperator=20&=20energy=5Fselfconsumption=20versions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* bump energy_communities to 16.0.0.1.6
* bump energy_communities_cooperator to 16.0.0.1.6
* bump energy_selfconsumption to 16.0.0.1.5
Also renamed pre-migration folder to correct version
---
energy_communities/__manifest__.py | 2 +-
energy_communities_cooperator/__manifest__.py | 2 +-
energy_selfconsumption/__manifest__.py | 2 +-
.../pre-migration.py | 26 +++++++++++++------
4 files changed, 21 insertions(+), 11 deletions(-)
rename energy_selfconsumption/migrations/{16.0.0.1.2 => 16.0.0.1.5}/pre-migration.py (51%)
diff --git a/energy_communities/__manifest__.py b/energy_communities/__manifest__.py
index 8694904fc..2d3c6fafd 100644
--- a/energy_communities/__manifest__.py
+++ b/energy_communities/__manifest__.py
@@ -1,6 +1,6 @@
{
"name": "Energy Community",
- "version": "16.0.0.1.5",
+ "version": "16.0.0.1.6",
"depends": [
"account",
"account_banking_mandate",
diff --git a/energy_communities_cooperator/__manifest__.py b/energy_communities_cooperator/__manifest__.py
index 555cad921..0c71f2433 100644
--- a/energy_communities_cooperator/__manifest__.py
+++ b/energy_communities_cooperator/__manifest__.py
@@ -12,7 +12,7 @@
# Check https://github.com/odoo/odoo/blob/14.0/odoo/addons/base/data/ir_module_category_data.xml
# for the full list
"category": "Cooperative management",
- "version": "16.0.0.1.5",
+ "version": "16.0.0.1.6",
"license": "AGPL-3",
# any module necessary for this one to work correctly
"depends": [
diff --git a/energy_selfconsumption/__manifest__.py b/energy_selfconsumption/__manifest__.py
index 91ce356ec..7f72c729d 100644
--- a/energy_selfconsumption/__manifest__.py
+++ b/energy_selfconsumption/__manifest__.py
@@ -9,7 +9,7 @@
"author": "Coopdevs Treball SCCL & Som Energia SCCL",
"website": "https://coopdevs.org",
"category": "Customizations",
- "version": "16.0.0.1.4",
+ "version": "16.0.0.1.5",
"license": "AGPL-3",
"depends": [
"base",
diff --git a/energy_selfconsumption/migrations/16.0.0.1.2/pre-migration.py b/energy_selfconsumption/migrations/16.0.0.1.5/pre-migration.py
similarity index 51%
rename from energy_selfconsumption/migrations/16.0.0.1.2/pre-migration.py
rename to energy_selfconsumption/migrations/16.0.0.1.5/pre-migration.py
index dcc135c1b..5d5c9c33a 100644
--- a/energy_selfconsumption/migrations/16.0.0.1.2/pre-migration.py
+++ b/energy_selfconsumption/migrations/16.0.0.1.5/pre-migration.py
@@ -5,19 +5,29 @@ logger = logging.getLogger(__name__)
def migrate(cr, version):
logger.info(f"Starting migration from version {version}.")
- cr.execute("""ALTER TABLE energy_project_participation RENAME TO energy_selfconsumptions_participation;""")
- logger.info("Renamed energy_project_participation to energy_selfconsumptions_participation.")
- cr.execute("""ALTER TABLE energy_selfconsumption_inscription_selfconsumption RENAME COLUMN participation TO participation_id;""")
+ cr.execute(
+ """ALTER TABLE energy_project_participation RENAME TO energy_selfconsumptions_participation;"""
+ )
+ logger.info(
+ "Renamed energy_project_participation to energy_selfconsumptions_participation."
+ )
+ cr.execute(
+ """ALTER TABLE energy_selfconsumption_inscription_selfconsumption RENAME COLUMN participation TO participation_id;"""
+ )
logger.info("Renamed column participation to participation_id.")
- cr.execute("""update energy_selfconsumption_inscription_selfconsumption set participation_real_quantity = (
+ cr.execute(
+ """update energy_selfconsumption_inscription_selfconsumption set participation_real_quantity = (
select quantity from energy_selfconsumptions_participation where id = participation_id
- );""")
+ );"""
+ )
logger.info("Updated participation_real_quantity.")
- cr.execute("""update energy_selfconsumption_inscription_selfconsumption set state = 'active' where supply_point_id in (
+ cr.execute(
+ """update energy_selfconsumption_inscription_selfconsumption set state = 'active' where supply_point_id in (
select supply_point_id from energy_selfconsumption_supply_point_assignation where distribution_table_id in (
- select id from energy_selfconsumption_distribution_table where state = 'active' and active = true
+ select id from energy_selfconsumption_distribution_table where state = 'active' and active = true
and selfconsumption_project_id = energy_selfconsumption_inscription_selfconsumption.selfconsumption_project_id
)
- );""")
+ );"""
+ )
logger.info("Updated state.")
logger.info("Migration completed.")
--
GitLab
From f10f80b05b46cbcca4a9bce99915f15b37698fb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Pedro=20S=C3=A1nchez?= <juanpe.sn@gmail.com>
Date: Tue, 18 Feb 2025 10:05:46 +0100
Subject: [PATCH 12/12] =?UTF-8?q?[FIX]=20=F0=9F=90=9B=20energy=5Fselfconsu?=
=?UTF-8?q?mption:=20fix=20pre=20and=20post=20migration=20scripts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Alvaro Garcia <alvaro.garcia@somit.coop>
---
energy_selfconsumption/__manifest__.py | 2 +-
.../post-migration.py} | 14 ++--------
.../migrations/16.0.0.1.6/pre-migration.py | 28 +++++++++++++++++++
3 files changed, 31 insertions(+), 13 deletions(-)
rename energy_selfconsumption/migrations/{16.0.0.1.5/pre-migration.py => 16.0.0.1.6/post-migration.py} (64%)
create mode 100644 energy_selfconsumption/migrations/16.0.0.1.6/pre-migration.py
diff --git a/energy_selfconsumption/__manifest__.py b/energy_selfconsumption/__manifest__.py
index 7f72c729d..e432d772b 100644
--- a/energy_selfconsumption/__manifest__.py
+++ b/energy_selfconsumption/__manifest__.py
@@ -9,7 +9,7 @@
"author": "Coopdevs Treball SCCL & Som Energia SCCL",
"website": "https://coopdevs.org",
"category": "Customizations",
- "version": "16.0.0.1.5",
+ "version": "16.0.0.1.6",
"license": "AGPL-3",
"depends": [
"base",
diff --git a/energy_selfconsumption/migrations/16.0.0.1.5/pre-migration.py b/energy_selfconsumption/migrations/16.0.0.1.6/post-migration.py
similarity index 64%
rename from energy_selfconsumption/migrations/16.0.0.1.5/pre-migration.py
rename to energy_selfconsumption/migrations/16.0.0.1.6/post-migration.py
index 5d5c9c33a..6a2f1304a 100644
--- a/energy_selfconsumption/migrations/16.0.0.1.5/pre-migration.py
+++ b/energy_selfconsumption/migrations/16.0.0.1.6/post-migration.py
@@ -4,17 +4,7 @@ logger = logging.getLogger(__name__)
def migrate(cr, version):
- logger.info(f"Starting migration from version {version}.")
- cr.execute(
- """ALTER TABLE energy_project_participation RENAME TO energy_selfconsumptions_participation;"""
- )
- logger.info(
- "Renamed energy_project_participation to energy_selfconsumptions_participation."
- )
- cr.execute(
- """ALTER TABLE energy_selfconsumption_inscription_selfconsumption RENAME COLUMN participation TO participation_id;"""
- )
- logger.info("Renamed column participation to participation_id.")
+ logger.info(f"Starting post-migration from version {version}.")
cr.execute(
"""update energy_selfconsumption_inscription_selfconsumption set participation_real_quantity = (
select quantity from energy_selfconsumptions_participation where id = participation_id
@@ -30,4 +20,4 @@ def migrate(cr, version):
);"""
)
logger.info("Updated state.")
- logger.info("Migration completed.")
+ logger.info("Post migration completed.")
diff --git a/energy_selfconsumption/migrations/16.0.0.1.6/pre-migration.py b/energy_selfconsumption/migrations/16.0.0.1.6/pre-migration.py
new file mode 100644
index 000000000..c19f012c2
--- /dev/null
+++ b/energy_selfconsumption/migrations/16.0.0.1.6/pre-migration.py
@@ -0,0 +1,28 @@
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+def migrate(cr, version):
+ logger.info(f"Starting pre-migration from version {version}.")
+ cr.execute(
+ """ALTER TABLE IF EXISTS energy_project_participation RENAME TO energy_selfconsumptions_participation;"""
+ )
+ logger.info(
+ "Renamed energy_project_participation to energy_selfconsumptions_participation."
+ )
+ cr.execute(
+ """
+ DO $$
+ BEGIN
+ IF EXISTS(SELECT *
+ FROM information_schema.columns
+ WHERE table_name='energy_selfconsumption_inscription_selfconsumption' and column_name='participation')
+ THEN
+ ALTER TABLE energy_selfconsumption_inscription_selfconsumption RENAME COLUMN participation TO participation_id;
+ END IF;
+ END $$;
+ """
+ )
+ logger.info("Renamed column participation to participation_id.")
+ logger.info("Pre migration completed.")
--
GitLab