diff --git a/models/enercoop_enedis_cdc.py b/models/enercoop_enedis_cdc.py index 61d44dd1833406ca14c78e552062c617dc60b75d..5bdeba5c56a3cfa00409c143fee342c0fe8e13b3 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 5623da6a4b6f21f6c2d314c0e6870f59469baac3..c19511291698e9ce1107f1450b786aa5939ec5e9 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 b0d4a0765d47aaa465bab715a8b2243dc40e7fef..77e855ce54a47fa10c029586ce6700f974124ba5 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"/>