From bed3c47cb97ebd1c506d9bea96759ba79263c3be Mon Sep 17 00:00:00 2001
From: Daniil Digtyar Vasilieva <daniildigtyar@gmail.com>
Date: Tue, 30 May 2023 12:21:47 +0200
Subject: [PATCH] [IMP] removed distribution_table_id
---
energy_selfconsumption/models/selfconsumption.py | 5 ++---
energy_selfconsumption/views/selfconsumption_views.xml | 6 ------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/energy_selfconsumption/models/selfconsumption.py b/energy_selfconsumption/models/selfconsumption.py
index 4b6dc4436..3de0d425b 100644
--- a/energy_selfconsumption/models/selfconsumption.py
+++ b/energy_selfconsumption/models/selfconsumption.py
@@ -19,7 +19,6 @@ class Selfconsumption(models.Model):
)
code = fields.Char(string="CAU")
power = fields.Float(string="Generation Power (kWh)")
- distribution_table_id = fields.Many2one('energy_selfconsumption.distribution_table')
distribution_table_ids = fields.One2many('energy_selfconsumption.distribution_table', 'selfconsumption_project_id',
readonly=True)
distribution_table_count = fields.Integer(compute=_compute_distribution_table_count)
@@ -45,6 +44,6 @@ class Selfconsumption(models.Model):
raise ValidationError(_("Project must have a valid Code."))
if not record.power or record.power <= 0:
raise ValidationError(_("Project must have a valid Generation Power."))
- if not record.distribution_table_id:
- raise ValidationError(_("Must select a valid Distribution Table."))
+ if record.distribution_table_ids.filtered_domain([('state', '=', 'validated')]):
+ raise ValidationError(_("Must have a valid Distribution Table."))
record.write({"state": "active"})
diff --git a/energy_selfconsumption/views/selfconsumption_views.xml b/energy_selfconsumption/views/selfconsumption_views.xml
index 6a2a69b30..e95eba312 100644
--- a/energy_selfconsumption/views/selfconsumption_views.xml
+++ b/energy_selfconsumption/views/selfconsumption_views.xml
@@ -65,12 +65,6 @@
name="power"
attrs="{'readonly': [('state', 'not in', ['draft', 'activation'])]}"
/>
- <field
- name="distribution_table_id"
- attrs="{'readonly': [('state', 'not in', ['draft', 'activation'])]}"
- domain="[('state', '=', 'active'), ('selfconsumption_project_id', '=', id)]"
- options="{'no_create': True}"
- />
</group>
<group>
<span class="o_form_label o_td_label" name="address_name">
--
GitLab