diff --git a/models/sale_intervention.py b/models/sale_intervention.py index 61b102e667cd3805ea9d0116590bfc609bc4651b..f5d1946da55eff33741dd2beb4f5c8ffb38e4924 100644 --- a/models/sale_intervention.py +++ b/models/sale_intervention.py @@ -503,13 +503,6 @@ class SaleIntervention(models.Model): plant.qty for plant in rec.plant_list_ids if plant.is_local ) - if rec.mulch_has_staples: - if rec.mulch_id.nb_accesories: - mulch_staples_qty = rec.mulch_id.nb_accesories - rec.mulch_staples_qty = mulch_staples_qty - else: - rec.mulch_staples_qty = 2 - rec.plants_qty = plants_qty rec.plant_qty_per_seq = plant_qty_per_seq rec.full_seq_qty = full_seq_qty @@ -524,18 +517,22 @@ class SaleIntervention(models.Model): @api.onchange("mulch_has_staples") def _onchange_mulch_has_staples(self): if self.mulch_has_staples: - if self.mulch_id.nb_accesories: + if self.mulch_id.nb_accesories and self.mulch_id.nb_accesories > 0.0: self.mulch_staples_qty = self.mulch_id.nb_accesories + else: + self.mulch_staples_qty = 2 else: - self.mulch_staples_qty = 2 + self.mulch_staples_qty = 0 @api.onchange("mulch2_has_staples") def _onchange_mulch2_has_staples(self): if self.mulch2_has_staples: - if self.mulch2_id.nb_accesories: + if self.mulch2_id.nb_accesories and self.mulch2_id.nb_accesories > 0.0: self.mulch2_staples_qty = self.mulch2_id.nb_accesories + else: + self.mulch2_staples_qty = 2 else: - self.mulch2_staples_qty = 2 + self.mulch2_staples_qty = 0 @api.onchange("intervention_length", "plant_interval") def _onchange_length(self): @@ -571,7 +568,10 @@ class SaleIntervention(models.Model): @api.onchange("high_protection_qty") def _onchange_high_protection_qty(self): - if self.high_protection_id.nb_accesories: + if ( + self.high_protection_id.nb_accesories + and self.high_protection_id.nb_accesories > 0.0 + ): stake_multiplier = self.high_protection_id.nb_accesories else: stake_multiplier = 1 @@ -580,7 +580,10 @@ class SaleIntervention(models.Model): @api.onchange("low_protection_qty") def _onchange_low_protection_qty(self): - if self.low_protection_id.nb_accesories: + if ( + self.low_protection_id.nb_accesories + and self.low_protection_id.nb_accesories > 0.0 + ): stake_multiplier = self.low_protection_id.nb_accesories else: stake_multiplier = 2