diff --git a/models/sale_intervention.py b/models/sale_intervention.py index c2746f16257f745068128c1146750e4f10c10942..9e2e4496e4cdd562a66641cf629ce56dc7038298 100644 --- a/models/sale_intervention.py +++ b/models/sale_intervention.py @@ -556,11 +556,11 @@ class SaleIntervention(models.Model): @api.constrains("plant_qty", "plants_qty") def _check_plant_qty(self): for rec in self: - if rec.plant_qty != rec.plants_qty: + if rec.plant_qty != rec.plants_qty and rec.sequence_type == "list" and rec.intervention_uom_name == "Unité(s)": raise UserError( _( - "La quantité de plants renseignée '%f' est différente de" - "la quantité de plants calculée '%f'.\n " + "La quantité de plants renseignée '%d' est différente de" + "la quantité de plants calculée '%d'.\n " "Les quantités doivent être identiques, vérifier votre compositon." ) % (rec.plant_qty, rec.plants_qty) @@ -703,7 +703,7 @@ class SaleIntervention(models.Model): rec.collarette_price = ( prices[collarette_product_id.id] - if (rec.mulch_id and rec.is_collarette) + if rec.is_collarette else 0.0 ) rec.mulch_price = prices[rec.mulch_id.id] if rec.mulch_id else 0.0 diff --git a/models/sale_project.py b/models/sale_project.py index c27f2a398f2b425c42f8f73b3436ae337a1a9ca7..97982f699923d93114485ce908f7b436f43d6e43 100644 --- a/models/sale_project.py +++ b/models/sale_project.py @@ -263,5 +263,5 @@ class SaleProjectAdminState(models.Model): @api.model def create(self, vals): seq = self.env["ir.sequence"].next_by_code("sale.project.admin.state") or 0 - vals["status_sequence"] = seq + vals["sequence"] = seq return super(SaleProjectAdminState, self).create(vals)