From 94898e058fa7fb196187ecc829af3be5bc51efa7 Mon Sep 17 00:00:00 2001
From: Juliana <juliana@le-filament.com>
Date: Thu, 21 Oct 2021 11:21:48 +0200
Subject: [PATCH] [FIX]Fix bug on operation form + delete year from cdc model
---
models/enercoop_enedis_cdc.py | 7 +------
views/enercoop_enedis_cdc_views.xml | 1 -
views/enercoop_operation_views.xml | 11 +++++------
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/models/enercoop_enedis_cdc.py b/models/enercoop_enedis_cdc.py
index 61d44dd..5bdeba5 100644
--- a/models/enercoop_enedis_cdc.py
+++ b/models/enercoop_enedis_cdc.py
@@ -32,7 +32,6 @@ class EnercoopEnedisCDC(models.Model):
)
power = fields.Float("Puissance en W")
date_slot = fields.Datetime("Date par Demi Heure")
- year = fields.Char("Année", compute='_compute_year', store=True)
# ------------------------------------------------------
# SQL Constraints
@@ -45,11 +44,7 @@ class EnercoopEnedisCDC(models.Model):
# ------------------------------------------------------
# Computed fields / Search Fields
# ------------------------------------------------------
- @api.depends('date_slot')
- def _compute_year(self):
- for counter in self:
- if counter.date_slot:
- counter.year = str(counter.date_slot.year)
+
# ------------------------------------------------------
# Onchange / Constraints
# ------------------------------------------------------
diff --git a/views/enercoop_enedis_cdc_views.xml b/views/enercoop_enedis_cdc_views.xml
index 5623da6..c195112 100644
--- a/views/enercoop_enedis_cdc_views.xml
+++ b/views/enercoop_enedis_cdc_views.xml
@@ -41,7 +41,6 @@
<field name="date_slot"/>
<field name="comp_data_type"/>
<field name="power"/>
- <field name="year"/>
</tree>
</field>
</record>
diff --git a/views/enercoop_operation_views.xml b/views/enercoop_operation_views.xml
index b0d4a07..77e855c 100644
--- a/views/enercoop_operation_views.xml
+++ b/views/enercoop_operation_views.xml
@@ -9,12 +9,12 @@
<search string="Recherche Opération">
<field name="name" string="Nom de l'opération"/>
<separator/>
- <filter name="day" string="Par jour" domain="[('enercoop_enedis_cdc_ids.date_slot', '=', '2021-03-10')]"/>
- <filter name="week" string="Par semaine" domain="[('enercoop_enedis_cdc_ids.date_slot', '=', context_today().strftime('%Y-%m-%d'))]"/>
- <separator/>
+ <!-- <filter name="day" string="Par jour" domain="[('enercoop_enedis_cdc_ids.date_slot', '=', '2021-03-10')]"/>
+ <filter name="week" string="Par semaine" domain="[('enercoop_enedis_cdc_ids.date_slot', '=', context_today().strftime('%Y-%m-%d'))]"/> -->
+ <!-- <separator/> -->
<filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
<separator/>
- <filter
+ <!-- <filter
name="month"
string="Par mois"
domain="[('enercoop_enedis_cdc_ids.date_slot','>=',(context_today()-relativedelta(months=1)).strftime('%%Y-%%m-01')), ('enercoop_enedis_cdc_ids.date_slot','<',time.strftime('%%Y-%%m-01'))]"
@@ -24,7 +24,7 @@
string="Par an"
domain="[('enercoop_enedis_cdc_ids.date_slot','>=',(context_today()-relativedelta(year=1)).strftime('%%Y-%%m-01')), ('enercoop_enedis_cdc_ids.date_slot','<',time.strftime('%%Y-%%m-01'))]"
/>
- <separator/>
+ <separator/> -->
</search>
</field>
</record>
@@ -58,7 +58,6 @@
<group>
<group>
<field name="distribution_key"/>
- <field name="enercoop_enedis_cdc_ids" invisible="1"/>
</group>
<group>
<field name="date_start_contract"/>
--
GitLab