diff --git a/energy_communities/__manifest__.py b/energy_communities/__manifest__.py
index 98901909d060698abcafb449a0dbcfe384b37f4d..888df0c537361fd96442cf6bc9e55dffdcd01efd 100644
--- a/energy_communities/__manifest__.py
+++ b/energy_communities/__manifest__.py
@@ -23,9 +23,7 @@
"crm_metadata",
"crm_metadata_rest_api",
"crm_rest_api",
- "energy_project",
"energy_selfconsumption",
- "energy_selfconsumption_cooperator",
"l10n_es_aeat",
"l10n_es_aeat_sii_oca",
"l10n_es_cooperator",
diff --git a/energy_communities/security/res_users_role_data.xml b/energy_communities/security/res_users_role_data.xml
index f07ed42ced5d6b5ea174b289bbbc9b1e9b5a244e..2b707261cf45bcc1f243b304521601990bde5db0 100644
--- a/energy_communities/security/res_users_role_data.xml
+++ b/energy_communities/security/res_users_role_data.xml
@@ -34,6 +34,7 @@
eval="[
(5, 0, 0),
(4, ref('group_user')),
+ (4, ref('energy_project.group_user')),
]"
/>
</record>
@@ -46,6 +47,7 @@
eval="[
(5, 0, 0),
(4, ref('group_admin')),
+ (4, ref('energy_project.group_admin')),
(4, ref('sale.group_delivery_invoice_address')),
(4, ref('account.group_account_invoice')),
(4, ref('account.group_account_manager')),
@@ -72,6 +74,7 @@
eval="[
(5, 0, 0),
(4, ref('group_admin')),
+ (4, ref('energy_project.group_admin')),
(4, ref('sale.group_delivery_invoice_address')),
(4, ref('account.group_account_invoice')),
(4, ref('account.group_account_manager')),
@@ -151,6 +154,7 @@
(5, 0, 0),
(4, ref('group_platform_manager')),
(4, ref('group_admin')),
+ (4, ref('energy_project.group_admin')),
(4, ref('base.group_erp_manager')),
(4, ref('sale.group_delivery_invoice_address')),
(4, ref('account.group_account_invoice')),
diff --git a/energy_project_energy_communities/__init__.py b/energy_project_energy_communities/__init__.py
deleted file mode 100644
index 0650744f6bc69b9f0b865e8c7174c813a5f5995e..0000000000000000000000000000000000000000
--- a/energy_project_energy_communities/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from . import models
diff --git a/energy_project_energy_communities/__manifest__.py b/energy_project_energy_communities/__manifest__.py
deleted file mode 100644
index 3e68940bc51086ddda669d4dc29ebb32eba22ddb..0000000000000000000000000000000000000000
--- a/energy_project_energy_communities/__manifest__.py
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "Energy Projects Energy Communities",
- "summary": """
- Module glue between Energy Projects and Energy Communities.
- """,
- "description": """
- Module glue between Energy Projects and Energy Communities.
- """,
- "author": "Coopdevs Treball SCCL & Som Energia SCCL",
- "website": "https://coopdevs.org",
- "category": "Customizations",
- "version": "14.0.1.3.0",
- "depends": [
- "energy_project",
- "energy_communities",
- ],
- "data": [
- "security/res_users_role_data.xml",
- ],
-}
diff --git a/energy_project_energy_communities/i18n/ca_ES.po b/energy_project_energy_communities/i18n/ca_ES.po
deleted file mode 100644
index ee358ca1a8aacd6952072b3d5704bc0cfeae149a..0000000000000000000000000000000000000000
--- a/energy_project_energy_communities/i18n/ca_ES.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * energy_project_energy_communities
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-24 13:57+0000\n"
-"PO-Revision-Date: 2023-08-24 15:58+0200\n"
-"Last-Translator: Daniil Digtyar Vasilieva <daniil.digtyar@somit.coop>\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: \n"
-"X-Generator: Poedit 3.0.1\n"
-
-#. module: energy_project_energy_communities
-#: model:ir.model.fields,field_description:energy_project_energy_communities.field_energy_project_inscription__display_name
-msgid "Display Name"
-msgstr "Nom Visible"
-
-#. module: energy_project_energy_communities
-#: model:ir.model.fields,field_description:energy_project_energy_communities.field_energy_project_inscription__id
-msgid "ID"
-msgstr "ID"
-
-#. module: energy_project_energy_communities
-#: model:ir.model,name:energy_project_energy_communities.model_energy_project_inscription
-msgid "Inscriptions for a project"
-msgstr "Inscripcions per a un projecte"
-
-#. module: energy_project_energy_communities
-#: model:ir.model.fields,field_description:energy_project_energy_communities.field_energy_project_inscription____last_update
-msgid "Last Modified on"
-msgstr "Última modificació el"
-
-#. module: energy_project_energy_communities
-#: model:ir.model.fields,field_description:energy_project_energy_communities.field_energy_project_inscription__partner_id
-msgid "Partner"
-msgstr "Soci"
-
-#. module: energy_project_energy_communities
-#: code:addons/energy_project_energy_communities/models/inscription.py:0
-#: code:addons/setup/energy_project_energy_communities/odoo/addons/energy_project_energy_communities/models/inscription.py:0
-#, python-format
-msgid "The selected partner is not a member"
-msgstr "El soci seleccionat no és soci"
diff --git a/energy_project_energy_communities/i18n/energy_project_energy_communities.pot b/energy_project_energy_communities/i18n/energy_project_energy_communities.pot
deleted file mode 100644
index 8a080a42b94c12e567ce4ee30552fd166292ec7e..0000000000000000000000000000000000000000
--- a/energy_project_energy_communities/i18n/energy_project_energy_communities.pot
+++ /dev/null
@@ -1,47 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * energy_project_energy_communities
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-18 09:03+0000\n"
-"PO-Revision-Date: 2023-08-18 09:03+0000\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: energy_project_energy_communities
-#: model:ir.model.fields,field_description:energy_project_energy_communities.field_energy_project_inscription__display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: energy_project_energy_communities
-#: model:ir.model.fields,field_description:energy_project_energy_communities.field_energy_project_inscription__id
-msgid "ID"
-msgstr ""
-
-#. module: energy_project_energy_communities
-#: model:ir.model,name:energy_project_energy_communities.model_energy_project_inscription
-msgid "Inscriptions for a project"
-msgstr ""
-
-#. module: energy_project_energy_communities
-#: model:ir.model.fields,field_description:energy_project_energy_communities.field_energy_project_inscription____last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: energy_project_energy_communities
-#: model:ir.model.fields,field_description:energy_project_energy_communities.field_energy_project_inscription__partner_id
-msgid "Partner"
-msgstr ""
-
-#. module: energy_project_energy_communities
-#: code:addons/energy_project_energy_communities/models/inscription.py:0
-#, python-format
-msgid "The selected partner is not a member"
-msgstr ""
diff --git a/energy_project_energy_communities/i18n/es.po b/energy_project_energy_communities/i18n/es.po
deleted file mode 100644
index f6e70f94594f83f8680dcfee6c33cdfe3828e957..0000000000000000000000000000000000000000
--- a/energy_project_energy_communities/i18n/es.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * energy_project_energy_communities
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-16 11:24+0000\n"
-"PO-Revision-Date: 2023-05-16 13:27+0200\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: \n"
-"X-Generator: Poedit 3.0.1\n"
-
-#. module: energy_project_energy_communities
-#: model:ir.model.fields,field_description:energy_project_energy_communities.field_energy_project_inscription__display_name
-msgid "Display Name"
-msgstr "Nombre visible"
-
-#. module: energy_project_energy_communities
-#: model:ir.model.fields,field_description:energy_project_energy_communities.field_energy_project_inscription__id
-msgid "ID"
-msgstr "ID"
-
-#. module: energy_project_energy_communities
-#: model:ir.model,name:energy_project_energy_communities.model_energy_project_inscription
-msgid "Inscriptions for a project"
-msgstr "Inscripciones para un proyecto"
-
-#. module: energy_project_energy_communities
-#: model:ir.model.fields,field_description:energy_project_energy_communities.field_energy_project_inscription____last_update
-msgid "Last Modified on"
-msgstr "Última modificación el"
-
-#. module: energy_project_energy_communities
-#: model:ir.model.fields,field_description:energy_project_energy_communities.field_energy_project_inscription__partner_id
-msgid "Partner"
-msgstr "Socio"
-
-#. module: energy_project_energy_communities
-#: code:addons/energy_project_energy_communities/models/inscription.py:0
-#, python-format
-msgid "The selected partner is not a member"
-msgstr "El socio seleccionado no es miembro"
diff --git a/energy_project_energy_communities/i18n/eu_ES.po b/energy_project_energy_communities/i18n/eu_ES.po
deleted file mode 100644
index 7ffafe7505e8f12b79004fd3f6d507dc6a374bad..0000000000000000000000000000000000000000
--- a/energy_project_energy_communities/i18n/eu_ES.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * energy_project_energy_communities
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-24 13:59+0000\n"
-"PO-Revision-Date: 2023-08-24 16:00+0200\n"
-"Last-Translator: Daniil Digtyar Vasilieva <daniil.digtyar@somit.coop>\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: \n"
-"X-Generator: Poedit 3.0.1\n"
-
-#. module: energy_project_energy_communities
-#: model:ir.model.fields,field_description:energy_project_energy_communities.field_energy_project_inscription__display_name
-msgid "Display Name"
-msgstr "Bistaratzeko izena"
-
-#. module: energy_project_energy_communities
-#: model:ir.model.fields,field_description:energy_project_energy_communities.field_energy_project_inscription__id
-msgid "ID"
-msgstr "ID"
-
-#. module: energy_project_energy_communities
-#: model:ir.model,name:energy_project_energy_communities.model_energy_project_inscription
-msgid "Inscriptions for a project"
-msgstr "Proiektu baterako inskripzioak"
-
-#. module: energy_project_energy_communities
-#: model:ir.model.fields,field_description:energy_project_energy_communities.field_energy_project_inscription____last_update
-msgid "Last Modified on"
-msgstr "Azken aldaketa egunean"
-
-#. module: energy_project_energy_communities
-#: model:ir.model.fields,field_description:energy_project_energy_communities.field_energy_project_inscription__partner_id
-msgid "Partner"
-msgstr "Bazkidea"
-
-#. module: energy_project_energy_communities
-#: code:addons/energy_project_energy_communities/models/inscription.py:0
-#: code:addons/setup/energy_project_energy_communities/odoo/addons/energy_project_energy_communities/models/inscription.py:0
-#, python-format
-msgid "The selected partner is not a member"
-msgstr "Hautatutako bazkidea ez da kide"
diff --git a/energy_project_energy_communities/models/__init__.py b/energy_project_energy_communities/models/__init__.py
deleted file mode 100644
index 6b5857c47a1fc55da485c819f4a3aa9fd9dbed8f..0000000000000000000000000000000000000000
--- a/energy_project_energy_communities/models/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from . import inscription
diff --git a/energy_project_energy_communities/models/inscription.py b/energy_project_energy_communities/models/inscription.py
deleted file mode 100644
index 98f3441acd881177c4c0651764b6ec4e523eed9b..0000000000000000000000000000000000000000
--- a/energy_project_energy_communities/models/inscription.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from odoo import _, api, fields, models
-from odoo.exceptions import ValidationError
-
-
-class Inscription(models.Model):
- _inherit = "energy_project.inscription"
-
- partner_id = fields.Many2one()
diff --git a/energy_project_energy_communities/security/res_users_role_data.xml b/energy_project_energy_communities/security/res_users_role_data.xml
deleted file mode 100644
index 6fa8afe3d8aa46695761158f1f7030ff0c7c051a..0000000000000000000000000000000000000000
--- a/energy_project_energy_communities/security/res_users_role_data.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" ?>
-<odoo>
- <record model="res.users.role" id="energy_communities.role_ce_member">
- <field
- name="implied_ids"
- eval="[
- (4, ref('energy_project.group_user')),
- ]"
- />
- </record>
-
- <record model="res.users.role" id="energy_communities.role_ce_admin">
- <field
- name="implied_ids"
- eval="[
- (4, ref('energy_project.group_admin')),
- ]"
- />
- </record>
-
- <record model="res.users.role" id="energy_communities.role_ce_manager">
- <field
- name="implied_ids"
- eval="[
- (4, ref('energy_project.group_admin')),
- ]"
- />
- </record>
-
- <record model="res.users.role" id="energy_communities.role_platform_admin">
- <field
- name="implied_ids"
- eval="[
- (4, ref('energy_project.group_admin')),
- ]"
- />
- </record>
-</odoo>
diff --git a/energy_project_energy_communities/static/description/icon.png b/energy_project_energy_communities/static/description/icon.png
deleted file mode 100644
index 7aefbe88fb341e9711c0be7f0cb2f2f2b096e737..0000000000000000000000000000000000000000
Binary files a/energy_project_energy_communities/static/description/icon.png and /dev/null differ
diff --git a/energy_selfconsumption/models/supply_point.py b/energy_selfconsumption/models/supply_point.py
index a7c5ee334471f81186df35204db65a0c711d923e..d41c547841cbd5bba3bc450e8a510e8efb2a1044 100644
--- a/energy_selfconsumption/models/supply_point.py
+++ b/energy_selfconsumption/models/supply_point.py
@@ -24,9 +24,9 @@ class SupplyPoint(models.Model):
)
partner_id = fields.Many2one(
"res.partner",
- string="Partner",
+ string="Cooperator",
required=True,
- help="Partner subscribed to the self-consumption project",
+ help="Cooperator subscribed to the self-consumption project",
)
company_id = fields.Many2one(
"res.company", default=lambda self: self.env.company, readonly=True
@@ -58,6 +58,9 @@ class SupplyPoint(models.Model):
)
supplier_id = fields.Many2one("energy_project.supplier", string="Supplier")
+ @api.onchange("partner_id")
+ def _onchange_partner_id(self):
+ self.owner_id = self.partner_id
@api.depends("partner_id", "street")
def _compute_supply_point_name(self):
@@ -66,4 +69,3 @@ class SupplyPoint(models.Model):
record.name = f"{record.partner_id.name} - {record.street}"
else:
record.name = _("New Supply Point")
-
diff --git a/energy_selfconsumption/views/res_partner_views.xml b/energy_selfconsumption/views/res_partner_views.xml
index 6a09b6617b65153c544a1373e820b72d17507e41..ed49c2af8689a510bf1389d45e4eec4095944e7f 100644
--- a/energy_selfconsumption/views/res_partner_views.xml
+++ b/energy_selfconsumption/views/res_partner_views.xml
@@ -5,8 +5,8 @@
<field name="name">Owners</field>
<field name="res_model">res.partner</field>
<field name="view_mode">kanban,tree,form</field>
- <field name="domain">[('owner_supply_ids','!=', False)]</field>
- <field name="context">{'create':False}</field>
+ <field name="domain">[('owner_supply_ids', '!=', False)]</field>
+ <field name="context">{'create': False}</field>
<field name="help" type="html">
<p class="oe_view_nocontent_create">
Click to add a contact in your address book.
@@ -22,6 +22,26 @@
action="action_partner_owner_form"
/>
+ <record id="action_partner_cooperator_form" model="ir.actions.act_window">
+ <field name="name">Cooperators</field>
+ <field name="res_model">res.partner</field>
+ <field name="view_mode">kanban,tree,form</field>
+ <field name="domain">[('member', '=', True)]</field>
+ <field name="context">{'create': False}</field>
+ <field name="help" type="html">
+ <p class="oe_view_nocontent_create">
+ Click to add a contact in your address book.
+ </p>
+ </field>
+ </record>
+
+ <menuitem
+ name="Cooperators"
+ id="res_partner_cooperators_menu"
+ parent="energy_selfconsumption.contacts_category_menu"
+ action="action_partner_cooperator_form"
+ />
+
<record id="view_partner_form_inherit" model="ir.ui.view">
<field name="name">res.partner.form.buttons</field>
<field name="model">res.partner</field>
diff --git a/energy_selfconsumption/views/supply_point_views.xml b/energy_selfconsumption/views/supply_point_views.xml
index 9c2d86098f59e87f79e29d7fe61ab701df5958ac..00630d32cbc77762c2abd7766222d4f04ebf6a73 100644
--- a/energy_selfconsumption/views/supply_point_views.xml
+++ b/energy_selfconsumption/views/supply_point_views.xml
@@ -21,7 +21,10 @@
name="partner_id"
options="{'no_create': True}"
/>
- <field name="owner_id" />
+ <field
+ name="owner_id"
+ domain="['|', ('member', '=' , False), ('id', '=', partner_id)]"
+ />
<field
name="reseller_id"
options="{'no_create': True, 'no_edit':True, 'no_open': True}"
diff --git a/energy_selfconsumption_cooperator/__init__.py b/energy_selfconsumption_cooperator/__init__.py
deleted file mode 100644
index 0650744f6bc69b9f0b865e8c7174c813a5f5995e..0000000000000000000000000000000000000000
--- a/energy_selfconsumption_cooperator/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from . import models
diff --git a/energy_selfconsumption_cooperator/__manifest__.py b/energy_selfconsumption_cooperator/__manifest__.py
deleted file mode 100644
index 32df55792107cf9d65c3e424c0229656966d7750..0000000000000000000000000000000000000000
--- a/energy_selfconsumption_cooperator/__manifest__.py
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "name": "Energy Self-consumption Project Cooperator",
- "summary": """
- Module glue between Energy Self-consumption and Cooperator
- """,
- "description": """
- Module glue between Energy Self-consumption and Cooperator
- """,
- "author": "Coopdevs Treball SCCL & Som Energia SCCL",
- "website": "https://coopdevs.org",
- "category": "Customizations",
- "version": "14.0.1.3.0",
- "depends": [
- "energy_selfconsumption",
- "cooperator",
- ],
- "data": [
- "views/supply_point_views.xml",
- "views/res_partner_views.xml",
- ],
-}
diff --git a/energy_selfconsumption_cooperator/i18n/ca_ES.po b/energy_selfconsumption_cooperator/i18n/ca_ES.po
deleted file mode 100644
index 7456fef9717865cad8e0fff8f19c0cbed80e5099..0000000000000000000000000000000000000000
--- a/energy_selfconsumption_cooperator/i18n/ca_ES.po
+++ /dev/null
@@ -1,59 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * energy_selfconsumption_cooperator
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-24 15:03+0000\n"
-"PO-Revision-Date: 2023-08-24 17:04+0200\n"
-"Last-Translator: Daniil Digtyar Vasilieva <daniil.digtyar@somit.coop>\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: \n"
-"X-Generator: Poedit 3.0.1\n"
-
-#. module: energy_selfconsumption_cooperator
-#: model_terms:ir.actions.act_window,help:energy_selfconsumption_cooperator.action_partner_cooperator_form
-msgid "Click to add a contact in your address book."
-msgstr "Feu clic per afegir un contacte a la vostra llibreta d'adreces."
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model.fields,field_description:energy_selfconsumption_cooperator.field_energy_selfconsumption_supply_point__partner_id
-msgid "Cooperator"
-msgstr "Soci"
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model.fields,help:energy_selfconsumption_cooperator.field_energy_selfconsumption_supply_point__partner_id
-msgid "Cooperator subscribed to the self-consumption project"
-msgstr "Soci subscrit al projecte d'autoconsum"
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.actions.act_window,name:energy_selfconsumption_cooperator.action_partner_cooperator_form
-#: model:ir.ui.menu,name:energy_selfconsumption_cooperator.res_partner_cooperators_menu
-msgid "Cooperators"
-msgstr "Socis"
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model.fields,field_description:energy_selfconsumption_cooperator.field_energy_selfconsumption_supply_point__display_name
-msgid "Display Name"
-msgstr "Nom a mostrar"
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model,name:energy_selfconsumption_cooperator.model_energy_selfconsumption_supply_point
-msgid "Energy Supply Point"
-msgstr "Punt de subministrament d'energia"
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model.fields,field_description:energy_selfconsumption_cooperator.field_energy_selfconsumption_supply_point__id
-msgid "ID"
-msgstr "ID"
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model.fields,field_description:energy_selfconsumption_cooperator.field_energy_selfconsumption_supply_point____last_update
-msgid "Last Modified on"
-msgstr "Última modificació el"
diff --git a/energy_selfconsumption_cooperator/i18n/energy_selfconsumption_cooperator.pot b/energy_selfconsumption_cooperator/i18n/energy_selfconsumption_cooperator.pot
deleted file mode 100644
index 3fdf0b77ebdd77c014a14634a8591805f26e1531..0000000000000000000000000000000000000000
--- a/energy_selfconsumption_cooperator/i18n/energy_selfconsumption_cooperator.pot
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * energy_selfconsumption_cooperator
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-18 09:07+0000\n"
-"PO-Revision-Date: 2023-08-18 09:07+0000\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: energy_selfconsumption_cooperator
-#: model_terms:ir.actions.act_window,help:energy_selfconsumption_cooperator.action_partner_cooperator_form
-msgid "Click to add a contact in your address book."
-msgstr ""
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model.fields,field_description:energy_selfconsumption_cooperator.field_energy_selfconsumption_supply_point__partner_id
-msgid "Cooperator"
-msgstr ""
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model.fields,help:energy_selfconsumption_cooperator.field_energy_selfconsumption_supply_point__partner_id
-msgid "Cooperator subscribed to the self-consumption project"
-msgstr ""
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.actions.act_window,name:energy_selfconsumption_cooperator.action_partner_cooperator_form
-#: model:ir.ui.menu,name:energy_selfconsumption_cooperator.res_partner_cooperators_menu
-msgid "Cooperators"
-msgstr ""
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model.fields,field_description:energy_selfconsumption_cooperator.field_energy_selfconsumption_supply_point__display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model,name:energy_selfconsumption_cooperator.model_energy_selfconsumption_supply_point
-msgid "Energy Supply Point"
-msgstr ""
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model.fields,field_description:energy_selfconsumption_cooperator.field_energy_selfconsumption_supply_point__id
-msgid "ID"
-msgstr ""
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model.fields,field_description:energy_selfconsumption_cooperator.field_energy_selfconsumption_supply_point____last_update
-msgid "Last Modified on"
-msgstr ""
diff --git a/energy_selfconsumption_cooperator/i18n/es.po b/energy_selfconsumption_cooperator/i18n/es.po
deleted file mode 100644
index bb43061fe9923df7672a80a46fd459c532670fa7..0000000000000000000000000000000000000000
--- a/energy_selfconsumption_cooperator/i18n/es.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * energy_selfconsumption_cooperator
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-17 14:48+0000\n"
-"PO-Revision-Date: 2023-08-17 14:48+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: \n"
-"Plural-Forms: \n"
-
-#. module: energy_selfconsumption_cooperator
-#: model_terms:ir.actions.act_window,help:energy_selfconsumption_cooperator.action_partner_cooperator_form
-msgid "Click to add a contact in your address book."
-msgstr "Haga clic para agregar un contacto en su libreta de direcciones."
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model.fields,field_description:energy_selfconsumption_cooperator.field_energy_selfconsumption_supply_point__partner_id
-msgid "Cooperator"
-msgstr "Socio"
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model.fields,help:energy_selfconsumption_cooperator.field_energy_selfconsumption_supply_point__partner_id
-msgid "Cooperator subscribed to the self-consumption project"
-msgstr "Socio adherido al proyecto de autoconsumo"
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.actions.act_window,name:energy_selfconsumption_cooperator.action_partner_cooperator_form
-#: model:ir.ui.menu,name:energy_selfconsumption_cooperator.res_partner_cooperators_menu
-msgid "Cooperators"
-msgstr "Socios"
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model.fields,field_description:energy_selfconsumption_cooperator.field_energy_selfconsumption_supply_point__display_name
-msgid "Display Name"
-msgstr "Nombre para mostrar"
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model,name:energy_selfconsumption_cooperator.model_energy_selfconsumption_supply_point
-msgid "Energy Supply Point"
-msgstr "Punto de suministro de energÃa"
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model.fields,field_description:energy_selfconsumption_cooperator.field_energy_selfconsumption_supply_point__id
-msgid "ID"
-msgstr "ID"
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model.fields,field_description:energy_selfconsumption_cooperator.field_energy_selfconsumption_supply_point____last_update
-msgid "Last Modified on"
-msgstr "Última modificación"
diff --git a/energy_selfconsumption_cooperator/i18n/eu_ES.po b/energy_selfconsumption_cooperator/i18n/eu_ES.po
deleted file mode 100644
index c05698341fc6af738e5674af7733ee08c00ab09b..0000000000000000000000000000000000000000
--- a/energy_selfconsumption_cooperator/i18n/eu_ES.po
+++ /dev/null
@@ -1,59 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * energy_selfconsumption_cooperator
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-24 15:05+0000\n"
-"PO-Revision-Date: 2023-08-24 17:06+0200\n"
-"Last-Translator: Daniil Digtyar Vasilieva <daniil.digtyar@somit.coop>\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: \n"
-"X-Generator: Poedit 3.0.1\n"
-
-#. module: energy_selfconsumption_cooperator
-#: model_terms:ir.actions.act_window,help:energy_selfconsumption_cooperator.action_partner_cooperator_form
-msgid "Click to add a contact in your address book."
-msgstr "Egin klik helbide-liburuan kontaktu bat gehitzeko."
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model.fields,field_description:energy_selfconsumption_cooperator.field_energy_selfconsumption_supply_point__partner_id
-msgid "Cooperator"
-msgstr "Kooperatiba"
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model.fields,help:energy_selfconsumption_cooperator.field_energy_selfconsumption_supply_point__partner_id
-msgid "Cooperator subscribed to the self-consumption project"
-msgstr "Kooperatzaileak autokontsumo proiektuan harpidetu zuen"
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.actions.act_window,name:energy_selfconsumption_cooperator.action_partner_cooperator_form
-#: model:ir.ui.menu,name:energy_selfconsumption_cooperator.res_partner_cooperators_menu
-msgid "Cooperators"
-msgstr "Kooperatibako Kideak"
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model.fields,field_description:energy_selfconsumption_cooperator.field_energy_selfconsumption_supply_point__display_name
-msgid "Display Name"
-msgstr "Bistaratzeko izena"
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model,name:energy_selfconsumption_cooperator.model_energy_selfconsumption_supply_point
-msgid "Energy Supply Point"
-msgstr "Energia Hornikuntza Puntua"
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model.fields,field_description:energy_selfconsumption_cooperator.field_energy_selfconsumption_supply_point__id
-msgid "ID"
-msgstr "ID"
-
-#. module: energy_selfconsumption_cooperator
-#: model:ir.model.fields,field_description:energy_selfconsumption_cooperator.field_energy_selfconsumption_supply_point____last_update
-msgid "Last Modified on"
-msgstr "Azken aldaketa egunean"
diff --git a/energy_selfconsumption_cooperator/models/__init__.py b/energy_selfconsumption_cooperator/models/__init__.py
deleted file mode 100644
index 745979c6551f99da064a345dd342e2d5c522e125..0000000000000000000000000000000000000000
--- a/energy_selfconsumption_cooperator/models/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from . import supply_point
diff --git a/energy_selfconsumption_cooperator/models/supply_point.py b/energy_selfconsumption_cooperator/models/supply_point.py
deleted file mode 100644
index 27c08c6f742b1134f2e855f0cba073aa9a423e14..0000000000000000000000000000000000000000
--- a/energy_selfconsumption_cooperator/models/supply_point.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from odoo import api, fields, models
-
-
-class SupplyPoint(models.Model):
- _inherit = "energy_selfconsumption.supply_point"
-
- partner_id = fields.Many2one(
- string="Cooperator",
- help="Cooperator subscribed to the self-consumption project",
- )
-
- @api.onchange("partner_id")
- def _onchange_cooperator_id(self):
- self.owner_id = self.partner_id
diff --git a/energy_selfconsumption_cooperator/static/description/icon.png b/energy_selfconsumption_cooperator/static/description/icon.png
deleted file mode 100644
index 7aefbe88fb341e9711c0be7f0cb2f2f2b096e737..0000000000000000000000000000000000000000
Binary files a/energy_selfconsumption_cooperator/static/description/icon.png and /dev/null differ
diff --git a/energy_selfconsumption_cooperator/views/res_partner_views.xml b/energy_selfconsumption_cooperator/views/res_partner_views.xml
deleted file mode 100644
index 84c7bcf5b012ff6849ee7ef9f47b0dddc7878292..0000000000000000000000000000000000000000
--- a/energy_selfconsumption_cooperator/views/res_partner_views.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
- <data>
- <record id="action_partner_cooperator_form" model="ir.actions.act_window">
- <field name="name">Cooperators</field>
- <field name="res_model">res.partner</field>
- <field name="view_mode">kanban,tree,form</field>
- <field name="domain">[('member', '=', True)]</field>
- <field name="context">{'create': False}</field>
- <field name="help" type="html">
- <p class="oe_view_nocontent_create">
- Click to add a contact in your address book.
- </p>
- </field>
- </record>
-
- <menuitem
- name="Cooperators"
- id="res_partner_cooperators_menu"
- parent="energy_selfconsumption.contacts_category_menu"
- action="action_partner_cooperator_form"
- />
- </data>
-</odoo>
diff --git a/energy_selfconsumption_cooperator/views/supply_point_views.xml b/energy_selfconsumption_cooperator/views/supply_point_views.xml
deleted file mode 100644
index 012fc789ba56424e2f2b06ba548ab40e0cf966a8..0000000000000000000000000000000000000000
--- a/energy_selfconsumption_cooperator/views/supply_point_views.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
- <data>
- <record id="supply_point_form_view_inherit" model="ir.ui.view">
- <field name="name">energy_selfconsumption.supply_point.form.inherit</field>
- <field name="model">energy_selfconsumption.supply_point</field>
- <field
- name="inherit_id"
- ref="energy_selfconsumption.supply_point_form_view"
- />
- <field name="arch" type="xml">
- <xpath expr="//field[@name='owner_id']" position="replace">
- <field
- name="owner_id"
- domain="['|', ('member', '=' , False), ('id', '=', partner_id)]"
- />
- </xpath>
- </field>
- </record>
- </data>
-</odoo>
diff --git a/setup/energy_communities/setup.py b/setup/energy_communities/setup.py
index ba34c43f2703fe41b94e93d008978a897e43dd20..14c97c51db4eb64736c5bc56bd23307d3dbc0a49 100644
--- a/setup/energy_communities/setup.py
+++ b/setup/energy_communities/setup.py
@@ -9,7 +9,7 @@ setuptools.setup(
"community_maps": "odoo14-addon-community-maps==14.0.0.1.13",
"cooperator_account_payment": "odoo14-addon-cooperator-account-payment==14.0.1.1.0",
"cooperator_account_banking_mandate": "odoo14-addon-cooperator-account-banking-mandate==14.0.1.1.0",
- "energy_selfconsumption_cooperator": "odoo14-addon-energy-selfconsumption-cooperator==14.0.1.3.0",
+ "energy_selfconsumption": "odoo14-addon-energy-selfconsumption==14.0.2.1.0",
"crm_metadata": "odoo14-addon-crm-metadata==14.0.1.0.0",
"crm_metadata_rest_api": "odoo14-addon-crm-metadata-rest-api==14.0.1.0.2",
"crm_rest_api": "odoo14-addon-crm-rest-api==14.0.1.0.2",
diff --git a/setup/energy_project_energy_communities/odoo/addons/energy_project_energy_communities b/setup/energy_project_energy_communities/odoo/addons/energy_project_energy_communities
deleted file mode 120000
index 4ac0c52cda5ccf959692fc01d9704efa7a959903..0000000000000000000000000000000000000000
--- a/setup/energy_project_energy_communities/odoo/addons/energy_project_energy_communities
+++ /dev/null
@@ -1 +0,0 @@
-../../../../energy_project_energy_communities
\ No newline at end of file
diff --git a/setup/energy_project_energy_communities/setup.py b/setup/energy_project_energy_communities/setup.py
deleted file mode 100644
index 9b0c3c6cd524504e209d724ba3aae5a63d1c975b..0000000000000000000000000000000000000000
--- a/setup/energy_project_energy_communities/setup.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import setuptools
-
-setuptools.setup(
- setup_requires=['setuptools-odoo'],
- odoo_addon={
- "depends_override": {
- "energy_project": "odoo14-addon-energy-project==14.0.2.0.0",
- "energy_communities": "odoo14-addon-energy-communities==14.0.2.0.1",
- },
- },
-
-)
diff --git a/setup/energy_selfconsumption_cooperator/odoo/addons/energy_selfconsumption_cooperator b/setup/energy_selfconsumption_cooperator/odoo/addons/energy_selfconsumption_cooperator
deleted file mode 120000
index ab938213c9cd9f0dc4d74a52f250d292935653b9..0000000000000000000000000000000000000000
--- a/setup/energy_selfconsumption_cooperator/odoo/addons/energy_selfconsumption_cooperator
+++ /dev/null
@@ -1 +0,0 @@
-../../../../energy_selfconsumption_cooperator
\ No newline at end of file
diff --git a/setup/energy_selfconsumption_cooperator/setup.py b/setup/energy_selfconsumption_cooperator/setup.py
deleted file mode 100644
index ae4388e722793af24c15ba1e0921654915ac56d1..0000000000000000000000000000000000000000
--- a/setup/energy_selfconsumption_cooperator/setup.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import setuptools
-
-setuptools.setup(
- setup_requires=['setuptools-odoo'],
- odoo_addon={
- "depends_override": {
- "energy_selfconsumption": "odoo14-addon-energy-selfconsumption==14.0.2.1.0",
- }
- }
-)