diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 63220ce415e..eaf4f0031eb 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -625,17 +625,24 @@ else if ($action == 'addline' && $user->rights->propal->creer) {
 
 					$prodcustprice = new Productcustomerprice($db);
 
-					$filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $object->client->id);
+					$filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $object->thirdparty->id);
 
 					$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-					if ($result) {
+					if ($result >= 0) {
 						if (count($prodcustprice->lines) > 0) {
 							$found = true;
-							$pu_ht = price($prodcustprice->lines [0]->price);
-							$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
-							$price_base_type = $prodcustprice->lines [0]->price_base_type;
-							$prod->tva_tx = $prodcustprice->lines [0]->tva_tx;
+							$pu_ht = price($prodcustprice->lines[0]->price);
+							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
+							$price_base_type = $prodcustprice->lines[0]->price_base_type;
+							$prod->tva_tx = $prodcustprice->lines[0]->tva_tx;
+						}else {
+							$pu_ht = $prod->price;
+							$pu_ttc = $prod->price_ttc;
+							$price_min = $prod->price_min;
+							$price_base_type = $prod->price_base_type;
 						}
+					}else {
+						setEventMessage($prodcustprice->error,'errors');
 					}
 				}
 				else
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index f327eb0252d..8f6df313506 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -590,17 +590,24 @@ else if ($action == 'addline' && $user->rights->commande->creer) {
 
 					$prodcustprice = new Productcustomerprice($db);
 
-					$filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $object->client->id);
+					$filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $object->thirdparty->id);
 
 					$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-					if ($result) {
+					if ($result >= 0) {
 						if (count($prodcustprice->lines) > 0) {
 							$found = true;
-							$pu_ht = price($prodcustprice->lines [0]->price);
-							$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
-							$price_base_type = $prodcustprice->lines [0]->price_base_type;
-							$prod->tva_tx = $prodcustprice->lines [0]->tva_tx;
+							$pu_ht = price($prodcustprice->lines[0]->price);
+							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
+							$price_base_type = $prodcustprice->lines[0]->price_base_type;
+							$prod->tva_tx = $prodcustprice->lines[0]->tva_tx;
+						} else {
+							$pu_ht = $prod->price;
+							$pu_ttc = $prod->price_ttc;
+							$price_min = $prod->price_min;
+							$price_base_type = $prod->price_base_type;
 						}
+					} else {
+						setEventMessage($prodcustprice->error,'errors');
 					}
 				}
 				else
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 5c359b71864..26c777f788d 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1156,17 +1156,24 @@ else if ($action == 'addline' && $user->rights->facture->creer)
 
 					$prodcustprice = new Productcustomerprice($db);
 
-					$filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $object->client->id);
+					$filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $object->thirdparty->id);
 
 					$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-					if ($result) {
+					if ($result >= 0) {
 						if (count($prodcustprice->lines) > 0) {
 							$found = true;
-							$pu_ht = price($prodcustprice->lines [0]->price);
-							$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
-							$price_base_type = $prodcustprice->lines [0]->price_base_type;
-							$prod->tva_tx = $prodcustprice->lines [0]->tva_tx;
+							$pu_ht = price($prodcustprice->lines[0]->price);
+							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
+							$price_base_type = $prodcustprice->lines[0]->price_base_type;
+							$prod->tva_tx = $prodcustprice->lines[0]->tva_tx;
+						}else {
+							$pu_ht = $prod->price;
+							$pu_ttc = $prod->price_ttc;
+							$price_min = $prod->price_min;
+							$price_base_type = $prod->price_base_type;
 						}
+					} else {
+						setEventMessage($prodcustprice->error,'errors');
 					}
 				}
 				else