From 879d543a4f5aae0b0f17c0e1af217ec6ba846daa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com>
Date: Wed, 17 Nov 2021 17:35:40 +0100
Subject: [PATCH] [FIX] user error and incorrect naming
---
models/sale_intervention.py | 8 ++++----
models/sale_project.py | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/models/sale_intervention.py b/models/sale_intervention.py
index c2746f1..9e2e449 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 c27f2a3..97982f6 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)
--
GitLab