Skip to content
Extraits de code Groupes Projets
Valider 94898e05 rédigé par Juliana's avatar Juliana
Parcourir les fichiers

[FIX]Fix bug on operation form + delete year from cdc model

parent d8d556a3
Branches
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -32,7 +32,6 @@ class EnercoopEnedisCDC(models.Model): ...@@ -32,7 +32,6 @@ class EnercoopEnedisCDC(models.Model):
) )
power = fields.Float("Puissance en W") power = fields.Float("Puissance en W")
date_slot = fields.Datetime("Date par Demi Heure") date_slot = fields.Datetime("Date par Demi Heure")
year = fields.Char("Année", compute='_compute_year', store=True)
# ------------------------------------------------------ # ------------------------------------------------------
# SQL Constraints # SQL Constraints
...@@ -45,11 +44,7 @@ class EnercoopEnedisCDC(models.Model): ...@@ -45,11 +44,7 @@ class EnercoopEnedisCDC(models.Model):
# ------------------------------------------------------ # ------------------------------------------------------
# Computed fields / Search Fields # 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 # Onchange / Constraints
# ------------------------------------------------------ # ------------------------------------------------------
......
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
<field name="date_slot"/> <field name="date_slot"/>
<field name="comp_data_type"/> <field name="comp_data_type"/>
<field name="power"/> <field name="power"/>
<field name="year"/>
</tree> </tree>
</field> </field>
</record> </record>
......
...@@ -9,12 +9,12 @@ ...@@ -9,12 +9,12 @@
<search string="Recherche Opération"> <search string="Recherche Opération">
<field name="name" string="Nom de l'opération"/> <field name="name" string="Nom de l'opération"/>
<separator/> <separator/>
<filter name="day" string="Par jour" domain="[('enercoop_enedis_cdc_ids.date_slot', '=', '2021-03-10')]"/> <!-- <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'))]"/> <filter name="week" string="Par semaine" domain="[('enercoop_enedis_cdc_ids.date_slot', '=', context_today().strftime('%Y-%m-%d'))]"/> -->
<separator/> <!-- <separator/> -->
<filter string="Archived" name="inactive" domain="[('active', '=', False)]"/> <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
<separator/> <separator/>
<filter <!-- <filter
name="month" name="month"
string="Par mois" string="Par mois"
domain="[('enercoop_enedis_cdc_ids.date_slot','&gt;=',(context_today()-relativedelta(months=1)).strftime('%%Y-%%m-01')), ('enercoop_enedis_cdc_ids.date_slot','&lt;',time.strftime('%%Y-%%m-01'))]" domain="[('enercoop_enedis_cdc_ids.date_slot','&gt;=',(context_today()-relativedelta(months=1)).strftime('%%Y-%%m-01')), ('enercoop_enedis_cdc_ids.date_slot','&lt;',time.strftime('%%Y-%%m-01'))]"
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
string="Par an" string="Par an"
domain="[('enercoop_enedis_cdc_ids.date_slot','&gt;=',(context_today()-relativedelta(year=1)).strftime('%%Y-%%m-01')), ('enercoop_enedis_cdc_ids.date_slot','&lt;',time.strftime('%%Y-%%m-01'))]" domain="[('enercoop_enedis_cdc_ids.date_slot','&gt;=',(context_today()-relativedelta(year=1)).strftime('%%Y-%%m-01')), ('enercoop_enedis_cdc_ids.date_slot','&lt;',time.strftime('%%Y-%%m-01'))]"
/> />
<separator/> <separator/> -->
</search> </search>
</field> </field>
</record> </record>
...@@ -58,7 +58,6 @@ ...@@ -58,7 +58,6 @@
<group> <group>
<group> <group>
<field name="distribution_key"/> <field name="distribution_key"/>
<field name="enercoop_enedis_cdc_ids" invisible="1"/>
</group> </group>
<group> <group>
<field name="date_start_contract"/> <field name="date_start_contract"/>
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter