From ecd3114683137c2ecc8fc4102945eccac9ec4962 Mon Sep 17 00:00:00 2001 From: fappels Date: Sat, 21 Nov 2015 12:35:45 +0100 Subject: [PATCH] Fix defineBuyPrice no min price is not error No min buy price is not error, return 0 if no buyprice set --- htdocs/core/class/commonobject.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 0c7d8baec0d..388f51e7dc5 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -4221,7 +4221,7 @@ abstract class CommonObject $result = $product->fetch($fk_product); if ($result <= 0) { - $this->error='ErrorProductIdDoesNotExists'; + $this->errors[] = 'ErrorProductIdDoesNotExists'; return -1; } if (($product->pmp > 0)) @@ -4238,10 +4238,10 @@ abstract class CommonObject { $buyPrice = $productFournisseur->fourn_price; } - else + else if ($result < 0) { - $this->error = $productFournisseur->error; - return -1; + $this->errors[] = $productFournisseur->error; + return -2; } } }