Merge pull request #1695 from FHenry/3.6

Fix [ bug #1516 ]
Dolibarr · Jun 29, 2014 · a24aeda · a24aeda
2 parents 71ee974 + e8bb5d5
commit a24aeda
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 18 deletions.
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
@@ -625,17 +625,24 @@
 
 					$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
@@ -590,17 +590,24 @@
 
 					$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
@@ -1156,17 +1156,24 @@
 
 					$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