From 61ef863f7cce6eda7447a2d1fa3920ee4895520c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina=20JOUM?= <melina.joum@altairis.fr>
Date: Thu, 19 Sep 2024 16:46:24 +0200
Subject: [PATCH 1/8] NEW: customer price and level price together

---
 htdocs/comm/card.php                     |   2 +-
 htdocs/comm/propal/card.php              |  45 +-
 htdocs/commande/card.php                 |  49 +-
 htdocs/commande/class/commande.class.php |   2 +-
 htdocs/core/class/commonobject.class.php |   2 +-
 htdocs/core/class/conf.class.php         |   2 +-
 htdocs/core/class/html.form.class.php    |  10 +-
 htdocs/core/lib/company.lib.php          |   2 +-
 htdocs/core/lib/pdf.lib.php              |   4 +-
 htdocs/product/admin/product.php         |   5 +
 htdocs/product/ajax/products.php         |   8 +-
 htdocs/product/class/product.class.php   |  56 +-
 htdocs/product/price.php                 | 806 ++++++++++++-----------
 htdocs/societe/class/societe.class.php   |   4 +-
 htdocs/societe/list.php                  |   4 +-
 htdocs/societe/price.php                 |   4 +-
 16 files changed, 581 insertions(+), 424 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 96b99cc7f0055..81ec074de8be2 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -529,7 +529,7 @@
 
 
 	// Multiprice level
-	if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
+	if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 		print '<tr><td class="nowrap">';
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 		print $langs->trans("PriceLevel");
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index a6e89c93989b4..867f60319f15e 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1131,8 +1131,45 @@
 				$price_min_ttc = $prod->price_min_ttc;
 				$price_base_type = $prod->price_base_type;
 
-				// If price per segment
-				if (getDolGlobalString('PRODUIT_MULTIPRICES') && $object->thirdparty->price_level) {
+				if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
+					// If price per customer
+					require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
+					$prodcustprice = new ProductCustomerPrice($db);
+					$filter = array('t.fk_product' => $prod->id, 't.fk_soc' => $object->thirdparty->id);
+					$result = $prodcustprice->fetchAll('', '', 0, 0, $filter);
+					if ($result) {
+						// If there is some prices specific to the customer
+						if (count($prodcustprice->lines) > 0) {
+							$pu_ht = price($prodcustprice->lines[0]->price);
+							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
+							$price_min =  price($prodcustprice->lines[0]->price_min);
+							$price_min_ttc =  price($prodcustprice->lines[0]->price_min_ttc);
+							$price_base_type = $prodcustprice->lines[0]->price_base_type;
+							/*$tva_tx = ($prodcustprice->lines[0]->default_vat_code ? $prodcustprice->lines[0]->tva_tx.' ('.$prodcustprice->lines[0]->default_vat_code.' )' : $prodcustprice->lines[0]->tva_tx);
+							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
+								$tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
+							}
+							$tva_npr = $prodcustprice->lines[0]->recuperableonly;
+							if (empty($tva_tx)) {
+								$tva_npr = 0;
+							}*/
+						}
+					} elseif ($object->thirdparty->price_level) { // // If price per segment
+						$pu_ht = $prod->multiprices[$object->thirdparty->price_level];
+						$pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
+						$price_min = $prod->multiprices_min[$object->thirdparty->price_level];
+						$price_min_ttc = $prod->multiprices_min_ttc[$object->thirdparty->price_level];
+						$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
+						if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) {  // using this option is a bug. kept for backward compatibility
+							if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) {
+								$tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];
+							}
+							if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) {
+								$tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];
+							}
+						}
+					}
+				} elseif (getDolGlobalString('PRODUIT_MULTIPRICES') && $object->thirdparty->price_level) { // If price per segment
 					$pu_ht = $prod->multiprices[$object->thirdparty->price_level];
 					$pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
 					$price_min = $prod->multiprices_min[$object->thirdparty->price_level];
@@ -1543,11 +1580,11 @@
 			$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
 
 			$price_min = $product->price_min;
-			if (getDolGlobalString('PRODUIT_MULTIPRICES') && !empty($object->thirdparty->price_level)) {
+			if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) && !empty($object->thirdparty->price_level)) {
 				$price_min = $product->multiprices_min[$object->thirdparty->price_level];
 			}
 			$price_min_ttc = $product->price_min_ttc;
-			if (getDolGlobalString('PRODUIT_MULTIPRICES') && !empty($object->thirdparty->price_level)) {
+			if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) && !empty($object->thirdparty->price_level)) {
 				$price_min_ttc = $product->multiprices_min_ttc[$object->thirdparty->price_level];
 			}
 
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 8b8e5a8dfb462..392bc0433af01 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -820,6 +820,51 @@
 				$price_min_ttc = $prod->price_min_ttc;
 				$price_base_type = $prod->price_base_type;
 
+				if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
+					// If price per customer
+					require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
+
+					$prodcustprice = new ProductCustomerPrice($db);
+
+					$filter = array('t.fk_product' => $prod->id, 't.fk_soc' => $object->thirdparty->id);
+
+					$result = $prodcustprice->fetchAll('', '', 0, 0, $filter);
+					if ($result >= 0) {
+						if (count($prodcustprice->lines) > 0) {
+							$pu_ht = price($prodcustprice->lines[0]->price);
+							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
+							$price_min =  price($prodcustprice->lines[0]->price_min);
+							$price_min_ttc =  price($prodcustprice->lines[0]->price_min_ttc);
+							$price_base_type = $prodcustprice->lines[0]->price_base_type;
+							$tva_tx = $prodcustprice->lines[0]->tva_tx;
+							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
+								$tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
+							}
+							$tva_npr = $prodcustprice->lines[0]->recuperableonly;
+							if (empty($tva_tx)) {
+								$tva_npr = 0;
+							}
+						}
+					} else {
+						setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
+					}
+
+					if (!empty($object->thirdparty->price_level)) { //// If price per segment
+						$pu_ht = $prod->multiprices[$object->thirdparty->price_level];
+						$pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
+						$price_min = $prod->multiprices_min[$object->thirdparty->price_level];
+						$price_min_ttc = $prod->multiprices_min_ttc[$object->thirdparty->price_level];
+						$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
+						if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) {  // using this option is a bug. kept for backward compatibility
+							if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) {
+								$tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];
+							}
+							if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) {
+								$tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];
+							}
+						}
+					}
+				}
 				// If price per segment
 				if (getDolGlobalString('PRODUIT_MULTIPRICES') && !empty($object->thirdparty->price_level)) {
 					$pu_ht = $prod->multiprices[$object->thirdparty->price_level];
@@ -1222,11 +1267,11 @@
 			$type = $product->type;
 
 			$price_min = $product->price_min;
-			if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) && !empty($object->thirdparty->price_level)) {
+			if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) && !empty($object->thirdparty->price_level)) {
 				$price_min = $product->multiprices_min[$object->thirdparty->price_level];
 			}
 			$price_min_ttc = $product->price_min_ttc;
-			if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) && !empty($object->thirdparty->price_level)) {
+			if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) && !empty($object->thirdparty->price_level)) {
 				$price_min_ttc = $product->multiprices_min_ttc[$object->thirdparty->price_level];
 			}
 
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 7723e9e992f91..bd21980ffac8a 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1796,7 +1796,7 @@ public function add_product($idproduct, $qty, $remise_percent = 0.0, $date_start
 			$localtax2_tx = get_localtax($tva_tx, 2, $this->thirdparty, $mysoc, $tva_npr);
 
 			// multiprix
-			if ($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level) {
+			if (($conf->global->PRODUIT_MULTIPRICES) && $this->thirdparty->price_level) {
 				$price = $prod->multiprices[$this->thirdparty->price_level];
 			} else {
 				$price = $prod->price;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 338a0a73a1ed1..6b63e0ecd0435 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1887,7 +1887,7 @@ public function fetch_thirdparty($force_thirdparty_id = 0)
 			$this->thirdparty = $thirdparty;
 
 			// Use first price level if level not defined for third party
-			if (getDolGlobalString('PRODUIT_MULTIPRICES') && empty($this->thirdparty->price_level)) {
+			if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) && empty($this->thirdparty->price_level)) {
 				$this->thirdparty->price_level = 1;
 			}
 
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 6c2148a4b1ef5..d05a5ef485287 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -1039,7 +1039,7 @@ public function setValues($db)
 				$this->holiday->approve->warning_delay = (isset($this->global->MAIN_DELAY_HOLIDAYS) ? (int) $this->global->MAIN_DELAY_HOLIDAYS : 0) * 86400;
 			}
 
-			if (!empty($this->global->PRODUIT_MULTIPRICES) && empty($this->global->PRODUIT_MULTIPRICES_LIMIT)) {
+			if ((!empty($this->global->PRODUIT_MULTIPRICES) || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) && empty($this->global->PRODUIT_MULTIPRICES_LIMIT)) {
 				$this->global->PRODUIT_MULTIPRICES_LIMIT = 5;
 			}
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 07ca8415b7ea4..2880d1644f5c6 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2935,7 +2935,7 @@ public function select_produits_list($selected = 0, $htmlname = 'productid', $fi
 		}
 
 		//Price by customer
-		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') && !empty($socid)) {
+		if ((getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) && !empty($socid)) {
 			$sql .= ', pcp.rowid as idprodcustprice, pcp.price as custprice, pcp.price_ttc as custprice_ttc,';
 			$sql .= ' pcp.price_base_type as custprice_base_type, pcp.tva_tx as custtva_tx, pcp.default_vat_code as custdefault_vat_code, pcp.ref_customer as custref';
 			$selectFields .= ", idprodcustprice, custprice, custprice_ttc, custprice_base_type, custtva_tx, custdefault_vat_code, custref";
@@ -2993,7 +2993,7 @@ public function select_produits_list($selected = 0, $htmlname = 'productid', $fi
 		}
 
 		//Price by customer
-		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') && !empty($socid)) {
+		if ((getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) && !empty($socid)) {
 			$sql .= " LEFT JOIN  " . $this->db->prefix() . "product_customer_price as pcp ON pcp.fk_soc=" . ((int) $socid) . " AND pcp.fk_product=p.rowid";
 		}
 		// Units
@@ -3073,7 +3073,7 @@ public function select_produits_list($selected = 0, $htmlname = 'productid', $fi
 				if (getDolGlobalInt('MAIN_MULTILANGS')) {
 					$sql .= " OR pl.label LIKE '" . $this->db->escape($prefix . $crit) . "%'";
 				}
-				if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') && !empty($socid)) {
+				if ((getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) && !empty($socid)) {
 					$sql .= " OR pcp.ref_customer LIKE '" . $this->db->escape($prefix . $crit) . "%'";
 				}
 				if (getDolGlobalString('PRODUCT_AJAX_SEARCH_ON_DESCRIPTION')) {
@@ -3431,7 +3431,7 @@ protected function constructProductListOption(&$objp, &$opt, &$optJson, $price_l
 		$labeltoshowprice = '';
 		$labeltoshowhtmlprice = '';
 		// If we need a particular price level (from 1 to n)
-		if (empty($hidepriceinlabel) && $price_level >= 1 && (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'))) {
+		if (empty($hidepriceinlabel) && $price_level >= 1 && (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES'))) {
 			$sql = "SELECT price, price_ttc, price_base_type, tva_tx, default_vat_code";
 			$sql .= " FROM " . $this->db->prefix() . "product_price";
 			$sql .= " WHERE fk_product = " . ((int) $objp->rowid);
@@ -3502,7 +3502,7 @@ protected function constructProductListOption(&$objp, &$opt, &$optJson, $price_l
 		}
 
 		// Price by customer
-		if (empty($hidepriceinlabel) && getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
+		if (empty($hidepriceinlabel) && (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES'))) {
 			if (!empty($objp->idprodcustprice)) {
 				$found = 1;
 
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 83bf7b3f6539e..3ad3dee44d95f 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -121,7 +121,7 @@ function societe_prepare_head(Societe $object)
 		$head[$h][2] = 'customer';
 		$h++;
 
-		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
+		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 			$langs->load("products");
 			// price
 			$head[$h][0] = DOL_URL_ROOT.'/societe/price.php?socid='.$object->id;
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 861d632bc64d1..9d6145384859a 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1503,7 +1503,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		$prodser = new Product($db);
 
-		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
+		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 			include_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
 		}
 	}
@@ -1682,7 +1682,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		} else {
 			$ref_prodserv = $prodser->ref; // Show local ref only
 
-			if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
+			if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 				$productCustomerPriceStatic = new ProductCustomerPrice($db);
 				$filter = array('fk_product' => $idprod, 'fk_soc' => $object->socid);
 
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index d98818b51c901..0336bc47d6322 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -59,6 +59,7 @@
 	'PRODUCT_PRICE_UNIQ' => $langs->trans('PriceCatalogue'), // Unique price
 	'PRODUIT_MULTIPRICES' => $langs->trans('MultiPricesAbility'), // Several prices according to a customer level
 	'PRODUIT_CUSTOMER_PRICES' => $langs->trans('PriceByCustomer'), // Different price for each customer
+	'PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES'=>$langs->trans('PriceByCustomeAndMultiPricesAbility'), // Different price for each customer and several prices according to a customer level
 );
 $keyforparam = 'PRODUIT_CUSTOMER_PRICES_BY_QTY';
 if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1 || getDolGlobalString($keyforparam)) {
@@ -113,6 +114,7 @@
 				$res = dolibarr_set_const($db, 'PRODUIT_MULTIPRICES', 0, 'chaine', 0, '', $conf->entity);
 				$res = dolibarr_set_const($db, 'PRODUIT_CUSTOMER_PRICES_BY_QTY', 0, 'chaine', 0, '', $conf->entity);
 				$res = dolibarr_set_const($db, 'PRODUIT_CUSTOMER_PRICES', 0, 'chaine', 0, '', $conf->entity);
+				$res = dolibarr_set_const($db, 'PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES', 0, 'chaine', 0, '', $conf->entity);
 				dolibarr_set_const($db, 'PRODUCT_PRICE_UNIQ', 1, 'chaine', 0, '', $conf->entity);
 			} else {
 				$multirule = explode('&', $princingrules);
@@ -586,6 +588,9 @@
 if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
 	$current_rule = 'PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES';
 }
+if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
+	$current_rule = 'PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES';
+}
 print $form->selectarray("princingrule", $select_pricing_rules, $current_rule, 0, 0, 0, '', 1, 0, 0, '', 'maxwidth400', 1);
 print '</td>';
 print '</tr>';
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 7cca33a775f31..a0c379f078a81 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -112,7 +112,7 @@
 			if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 				$needchangeaccordingtothirdparty = 1;
 			}
-			if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')  || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 				$needchangeaccordingtothirdparty = 1;
 			}
 			if ($needchangeaccordingtothirdparty) {
@@ -135,7 +135,7 @@
 				}
 
 				//Set price level according to thirdparty
-				if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
+				if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 					$price_level = $thirdpartytemp->price_level;
 				}
 			}
@@ -167,7 +167,7 @@
 		}
 
 		// Multiprice (1 price per level)
-		if (!$found && isset($price_level) && $price_level >= 1 && (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'))) { // If we need a particular price level (from 1 to 6)
+		if (!$found && isset($price_level) && $price_level >= 1 && (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES'))) { // If we need a particular price level (from 1 to 6)
 			$sql = "SELECT price, price_ttc, price_base_type,";
 			$sql .= " tva_tx, default_vat_code";	// Vat rate and code will be used if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on.
 			$sql .= " FROM ".MAIN_DB_PREFIX."product_price ";
@@ -200,7 +200,7 @@
 		}
 
 		// Price by customer
-		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') && !empty($socid)) {
+		if ((getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) && !empty($socid)) {
 			require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
 			$prodcustprice = new ProductCustomerPrice($db);
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index b526c465d7904..30777be2cbb49 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2276,8 +2276,54 @@ public function getSellPrice($thirdparty_seller, $thirdparty_buyer, $pqp = 0)
 		$price_min = $this->price_min;
 		$price_base_type = $this->price_base_type;
 
-		// If price per segment
-		if (getDolGlobalString('PRODUIT_MULTIPRICES') && !empty($thirdparty_buyer->price_level)) {
+        // if price by customer / level
+        if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
+            require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
+
+            $prodcustprice = new ProductCustomerPrice($this->db);
+
+            $filter = array('t.fk_product' => $this->id, 't.fk_soc' => $thirdparty_buyer->id);
+
+            // If a price per customer exist
+            $pricebycustomerexist = false;
+            $result = $prodcustprice->fetchAll('', '', 0, 0, $filter);
+            if ($result) {
+                if (count($prodcustprice->lines) > 0) {
+                    $pricebycustomerexist = true;
+                    $pu_ht = price($prodcustprice->lines[0]->price);
+                    $price_min = price($prodcustprice->lines[0]->price_min);
+                    $pu_ttc = price($prodcustprice->lines[0]->price_ttc);
+                    $price_base_type = $prodcustprice->lines[0]->price_base_type;
+                    $tva_tx = $prodcustprice->lines[0]->tva_tx;
+                    if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
+                        $tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
+                    }
+                    $tva_npr = $prodcustprice->lines[0]->recuperableonly;
+                    if (empty($tva_tx)) {
+                        $tva_npr = 0;
+                    }
+                }
+            }
+
+            if ( !$pricebycustomerexist && !empty($thirdparty_buyer->price_level)) {
+                $pu_ht = $this->multiprices[$thirdparty_buyer->price_level];
+                $pu_ttc = $this->multiprices_ttc[$thirdparty_buyer->price_level];
+                $price_min = $this->multiprices_min[$thirdparty_buyer->price_level];
+                $price_base_type = $this->multiprices_base_type[$thirdparty_buyer->price_level];
+                if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) {
+                    // using this option is a bug. kept for backward compatibility
+                    if (isset($this->multiprices_tva_tx[$thirdparty_buyer->price_level])) {
+                        $tva_tx = $this->multiprices_tva_tx[$thirdparty_buyer->price_level];
+                    }
+                    if (isset($this->multiprices_recuperableonly[$thirdparty_buyer->price_level])) {
+                        $tva_npr = $this->multiprices_recuperableonly[$thirdparty_buyer->price_level];
+                    }
+                    if (empty($tva_tx)) {
+                        $tva_npr = 0;
+                    }
+                }
+            }
+        } elseif(getDolGlobalString('PRODUIT_MULTIPRICES') && !empty($thirdparty_buyer->price_level)) { // // If price per segment
 			$pu_ht = $this->multiprices[$thirdparty_buyer->price_level];
 			$pu_ttc = $this->multiprices_ttc[$thirdparty_buyer->price_level];
 			$price_min = $this->multiprices_min[$thirdparty_buyer->price_level];
@@ -2576,7 +2622,7 @@ public function updatePrice($newprice, $newpricebase, $user, $newvat = null, $ne
 
 		// If multiprices are enabled, then we check if the current product is subject to price autogeneration
 		// Price will be modified ONLY when the first one is the one that is being modified
-		if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) && !$ignore_autogen && $this->price_autogen && ($level == 1)) {
+		if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) && !$ignore_autogen && $this->price_autogen && ($level == 1)) {
 			return $this->generateMultiprices($user, $newprice, $newpricebase, $newvat, $newnpr, $newpbq);
 		}
 
@@ -2976,7 +3022,7 @@ public function fetch($id = 0, $ref = '', $ref_ext = '', $barcode = '', $ignore_
 				}
 
 				// Load multiprices array
-				if (getDolGlobalString('PRODUIT_MULTIPRICES') && empty($ignore_price_load)) {                // prices per segment
+				if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) && empty($ignore_price_load)) {                // prices per segment
 					$produit_multiprices_limit = getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT');
 					for ($i = 1; $i <= $produit_multiprices_limit; $i++) {
 						$sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
@@ -3042,7 +3088,7 @@ public function fetch($id = 0, $ref = '', $ref_ext = '', $barcode = '', $ignore_
 							return -1;
 						}
 					}
-				} elseif (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') && empty($ignore_price_load)) {            // prices per customers
+				} elseif ((getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) && empty($ignore_price_load)) {            // prices per customers
 					// Nothing loaded by default. List may be very long.
 				} elseif (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') && empty($ignore_price_load)) {    // prices per quantity
 					$sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 23203912b0ee3..179a84bb2394e 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -43,7 +43,7 @@
 require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_expression.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
 
-if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
+if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
 	$prodcustprice = new ProductCustomerPrice($db);
@@ -76,7 +76,7 @@
 }
 
 // Clean param
-if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) && !getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT')) {
+if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) && getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT')) {
 	$conf->global->PRODUIT_MULTIPRICES_LIMIT = 5;
 }
 
@@ -204,7 +204,7 @@
 		}
 
 		if (!$error) {
-			if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 				$produit_multiprices_limit = getDolGlobalInt('PRODUIT_MULTIPRICES_LIMIT');
 				for ($i = 1; $i <= $produit_multiprices_limit; $i++) {
 					// Force the update of the price of the product using the new VAT
@@ -261,7 +261,7 @@
 		$action = '';
 	}
 
-	if (($action == 'update_price') && !$cancel && $object->getRights()->creer) {
+	if (($action == 'update_price' || $action == 'update_level_price') && !$cancel && $object->getRights()->creer) {
 		$error = 0;
 		$pricestoupdate = array();
 
@@ -285,7 +285,7 @@
 		}
 
 		// Multiprices
-		if (!$error && (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'))) {
+		if (!$error && (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || ($action == 'update_level_price' && getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')))) {
 			$newprice = GETPOST('price', 'array');
 			$newprice_min = GETPOST('price_min', 'array');
 			$newpricebase = GETPOST('multiprices_base_type', 'array');
@@ -916,7 +916,7 @@
 print '<table class="border tableforfield centpercent">';
 
 // Price per customer segment/level
-if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
+if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 	// Price and min price are variable (depends on level of company).
 	if (!empty($socid)) {
 		$soc = new Societe($db);
@@ -1059,6 +1059,32 @@
 			}
 			else print vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true);*/
 			print '</td></tr>';
+			if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
+				// Price
+				print '<tr class="field_selling_price"><td>'.$langs->trans("SellingPrice").'</td><td>';
+				if ($object->price_base_type == 'TTC') {
+					print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
+				} else {
+					print price($object->price).' '.$langs->trans($object->price_base_type);
+					if (getDolGlobalString('PRODUCT_DISPLAY_VAT_INCL_PRICES') && !empty($object->price_ttc)) {
+						print '<i class="opacitymedium"> - ' . price($object->price_ttc).' '.$langs->trans('TTC') . '</i>';
+					}
+				}
+
+				print '</td></tr>';
+
+				// Price minimum
+				print '<tr class="field_min_price"><td>'.$langs->trans("MinPrice").'</td><td>';
+				if ($object->price_base_type == 'TTC') {
+					print price($object->price_min_ttc).' '.$langs->trans($object->price_base_type);
+				} else {
+					print price($object->price_min).' '.$langs->trans($object->price_base_type);
+					if (getDolGlobalString('PRODUCT_DISPLAY_VAT_INCL_PRICES') && !empty($object->price_min_ttc)) {
+						print '<i class="opacitymedium"> - ' . price($object->price_min_ttc).' '.$langs->trans('TTC') . '</i>';
+					}
+				}
+				print '</td></tr>';
+			}
 		}
 		print '</table>';
 
@@ -1375,7 +1401,7 @@
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="' . dol_escape_htmltag($langs->trans("NoEditVariants")) . '">' . $langs->trans("UpdateDefaultPrice") . '</a></div>';
 			}
 		} else {
-			if (!getDolGlobalString('PRODUIT_MULTIPRICES') && !getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
+			if (!getDolGlobalString('PRODUIT_MULTIPRICES') && !getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') && !getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 				if ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer')) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_price&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("UpdateDefaultPrice") . '</a></div>';
 				} else {
@@ -1383,7 +1409,7 @@
 				}
 			}
 
-			if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
+			if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 				if ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer')) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=add_customer_price&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("AddCustomerPrice") . '</a></div>';
 				} else {
@@ -1391,7 +1417,7 @@
 				}
 			}
 
-			if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 				if ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer')) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_vat&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("UpdateVAT") . '</a></div>';
 				} else {
@@ -1399,7 +1425,7 @@
 				}
 
 				if ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer')) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_price&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("UpdateLevelPrices") . '</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_level_price&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("UpdateLevelPrices") . '</a></div>';
 				} else {
 					print '<div class="inline-block divButAction"><span class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">' . $langs->trans("UpdateLevelPrices") . '</span></div>';
 				}
@@ -1442,11 +1468,11 @@
 	print '<br></form><br>';
 }
 
-if ($action == 'edit_price' && $object->getRights()->creer) {
+if (($action == 'edit_price' || $action == 'edit_level_price') && $object->getRights()->creer) {
 	print '<br>';
 	print load_fiche_titre($langs->trans("NewPrice"), '');
 
-	if (!getDolGlobalString('PRODUIT_MULTIPRICES') && !getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
+	if (!getDolGlobalString('PRODUIT_MULTIPRICES') && $action != 'edit_level_price') {
 		print '<!-- Edit price -->'."\n";
 		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -1559,7 +1585,7 @@ function on_change() {
 		print $form->buttonsSaveCancel();
 
 		print '</form>';
-	} else {
+	} elseif ($action == 'edit_level_price' && $object->getRights()->creer) {
 		print '<!-- Edit price per level -->'."\n"; ?>
 		<script>
 
@@ -1586,12 +1612,12 @@ function on_change() {
 
 		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="action" value="update_price">';
+		print '<input type="hidden" name="action" value="update_level_price">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
 		//print dol_get_fiche_head(array(), '', '', -1);
 
-		if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) && getDolGlobalString('PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL')) {
+		if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) && getDolGlobalString('PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL')) {
 			print $langs->trans('UseMultipriceRules').' <input type="checkbox" id="usePriceRules" name="usePriceRules" '.($object->price_autogen ? 'checked' : '').'><br><br>';
 		}
 
@@ -1682,404 +1708,131 @@ function on_change() {
 	}
 }
 
+// Add area to show/add/edit a price for a dedicated customer
+if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
+	$prodcustprice = new ProductCustomerPrice($db);
 
-// List of price changes - log historic (ordered by descending date)
-
-if ((!getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || $action == 'showlog_default_price') && !in_array($action, array('edit_price', 'edit_vat'))) {
-	$sql = "SELECT p.rowid, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.default_vat_code, p.recuperableonly, p.localtax1_tx, p.localtax1_type, p.localtax2_tx, p.localtax2_type,";
-	$sql .= " p.price_level, p.price_min, p.price_min_ttc,p.price_by_qty,";
-	$sql .= " p.date_price as dp, p.fk_price_expression, u.rowid as user_id, u.login";
-	$sql .= " ,p.price_label";
-	$sql .= " FROM ".MAIN_DB_PREFIX."product_price as p,";
-	$sql .= " ".MAIN_DB_PREFIX."user as u";
-	$sql .= " WHERE fk_product = ".((int) $object->id);
-	$sql .= " AND p.entity IN (".getEntity('productprice').")";
-	$sql .= " AND p.fk_user_author = u.rowid";
-	if (!empty($socid) && getDolGlobalString('PRODUIT_MULTIPRICES')) {
-		$sql .= " AND p.price_level = ".((int) $soc->price_level);
+	$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+	$sortfield = GETPOST('sortfield', 'aZ09comma');
+	$sortorder = GETPOST('sortorder', 'aZ09comma');
+	$page = (GETPOSTINT("page") ? GETPOSTINT("page") : 0);
+	if (empty($page) || $page == -1) {
+		$page = 0;
+	}     // If $page is not defined, or '' or -1
+	$offset = $limit * $page;
+	$pageprev = $page - 1;
+	$pagenext = $page + 1;
+	if (!$sortorder) {
+		$sortorder = "ASC";
+	}
+	if (!$sortfield) {
+		$sortfield = "soc.nom";
 	}
-	$sql .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
-	// $sql .= $db->plimit();
-	//print $sql;
 
-	$result = $db->query($sql);
-	if ($result) {
-		print '<div class="divlogofpreviouscustomerprice">';
+	// Build filter to display only concerned lines
+	$filter = array('t.fk_product' => $object->id);
 
-		$num = $db->num_rows($result);
+	if (!empty($search_soc)) {
+		$filter['soc.nom'] = $search_soc;
+	}
 
-		if (!$num) {
-			$db->free($result);
+	if ($action == 'add_customer_price') {
+		// Form to add a new customer price
+		$maxpricesupplier = $object->min_recommended_price();
 
-			// Il doit au moins y avoir la ligne de prix initial.
-			// On l'ajoute donc pour remettre a niveau (pb vieilles versions)
-			// We emulate the change of the price from interface with the same value than the one into table llx_product
-			if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
-				$ret = $object->updatePrice(($object->multiprices_base_type[1] == 'TTC' ? $object->multiprices_ttc[1] : $object->multiprices[1]), $object->multiprices_base_type[1], $user, (empty($object->multiprices_tva_tx[1]) ? 0 : $object->multiprices_tva_tx[1]), ($object->multiprices_base_type[1] == 'TTC' ? $object->multiprices_min_ttc[1] : $object->multiprices_min[1]), 1);
-			} else {
-				$ret = $object->updatePrice(($object->price_base_type == 'TTC' ? $object->price_ttc : $object->price), $object->price_base_type, $user, $object->tva_tx, ($object->price_base_type == 'TTC' ? $object->price_min_ttc : $object->price_min));
-			}
+		print '<!-- add_customer_price -->';
+		print load_fiche_titre($langs->trans('AddCustomerPrice'));
 
-			if ($ret < 0) {
-				dol_print_error($db, $object->error, $object->errors);
-			} else {
-				$result = $db->query($sql);
-				$num = $db->num_rows($result);
-			}
-		}
+		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="add_customer_price_confirm">';
+		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-		if ($num > 0) {
-			// Default prices or
-			// Log of previous customer prices
-			$backbutton = '<a class="justalink" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">'.$langs->trans("Back").'</a>';
+		print '<div class="tabBar tabBarWithBottom">';
 
-			if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
-				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition, PhanPluginSuspiciousParamOrder
-				print_barre_liste($langs->trans("DefaultPriceLog"), 0, $_SERVER["PHP_SELF"], '', '', '', $backbutton, 0, $num, 'title_accountancy.png');
-			} else {
-				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition, PhanPluginSuspiciousParamOrder
-				print_barre_liste($langs->trans("PriceByCustomerLog"), 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, $num, 'title_accountancy.png');
-			}
+		print '<table class="border centpercent">';
+		print '<tr>';
+		print '<td class="fieldrequired">'.$langs->trans('ThirdParty').'</td>';
+		print '<td>';
+		$filter = '(s.client:IN:1,2,3)';
+		print img_picto('', 'company').$form->select_company('', 'socid', $filter, 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
+		print '</td>';
+		print '</tr>';
 
-			print '<!-- List of log prices -->'."\n";
-			print '<div class="div-table-responsive">'."\n";
-			print '<table class="liste centpercent">'."\n";
+		// Ref. Customer
+		print '<tr><td>' . $langs->trans('RefCustomer') . '</td>';
+		print '<td><input name="ref_customer" size="12"></td></tr>';
 
-			print '<tr class="liste_titre">';
-			print '<td>'.$langs->trans("AppliedPricesFrom").'</td>';
+		// VAT
+		print '<tr><td class="fieldrequired">'.$langs->trans("DefaultTaxRate").'</td><td>';
+		print $form->load_tva("tva_tx", $object->default_vat_code ? $object->tva_tx.' ('.$object->default_vat_code.')' : $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr, $object->type, false, 1);
+		print '</td></tr>';
 
-			if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
-				print '<td class="center">'.$langs->trans("PriceLevel").'</td>';
-			}
-			if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
-				print '<td class="center">'.$langs->trans("Type").'</td>';
-			}
+		// Price base
+		print '<tr><td class="fieldrequired">';
+		print $langs->trans('PriceBase');
+		print '</td>';
+		print '<td>';
+		print $form->selectPriceBaseType($object->price_base_type, "price_base_type");
+		print '</td>';
+		print '</tr>';
 
-			print '<td class="center">'.$langs->trans("PriceBase").'</td>';
-			if (!getDolGlobalString('PRODUIT_MULTIPRICES') && !getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
-				print '<td class="right">'.$langs->trans("DefaultTaxRate").'</td>';
-			}
-			print '<td class="right">'.$langs->trans("HT").'</td>';
-			print '<td class="right">'.$langs->trans("TTC").'</td>';
-			if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") {
-				print '<td class="right">'.$langs->trans("INCT").'</td>';
-			}
-			if (!empty($conf->dynamicprices->enabled)) {
-				print '<td class="right">'.$langs->trans("PriceExpressionSelected").'</td>';
-			}
-			print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
-			print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
-			print '<td class="right">'.$langs->trans("Label").'</td>';
-			print '<td class="right">'.$langs->trans("ChangedBy").'</td>';
-			if ($user->hasRight('produit', 'supprimer')) {
-				print '<td class="right">&nbsp;</td>';
-			}
-			print '</tr>';
+		// Price
+		print '<tr><td class="fieldrequired">';
+		$text = $langs->trans('SellingPrice');
+		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
+		print '</td><td>';
+		if ($object->price_base_type == 'TTC') {
+			print '<input name="price" size="10" value="'.price($object->price_ttc).'">';
+		} else {
+			print '<input name="price" size="10" value="'.price($object->price).'">';
+		}
+		print '</td></tr>';
 
-			$notfirstlineforlevel = array();
+		// Price minimum
+		print '<tr><td>';
+		$text = $langs->trans('MinPrice');
+		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
+		if ($object->price_base_type == 'TTC') {
+			print '<td><input name="price_min" size="10" value="'.price($object->price_min_ttc).'">';
+		} else {
+			print '<td><input name="price_min" size="10" value="'.price($object->price_min).'">';
+		}
+		if (getDolGlobalString('PRODUCT_MINIMUM_RECOMMENDED_PRICE')) {
+			print '<td class="left">'.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier, 0, '', 1, -1, -1, 'auto')).' '.img_warning().'</td>';
+		}
+		print '</td></tr>';
 
-			$i = 0;
-			while ($i < $num) {
-				$objp = $db->fetch_object($result);
+		// Price Label
+		print '<tr><td>';
+		print $langs->trans('PriceLabel');
+		print '</td><td>';
+		print '<input name="price_label" maxlength="255" class="minwidth300 maxwidth400onsmartphone" value="'.$object->price_label.'">';
+		print '</td>';
+		print '</tr>';
 
-				print '<tr class="oddeven">';
-				// Date
-				print "<td>".dol_print_date($db->jdate($objp->dp), "dayhour", 'tzuserrel')."</td>";
+		print '</table>';
 
-				// Price level
-				if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
-					print '<td class="center">'.$objp->price_level."</td>";
-				}
-				// Price by quantity
-				if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
-					$type = ($objp->price_by_qty == 1) ? 'PriceByQuantity' : 'Standard';
-					print '<td class="center">'.$langs->trans($type)."</td>";
-				}
+		print '</div>';
 
-				print '<td class="center">';
-				if (empty($objp->price_by_qty)) {
-					print $langs->trans($objp->price_base_type);
-				}
-				print "</td>";
 
-				if (!getDolGlobalString('PRODUIT_MULTIPRICES') && !getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
-					print '<td class="right">';
+		print '<div class="center">';
 
-					if (empty($objp->price_by_qty)) {
-						$positiverates = '';
-						if (price2num($objp->tva_tx)) {
-							$positiverates .= ($positiverates ? '/' : '').price2num($objp->tva_tx);
-						}
-						if (price2num($objp->localtax1_type)) {
-							$positiverates .= ($positiverates ? '/' : '').price2num($objp->localtax1_tx);
-						}
-						if (price2num($objp->localtax2_type)) {
-							$positiverates .= ($positiverates ? '/' : '').price2num($objp->localtax2_tx);
-						}
-						if (empty($positiverates)) {
-							$positiverates = '0';
-						}
-						echo vatrate($positiverates.($objp->default_vat_code ? ' ('.$objp->default_vat_code.')' : ''), '%', !empty($objp->tva_npr) ? $objp->tva_npr : 0);
-						/*
-						if ($objp->default_vat_code)
-						{
-							print vatrate($objp->tva_tx, true) . ' ('.$objp->default_vat_code.')';
-						}
-						else print vatrate($objp->tva_tx, true, $objp->recuperableonly);*/
-					}
+		// Update all child soc
+		print '<div class="marginbottomonly">';
+		print '<input type="checkbox" name="updatechildprice" id="updatechildprice" value="1"> ';
+		print '<label for="updatechildprice">'.$langs->trans('ForceUpdateChildPriceSoc').'</label>';
+		print '</div>';
 
-					print "</td>";
-				}
+		print $form->buttonsSaveCancel();
 
-				// Line for default price
-				if ($objp->price_base_type == 'HT') {
-					$pu = $objp->price;
-				} else {
-					$pu = $objp->price_ttc;
-				}
+		print '</form>';
+	} elseif ($action == 'edit_customer_price') {
+		// Edit mode
+		$maxpricesupplier = $object->min_recommended_price();
 
-				// Local tax was not saved into table llx_product on old version. So we will use value linked to VAT code.
-				$localtaxarray = getLocalTaxesFromRate($objp->tva_tx.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), 0, $mysoc, $mysoc);
-				// Define part of HT, VAT, TTC
-				$resultarray = calcul_price_total(1, $pu, 0, $objp->tva_tx, 1, 1, 0, $objp->price_base_type, $objp->recuperableonly, $object->type, $mysoc, $localtaxarray);
-				// Calcul du total ht sans remise
-				$total_ht = $resultarray[0];
-				$total_vat = $resultarray[1];
-				$total_localtax1 = $resultarray[9];
-				$total_localtax2 = $resultarray[10];
-				$total_ttc = $resultarray[2];
-
-				// Price
-				if (!empty($objp->fk_price_expression) && !empty($conf->dynamicprices->enabled)) {
-					$price_expression = new PriceExpression($db);
-					$res = $price_expression->fetch($objp->fk_price_expression);
-					$title = $price_expression->title;
-					print '<td class="right"></td>';
-					print '<td class="right"></td>';
-					if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") {
-						print '<td class="right"></td>';
-					}
-					print '<td class="right">'.$title."</td>";
-				} else {
-					// Price HT
-					print '<td class="right">';
-					if (empty($objp->price_by_qty)) {
-						print '<span class="amount">'.price($objp->price).'</span>';
-					}
-					print "</td>";
-					// Price TTC
-					print '<td class="right">';
-					if (empty($objp->price_by_qty)) {
-						$price_ttc = $objp->price_ttc;
-						print '<span class="amount">'.price($price_ttc).'<span>';
-					}
-					print "</td>";
-					if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") {
-						print '<td class="right">';
-						print $resultarray[2];
-						print '</td>';
-					}
-					if (!empty($conf->dynamicprices->enabled)) { //Only if module is enabled
-						print '<td class="right"></td>';
-					}
-				}
-
-				// Price min
-				print '<td class="right">';
-				if (empty($objp->price_by_qty)) {
-					print price($objp->price_min);
-				}
-				print '</td>';
-
-				// Price min inc tax
-				print '<td class="right">';
-				if (empty($objp->price_by_qty)) {
-					$price_min_ttc = $objp->price_min_ttc;
-					print price($price_min_ttc);
-				}
-				print '</td>';
-
-				// Price Label
-				print '<td class="right">';
-				print $objp->price_label;
-				print '</td>';
-
-				// User
-				print '<td class="right">';
-				if ($objp->user_id > 0) {
-					$userstatic = new User($db);
-					$userstatic->fetch($objp->user_id);
-					print $userstatic->getNomUrl(1, '', 0, 0, 24, 0, 'login');
-				}
-				print '</td>';
-
-
-				// Action
-				if ($user->hasRight('produit', 'supprimer')) {
-					$candelete = 0;
-					if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
-						if (empty($notfirstlineforlevel[$objp->price_level])) {
-							$notfirstlineforlevel[$objp->price_level] = 1;
-						} else {
-							$candelete = 1;
-						}
-					} elseif ($i > 0) {
-						$candelete = 1;
-					}
-
-					print '<td class="right">';
-					if ($candelete || ($db->jdate($objp->dp) >= dol_now())) {		// Test on date is to be able to delete a corrupted record with a date in future
-						print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'&lineid='.$objp->rowid.'">';
-						print img_delete();
-						print '</a>';
-					} else {
-						print '&nbsp;'; // Can not delete last price (it's current price)
-					}
-					print '</td>';
-				}
-
-				print "</tr>\n";
-				$i++;
-			}
-
-			$db->free($result);
-			print "</table>";
-			print '</div>';
-			print "<br>";
-		}
-
-		print '</div>';
-	} else {
-		dol_print_error($db);
-	}
-}
-
-
-// Add area to show/add/edit a price for a dedicated customer
-if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
-	$prodcustprice = new ProductCustomerPrice($db);
-
-	$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
-	$sortfield = GETPOST('sortfield', 'aZ09comma');
-	$sortorder = GETPOST('sortorder', 'aZ09comma');
-	$page = (GETPOSTINT("page") ? GETPOSTINT("page") : 0);
-	if (empty($page) || $page == -1) {
-		$page = 0;
-	}     // If $page is not defined, or '' or -1
-	$offset = $limit * $page;
-	$pageprev = $page - 1;
-	$pagenext = $page + 1;
-	if (!$sortorder) {
-		$sortorder = "ASC";
-	}
-	if (!$sortfield) {
-		$sortfield = "soc.nom";
-	}
-
-	// Build filter to display only concerned lines
-	$filter = array('t.fk_product' => $object->id);
-
-	if (!empty($search_soc)) {
-		$filter['soc.nom'] = $search_soc;
-	}
-
-	if ($action == 'add_customer_price') {
-		// Form to add a new customer price
-		$maxpricesupplier = $object->min_recommended_price();
-
-		print '<!-- add_customer_price -->';
-		print load_fiche_titre($langs->trans('AddCustomerPrice'));
-
-		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="action" value="add_customer_price_confirm">';
-		print '<input type="hidden" name="id" value="'.$object->id.'">';
-
-		print '<div class="tabBar tabBarWithBottom">';
-
-		print '<table class="border centpercent">';
-		print '<tr>';
-		print '<td class="fieldrequired">'.$langs->trans('ThirdParty').'</td>';
-		print '<td>';
-		$filter = '(s.client:IN:1,2,3)';
-		print img_picto('', 'company').$form->select_company('', 'socid', $filter, 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
-		print '</td>';
-		print '</tr>';
-
-		// Ref. Customer
-		print '<tr><td>' . $langs->trans('RefCustomer') . '</td>';
-		print '<td><input name="ref_customer" size="12"></td></tr>';
-
-		// VAT
-		print '<tr><td class="fieldrequired">'.$langs->trans("DefaultTaxRate").'</td><td>';
-		print $form->load_tva("tva_tx", $object->default_vat_code ? $object->tva_tx.' ('.$object->default_vat_code.')' : $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr, $object->type, false, 1);
-		print '</td></tr>';
-
-		// Price base
-		print '<tr><td class="fieldrequired">';
-		print $langs->trans('PriceBase');
-		print '</td>';
-		print '<td>';
-		print $form->selectPriceBaseType($object->price_base_type, "price_base_type");
-		print '</td>';
-		print '</tr>';
-
-		// Price
-		print '<tr><td class="fieldrequired">';
-		$text = $langs->trans('SellingPrice');
-		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
-		print '</td><td>';
-		if ($object->price_base_type == 'TTC') {
-			print '<input name="price" size="10" value="'.price($object->price_ttc).'">';
-		} else {
-			print '<input name="price" size="10" value="'.price($object->price).'">';
-		}
-		print '</td></tr>';
-
-		// Price minimum
-		print '<tr><td>';
-		$text = $langs->trans('MinPrice');
-		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
-		if ($object->price_base_type == 'TTC') {
-			print '<td><input name="price_min" size="10" value="'.price($object->price_min_ttc).'">';
-		} else {
-			print '<td><input name="price_min" size="10" value="'.price($object->price_min).'">';
-		}
-		if (getDolGlobalString('PRODUCT_MINIMUM_RECOMMENDED_PRICE')) {
-			print '<td class="left">'.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier, 0, '', 1, -1, -1, 'auto')).' '.img_warning().'</td>';
-		}
-		print '</td></tr>';
-
-		// Price Label
-		print '<tr><td>';
-		print $langs->trans('PriceLabel');
-		print '</td><td>';
-		print '<input name="price_label" maxlength="255" class="minwidth300 maxwidth400onsmartphone" value="'.$object->price_label.'">';
-		print '</td>';
-		print '</tr>';
-
-		print '</table>';
-
-		print '</div>';
-
-
-		print '<div class="center">';
-
-		// Update all child soc
-		print '<div class="marginbottomonly">';
-		print '<input type="checkbox" name="updatechildprice" id="updatechildprice" value="1"> ';
-		print '<label for="updatechildprice">'.$langs->trans('ForceUpdateChildPriceSoc').'</label>';
-		print '</div>';
-
-		print $form->buttonsSaveCancel();
-
-		print '</form>';
-	} elseif ($action == 'edit_customer_price') {
-		// Edit mode
-		$maxpricesupplier = $object->min_recommended_price();
-
-		print '<!-- edit_customer_price -->';
-		print load_fiche_titre($langs->trans('PriceByCustomer'));
+		print '<!-- edit_customer_price -->';
+		print load_fiche_titre($langs->trans('PriceByCustomer'));
 
 		$result = $prodcustprice->fetch(GETPOSTINT('lineid'));
 		if ($result < 0) {
@@ -2299,7 +2052,7 @@ function on_change() {
 		} else {
 			print $langs->trans('None');
 		}
-	} elseif ($action != 'showlog_default_price' && $action != 'edit_price') {
+	} elseif ($action != 'showlog_default_price' && $action != 'edit_price' && $action != 'edit_level_price') {
 		// List of all prices by customers
 		print '<!-- list of all prices per customer -->'."\n";
 
@@ -2535,6 +2288,277 @@ function on_change() {
 	}
 }
 
+// List of price changes - log historic (ordered by descending date)
+
+if ((!getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || $action == 'showlog_default_price') && !in_array($action, array('edit_price', 'edit_level_price', 'edit_vat'))) {
+	$sql = "SELECT p.rowid, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.default_vat_code, p.recuperableonly, p.localtax1_tx, p.localtax1_type, p.localtax2_tx, p.localtax2_type,";
+	$sql .= " p.price_level, p.price_min, p.price_min_ttc,p.price_by_qty,";
+	$sql .= " p.date_price as dp, p.fk_price_expression, u.rowid as user_id, u.login";
+	$sql .= " ,p.price_label";
+	$sql .= " FROM ".MAIN_DB_PREFIX."product_price as p,";
+	$sql .= " ".MAIN_DB_PREFIX."user as u";
+	$sql .= " WHERE fk_product = ".((int) $object->id);
+	$sql .= " AND p.entity IN (".getEntity('productprice').")";
+	$sql .= " AND p.fk_user_author = u.rowid";
+	if (!empty($socid) && (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES'))) {
+		$sql .= " AND p.price_level = ".((int) $soc->price_level);
+	}
+	$sql .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
+	// $sql .= $db->plimit();
+	//print $sql;
+
+	$result = $db->query($sql);
+	if ($result) {
+		print '<div class="divlogofpreviouscustomerprice">';
+
+		$num = $db->num_rows($result);
+
+		if (!$num) {
+			$db->free($result);
+
+			// Il doit au moins y avoir la ligne de prix initial.
+			// On l'ajoute donc pour remettre a niveau (pb vieilles versions)
+			// We emulate the change of the price from interface with the same value than the one into table llx_product
+			if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
+				$ret = $object->updatePrice(($object->multiprices_base_type[1] == 'TTC' ? $object->multiprices_ttc[1] : $object->multiprices[1]), $object->multiprices_base_type[1], $user, (empty($object->multiprices_tva_tx[1]) ? 0 : $object->multiprices_tva_tx[1]), ($object->multiprices_base_type[1] == 'TTC' ? $object->multiprices_min_ttc[1] : $object->multiprices_min[1]), 1);
+			} else {
+				$ret = $object->updatePrice(($object->price_base_type == 'TTC' ? $object->price_ttc : $object->price), $object->price_base_type, $user, $object->tva_tx, ($object->price_base_type == 'TTC' ? $object->price_min_ttc : $object->price_min));
+			}
+
+			if ($ret < 0) {
+				dol_print_error($db, $object->error, $object->errors);
+			} else {
+				$result = $db->query($sql);
+				$num = $db->num_rows($result);
+			}
+		}
+
+		if ($num > 0) {
+			// Default prices or
+			// Log of previous customer prices
+			$backbutton = '<a class="justalink" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">'.$langs->trans("Back").'</a>';
+
+			if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition, PhanPluginSuspiciousParamOrder
+				print_barre_liste($langs->trans("DefaultPriceLog"), 0, $_SERVER["PHP_SELF"], '', '', '', $backbutton, 0, $num, 'title_accountancy.png');
+			} else {
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition, PhanPluginSuspiciousParamOrder
+				print_barre_liste($langs->trans("PriceByCustomerLog"), 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, $num, 'title_accountancy.png');
+			}
+
+			print '<!-- List of log prices -->'."\n";
+			print '<div class="div-table-responsive">'."\n";
+			print '<table class="liste centpercent">'."\n";
+
+			print '<tr class="liste_titre">';
+			print '<td>'.$langs->trans("AppliedPricesFrom").'</td>';
+
+			if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
+				print '<td class="center">'.$langs->trans("PriceLevel").'</td>';
+			}
+			if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
+				print '<td class="center">'.$langs->trans("Type").'</td>';
+			}
+
+			print '<td class="center">'.$langs->trans("PriceBase").'</td>';
+			if (!getDolGlobalString('PRODUIT_MULTIPRICES') && !getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
+				print '<td class="right">'.$langs->trans("DefaultTaxRate").'</td>';
+			}
+			print '<td class="right">'.$langs->trans("HT").'</td>';
+			print '<td class="right">'.$langs->trans("TTC").'</td>';
+			if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") {
+				print '<td class="right">'.$langs->trans("INCT").'</td>';
+			}
+			if (!empty($conf->dynamicprices->enabled)) {
+				print '<td class="right">'.$langs->trans("PriceExpressionSelected").'</td>';
+			}
+			print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
+			print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
+			print '<td class="right">'.$langs->trans("Label").'</td>';
+			print '<td class="right">'.$langs->trans("ChangedBy").'</td>';
+			if ($user->hasRight('produit', 'supprimer')) {
+				print '<td class="right">&nbsp;</td>';
+			}
+			print '</tr>';
+
+			$notfirstlineforlevel = array();
+
+			$i = 0;
+			while ($i < $num) {
+				$objp = $db->fetch_object($result);
+
+				print '<tr class="oddeven">';
+				// Date
+				print "<td>".dol_print_date($db->jdate($objp->dp), "dayhour", 'tzuserrel')."</td>";
+
+				// Price level
+				if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
+					print '<td class="center">'.$objp->price_level."</td>";
+				}
+				// Price by quantity
+				if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
+					$type = ($objp->price_by_qty == 1) ? 'PriceByQuantity' : 'Standard';
+					print '<td class="center">'.$langs->trans($type)."</td>";
+				}
+
+				print '<td class="center">';
+				if (empty($objp->price_by_qty)) {
+					print $langs->trans($objp->price_base_type);
+				}
+				print "</td>";
+
+				if (!getDolGlobalString('PRODUIT_MULTIPRICES') && !getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
+					print '<td class="right">';
+
+					if (empty($objp->price_by_qty)) {
+						$positiverates = '';
+						if (price2num($objp->tva_tx)) {
+							$positiverates .= ($positiverates ? '/' : '').price2num($objp->tva_tx);
+						}
+						if (price2num($objp->localtax1_type)) {
+							$positiverates .= ($positiverates ? '/' : '').price2num($objp->localtax1_tx);
+						}
+						if (price2num($objp->localtax2_type)) {
+							$positiverates .= ($positiverates ? '/' : '').price2num($objp->localtax2_tx);
+						}
+						if (empty($positiverates)) {
+							$positiverates = '0';
+						}
+						echo vatrate($positiverates.($objp->default_vat_code ? ' ('.$objp->default_vat_code.')' : ''), '%', !empty($objp->tva_npr) ? $objp->tva_npr : 0);
+						/*
+						if ($objp->default_vat_code)
+						{
+							print vatrate($objp->tva_tx, true) . ' ('.$objp->default_vat_code.')';
+						}
+						else print vatrate($objp->tva_tx, true, $objp->recuperableonly);*/
+					}
+
+					print "</td>";
+				}
+
+				// Line for default price
+				if ($objp->price_base_type == 'HT') {
+					$pu = $objp->price;
+				} else {
+					$pu = $objp->price_ttc;
+				}
+
+				// Local tax was not saved into table llx_product on old version. So we will use value linked to VAT code.
+				$localtaxarray = getLocalTaxesFromRate($objp->tva_tx.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), 0, $mysoc, $mysoc);
+				// Define part of HT, VAT, TTC
+				$resultarray = calcul_price_total(1, $pu, 0, $objp->tva_tx, 1, 1, 0, $objp->price_base_type, $objp->recuperableonly, $object->type, $mysoc, $localtaxarray);
+				// Calcul du total ht sans remise
+				$total_ht = $resultarray[0];
+				$total_vat = $resultarray[1];
+				$total_localtax1 = $resultarray[9];
+				$total_localtax2 = $resultarray[10];
+				$total_ttc = $resultarray[2];
+
+				// Price
+				if (!empty($objp->fk_price_expression) && !empty($conf->dynamicprices->enabled)) {
+					$price_expression = new PriceExpression($db);
+					$res = $price_expression->fetch($objp->fk_price_expression);
+					$title = $price_expression->title;
+					print '<td class="right"></td>';
+					print '<td class="right"></td>';
+					if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") {
+						print '<td class="right"></td>';
+					}
+					print '<td class="right">'.$title."</td>";
+				} else {
+					// Price HT
+					print '<td class="right">';
+					if (empty($objp->price_by_qty)) {
+						print '<span class="amount">'.price($objp->price).'</span>';
+					}
+					print "</td>";
+					// Price TTC
+					print '<td class="right">';
+					if (empty($objp->price_by_qty)) {
+						$price_ttc = $objp->price_ttc;
+						print '<span class="amount">'.price($price_ttc).'<span>';
+					}
+					print "</td>";
+					if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") {
+						print '<td class="right">';
+						print $resultarray[2];
+						print '</td>';
+					}
+					if (!empty($conf->dynamicprices->enabled)) { //Only if module is enabled
+						print '<td class="right"></td>';
+					}
+				}
+
+				// Price min
+				print '<td class="right">';
+				if (empty($objp->price_by_qty)) {
+					print price($objp->price_min);
+				}
+				print '</td>';
+
+				// Price min inc tax
+				print '<td class="right">';
+				if (empty($objp->price_by_qty)) {
+					$price_min_ttc = $objp->price_min_ttc;
+					print price($price_min_ttc);
+				}
+				print '</td>';
+
+				// Price Label
+				print '<td class="right">';
+				print $objp->price_label;
+				print '</td>';
+
+				// User
+				print '<td class="right">';
+				if ($objp->user_id > 0) {
+					$userstatic = new User($db);
+					$userstatic->fetch($objp->user_id);
+					print $userstatic->getNomUrl(1, '', 0, 0, 24, 0, 'login');
+				}
+				print '</td>';
+
+
+				// Action
+				if ($user->hasRight('produit', 'supprimer')) {
+					$candelete = 0;
+					if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
+						if (empty($notfirstlineforlevel[$objp->price_level])) {
+							$notfirstlineforlevel[$objp->price_level] = 1;
+						} else {
+							$candelete = 1;
+						}
+					} elseif ($i > 0) {
+						$candelete = 1;
+					}
+
+					print '<td class="right">';
+					if ($candelete || ($db->jdate($objp->dp) >= dol_now())) {		// Test on date is to be able to delete a corrupted record with a date in future
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'&lineid='.$objp->rowid.'">';
+						print img_delete();
+						print '</a>';
+					} else {
+						print '&nbsp;'; // Can not delete last price (it's current price)
+					}
+					print '</td>';
+				}
+
+				print "</tr>\n";
+				$i++;
+			}
+
+			$db->free($result);
+			print "</table>";
+			print '</div>';
+			print "<br>";
+		}
+
+		print '</div>';
+	} else {
+		dol_print_error($db);
+	}
+}
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 9dee94ac0a796..ebf351e26fbb5 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -246,7 +246,7 @@ class Societe extends CommonObject
 		'localtax2_value' => array('type' => 'double(6,3)', 'label' => 'Localtax2 value', 'enabled' => 1, 'visible' => -1, 'position' => 355),
 		'vat_reverse_charge' => array('type' => 'tinyint(4)', 'label' => 'Vat reverse charge', 'enabled' => 1, 'visible' => -1, 'position' => 335),
 		'barcode' => array('type' => 'varchar(255)', 'label' => 'Barcode', 'enabled' => 1, 'visible' => -1, 'position' => 360),
-		'price_level' => array('type' => 'integer', 'label' => 'Price level', 'enabled' => '$conf->global->PRODUIT_MULTIPRICES || getDolGlobalString("PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES")', 'visible' => -1, 'position' => 365),
+		'price_level' => array('type' => 'integer', 'label' => 'Price level', 'enabled' => '$conf->global->PRODUIT_MULTIPRICES || getDolGlobalString("PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES") || getDolGlobalString("PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES")', 'visible' => -1, 'position' => 365),
 		'default_lang' => array('type' => 'varchar(6)', 'label' => 'Default lang', 'enabled' => 1, 'visible' => -1, 'position' => 370),
 		'canvas' => array('type' => 'varchar(32)', 'label' => 'Canvas', 'enabled' => 1, 'visible' => -1, 'position' => 375),
 		'fk_barcode_type' => array('type' => 'integer', 'label' => 'Fk barcode type', 'enabled' => 1, 'visible' => -1, 'position' => 405),
@@ -2134,7 +2134,7 @@ public function fetch($rowid, $ref = '', $ref_ext = '', $barcode = '', $idprof1
 		}
 
 		// Use first price level if level not defined for third party
-		if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) && empty($this->price_level)) {
+		if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) && empty($this->price_level)) {
 			$this->price_level = 1;
 		}
 
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index dfde30e9ca3e9..1c0b29593dea9 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -307,7 +307,7 @@
 	's.status' => array('label' => "Status", 'checked' => 1, 'position' => 1000),
 	's.import_key' => array('label' => "ImportId", 'checked' => 0, 'position' => 1100),
 );
-if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
+if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 	$arrayfields['s.price_level'] = array('label' => "PriceLevel", 'position' => 30, 'checked' => 0);
 }
 
@@ -1140,7 +1140,7 @@
 	}
 }
 
-if ($contextpage == 'poslist' && $type == 't' && (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'))) {
+if ($contextpage == 'poslist' && $type == 't' && (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES'))) {
 	print get_htmloutput_mesg(img_warning('default').' '.$langs->trans("BecarefullChangeThirdpartyBeforeAddProductToInvoice"), '', 'warning', 1);
 }
 
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 82eae2fb9b6f3..653976705a154 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -36,7 +36,7 @@
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
-if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
+if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
 	$prodcustprice = new ProductCustomerPrice($db);
@@ -258,7 +258,7 @@
 
 
 
-if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
+if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 	$prodcustprice = new ProductCustomerPrice($db);
 
 	$sortfield = GETPOST('sortfield', 'aZ09comma');

From 7c9131723afdeabb352972e0c46a199a9a14f6e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina=20JOUM?= <melina.joum@altairis.fr>
Date: Thu, 19 Sep 2024 17:07:12 +0200
Subject: [PATCH 2/8] NEW: translation

---
 htdocs/langs/en_US/products.lang | 1 +
 htdocs/langs/fr_FR/products.lang | 1 +
 2 files changed, 2 insertions(+)

diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 7181b24d39b76..0b8825cf058b3 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -437,3 +437,4 @@ AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtu
 ConfirmSetToDraftInventory=Are you sure you want to go back to Draft status?<br>The quantities currently set in the inventory will be reset.
 WarningLineProductNotToSell=Product or service "%s" is not to sell and was cloned
 PriceLabel=Price label
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 3a1c8f85c41fe..dc4f4dce330d3 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -437,3 +437,4 @@ AllowStockMovementVariantParentHelp=Par défaut, un parent d'une variante est un
 ConfirmSetToDraftInventory=Êtes-vous sûr de vouloir revenir à l'état de brouillon ?<br>Les quantités actuellement définies dans l'inventaire seront réinitialisées.
 WarningLineProductNotToSell=Le produit ou le service "%s" n'est pas à vendre et a été cloné.
 PriceLabel=Libellé du prix
+PriceByCustomeAndMultiPricesAbility=Prix différents pour chaque client + Plusieurs niveaux de prix par produit/service (chaque client est dans un et un seul niveau)

From 9905a54b0e51c7fd93871bf7912dd1c5404abf2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina=20JOUM?= <melina.joum@altairis.fr>
Date: Thu, 19 Sep 2024 17:21:14 +0200
Subject: [PATCH 3/8] FIX: If a price per customer exist

---
 htdocs/comm/propal/card.php | 8 +++++++-
 htdocs/commande/card.php    | 5 ++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 867f60319f15e..bba10c8f9dd31 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1136,10 +1136,14 @@
 					require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 					$prodcustprice = new ProductCustomerPrice($db);
 					$filter = array('t.fk_product' => $prod->id, 't.fk_soc' => $object->thirdparty->id);
+
+					// If a price per customer exist
+					$pricebycustomerexist = false;
 					$result = $prodcustprice->fetchAll('', '', 0, 0, $filter);
 					if ($result) {
 						// If there is some prices specific to the customer
 						if (count($prodcustprice->lines) > 0) {
+							$pricebycustomerexist = true;
 							$pu_ht = price($prodcustprice->lines[0]->price);
 							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
 							$price_min =  price($prodcustprice->lines[0]->price_min);
@@ -1154,7 +1158,9 @@
 								$tva_npr = 0;
 							}*/
 						}
-					} elseif ($object->thirdparty->price_level) { // // If price per segment
+					}
+					
+					if ( !$pricebycustomerexist && $object->thirdparty->price_level) { // If price per segment
 						$pu_ht = $prod->multiprices[$object->thirdparty->price_level];
 						$pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
 						$price_min = $prod->multiprices_min[$object->thirdparty->price_level];
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 392bc0433af01..a17ce56581439 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -828,9 +828,12 @@
 
 					$filter = array('t.fk_product' => $prod->id, 't.fk_soc' => $object->thirdparty->id);
 
+					// If a price per customer exist
+					$pricebycustomerexist = false;
 					$result = $prodcustprice->fetchAll('', '', 0, 0, $filter);
 					if ($result >= 0) {
 						if (count($prodcustprice->lines) > 0) {
+							$pricebycustomerexist = true;
 							$pu_ht = price($prodcustprice->lines[0]->price);
 							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
 							$price_min =  price($prodcustprice->lines[0]->price_min);
@@ -849,7 +852,7 @@
 						setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
 					}
 
-					if (!empty($object->thirdparty->price_level)) { //// If price per segment
+					if ( !$pricebycustomerexist && !empty($object->thirdparty->price_level)) { //// If price per segment
 						$pu_ht = $prod->multiprices[$object->thirdparty->price_level];
 						$pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
 						$price_min = $prod->multiprices_min[$object->thirdparty->price_level];

From 4b44a9f62d1628d63b398f78a22e6b095e446178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina=20JOUM?= <melina.joum@altairis.fr>
Date: Fri, 20 Sep 2024 17:56:41 +0200
Subject: [PATCH 4/8] FIX: do not use default price if the customer price and
 level price option is active

---
 htdocs/product/card.php  |   2 +-
 htdocs/product/price.php | 114 ++++++++++++++++-----------------------
 2 files changed, 46 insertions(+), 70 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index eafcfbd81441f..31fc7eb4f1668 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1748,7 +1748,7 @@
 			print '<hr>';
 
 			if (!getDolGlobalString('PRODUCT_DISABLE_PRICES')) {
-				if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
+				if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 					// We do no show price array on create when multiprices enabled.
 					// We must set them on prices tab.
 					print '<table class="border centpercent">';
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 179a84bb2394e..c24e20b31a11f 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1059,32 +1059,6 @@
 			}
 			else print vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true);*/
 			print '</td></tr>';
-			if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
-				// Price
-				print '<tr class="field_selling_price"><td>'.$langs->trans("SellingPrice").'</td><td>';
-				if ($object->price_base_type == 'TTC') {
-					print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
-				} else {
-					print price($object->price).' '.$langs->trans($object->price_base_type);
-					if (getDolGlobalString('PRODUCT_DISPLAY_VAT_INCL_PRICES') && !empty($object->price_ttc)) {
-						print '<i class="opacitymedium"> - ' . price($object->price_ttc).' '.$langs->trans('TTC') . '</i>';
-					}
-				}
-
-				print '</td></tr>';
-
-				// Price minimum
-				print '<tr class="field_min_price"><td>'.$langs->trans("MinPrice").'</td><td>';
-				if ($object->price_base_type == 'TTC') {
-					print price($object->price_min_ttc).' '.$langs->trans($object->price_base_type);
-				} else {
-					print price($object->price_min).' '.$langs->trans($object->price_base_type);
-					if (getDolGlobalString('PRODUCT_DISPLAY_VAT_INCL_PRICES') && !empty($object->price_min_ttc)) {
-						print '<i class="opacitymedium"> - ' . price($object->price_min_ttc).' '.$langs->trans('TTC') . '</i>';
-					}
-				}
-				print '</td></tr>';
-			}
 		}
 		print '</table>';
 
@@ -2133,58 +2107,60 @@ function on_change() {
 		$total_localtax2 = $resultarray[10];
 		$total_ttc = $resultarray[2];
 
-		print '<tr class="oddeven">';
-		print '<td colspan="3">' . $langs->trans('Default') . '</td>';
+		if (!getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
+			print '<tr class="oddeven">';
+			print '<td colspan="3">' . $langs->trans('Default') . '</td>';
 
-		print '<td class="center">'.$langs->trans($object->price_base_type)."</td>";
+			print '<td class="center">'.$langs->trans($object->price_base_type)."</td>";
 
-		// VAT Rate
-		print '<td class="right">';
+			// VAT Rate
+			print '<td class="right">';
 
-		$positiverates = '';
-		if (price2num($object->tva_tx)) {
-			$positiverates .= ($positiverates ? '/' : '').price2num($object->tva_tx);
-		}
-		if (price2num($object->localtax1_type)) {
-			$positiverates .= ($positiverates ? '/' : '').price2num($object->localtax1_tx);
-		}
-		if (price2num($object->localtax2_type)) {
-			$positiverates .= ($positiverates ? '/' : '').price2num($object->localtax2_tx);
-		}
-		if (empty($positiverates)) {
-			$positiverates = '0';
-		}
-		echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
+			$positiverates = '';
+			if (price2num($object->tva_tx)) {
+				$positiverates .= ($positiverates ? '/' : '').price2num($object->tva_tx);
+			}
+			if (price2num($object->localtax1_type)) {
+				$positiverates .= ($positiverates ? '/' : '').price2num($object->localtax1_tx);
+			}
+			if (price2num($object->localtax2_type)) {
+				$positiverates .= ($positiverates ? '/' : '').price2num($object->localtax2_tx);
+			}
+			if (empty($positiverates)) {
+				$positiverates = '0';
+			}
+			echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
 
-		//print vatrate($object->tva_tx, true, $object->tva_npr);
-		//print $object->default_vat_code?' ('.$object->default_vat_code.')':'';
-		print "</td>";
+			//print vatrate($object->tva_tx, true, $object->tva_npr);
+			//print $object->default_vat_code?' ('.$object->default_vat_code.')':'';
+			print "</td>";
 
-		print '<td class="right"><span class="amount">'.price($object->price)."</span></td>";
+			print '<td class="right"><span class="amount">'.price($object->price)."</span></td>";
 
-		print '<td class="right"><span class="amount">'.price($object->price_ttc)."</span></td>";
-		if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") {
-			//print '<td class="right">' . price($object->price_ttc) . "</td>";
-			print '<td class="right"><span class="amount">'.price($resultarray[2]).'</span></td>';
-		}
+			print '<td class="right"><span class="amount">'.price($object->price_ttc)."</span></td>";
+			if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") {
+				//print '<td class="right">' . price($object->price_ttc) . "</td>";
+				print '<td class="right"><span class="amount">'.price($resultarray[2]).'</span></td>';
+			}
 
-		print '<td class="right">'.price($object->price_min).'</td>';
-		print '<td class="right">'.price($object->price_min_ttc).'</td>';
-		print '<td class="right">'.$object->price_label.'</td>';
-		print '<td class="right">';
-		print '</td>';
-		if ($user->hasRight('produit', 'supprimer') || $user->hasRight('service', 'supprimer')) {
-			print '<td class="nowraponall">';
-			print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=showlog_default_price&token='.newToken().'&id='.$object->id.'">';
-			print img_info($langs->trans('PriceByCustomerLog'));
-			print '</a>';
-			print ' ';
-			print '<a class="marginleftonly marginrightonly editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit_price&token='.newToken().'&id='.$object->id.'">';
-			print img_edit('default', 0, 'style="vertical-align: middle;"');
-			print '</a>';
+			print '<td class="right">'.price($object->price_min).'</td>';
+			print '<td class="right">'.price($object->price_min_ttc).'</td>';
+			print '<td class="right">'.$object->price_label.'</td>';
+			print '<td class="right">';
 			print '</td>';
+			if ($user->hasRight('produit', 'supprimer') || $user->hasRight('service', 'supprimer')) {
+				print '<td class="nowraponall">';
+				print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=showlog_default_price&token='.newToken().'&id='.$object->id.'">';
+				print img_info($langs->trans('PriceByCustomerLog'));
+				print '</a>';
+				print ' ';
+				print '<a class="marginleftonly marginrightonly editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit_price&token='.newToken().'&id='.$object->id.'">';
+				print img_edit('default', 0, 'style="vertical-align: middle;"');
+				print '</a>';
+				print '</td>';
+			}
+			print "</tr>\n";
 		}
-		print "</tr>\n";
 
 		if (count($prodcustprice->lines) > 0) {
 			foreach ($prodcustprice->lines as $line) {

From 2af9689577d476f75433165eb905612bda61dc07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina=20JOUM?= <melina.joum@altairis.fr>
Date: Mon, 23 Sep 2024 10:15:32 +0200
Subject: [PATCH 5/8] Don't display the price level amount if the customer
 price is known

---
 htdocs/core/class/html.form.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 2880d1644f5c6..85a3ef8486cf6 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3209,7 +3209,9 @@ public function select_produits_list($selected = 0, $htmlname = 'productid', $fi
 							$objp->price_ttc = price2num($objp->price_ttc, 'MU');
 						}
 					}
-
+					if (getDolGlobalInt('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES') && !empty($objp->custprice)) {
+						$price_level = '';
+					}
 					$this->constructProductListOption($objp, $opt, $optJson, $price_level, $selected, $hidepriceinlabel, $filterkey);
 					// Add new entry
 					// "key" value of json key array is used by jQuery automatically as selected value

From 06037946f361f8972e49740ec0b1464eb60de9f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Cendrier?= <noe.cendrier@altairis.fr>
Date: Mon, 23 Sep 2024 17:41:32 +0200
Subject: [PATCH 6/8] FIX: double check and php cs correction

---
 htdocs/comm/propal/card.php              |  2 +-
 htdocs/commande/class/commande.class.php |  2 +-
 htdocs/product/class/product.class.php   | 96 ++++++++++++------------
 htdocs/product/price.php                 | 30 ++++----
 4 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 7d78de25de617..18e118a614e78 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1165,7 +1165,7 @@
 							}*/
 						}
 					}
-					
+
 					if ( !$pricebycustomerexist && $object->thirdparty->price_level) { // If price per segment
 						$pu_ht = $prod->multiprices[$object->thirdparty->price_level];
 						$pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 8949dbe491d00..2cb788fae6314 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1800,7 +1800,7 @@ public function add_product($idproduct, $qty, $remise_percent = 0.0, $date_start
 			$localtax2_tx = get_localtax($tva_tx, 2, $this->thirdparty, $mysoc, $tva_npr);
 
 			// multiprix
-			if (($conf->global->PRODUIT_MULTIPRICES) && $this->thirdparty->price_level) {
+			if ($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level) {
 				$price = $prod->multiprices[$this->thirdparty->price_level];
 			} else {
 				$price = $prod->price;
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 30777be2cbb49..53431f38463d3 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2276,54 +2276,54 @@ public function getSellPrice($thirdparty_seller, $thirdparty_buyer, $pqp = 0)
 		$price_min = $this->price_min;
 		$price_base_type = $this->price_base_type;
 
-        // if price by customer / level
-        if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
-            require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
-
-            $prodcustprice = new ProductCustomerPrice($this->db);
-
-            $filter = array('t.fk_product' => $this->id, 't.fk_soc' => $thirdparty_buyer->id);
-
-            // If a price per customer exist
-            $pricebycustomerexist = false;
-            $result = $prodcustprice->fetchAll('', '', 0, 0, $filter);
-            if ($result) {
-                if (count($prodcustprice->lines) > 0) {
-                    $pricebycustomerexist = true;
-                    $pu_ht = price($prodcustprice->lines[0]->price);
-                    $price_min = price($prodcustprice->lines[0]->price_min);
-                    $pu_ttc = price($prodcustprice->lines[0]->price_ttc);
-                    $price_base_type = $prodcustprice->lines[0]->price_base_type;
-                    $tva_tx = $prodcustprice->lines[0]->tva_tx;
-                    if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
-                        $tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
-                    }
-                    $tva_npr = $prodcustprice->lines[0]->recuperableonly;
-                    if (empty($tva_tx)) {
-                        $tva_npr = 0;
-                    }
-                }
-            }
-
-            if ( !$pricebycustomerexist && !empty($thirdparty_buyer->price_level)) {
-                $pu_ht = $this->multiprices[$thirdparty_buyer->price_level];
-                $pu_ttc = $this->multiprices_ttc[$thirdparty_buyer->price_level];
-                $price_min = $this->multiprices_min[$thirdparty_buyer->price_level];
-                $price_base_type = $this->multiprices_base_type[$thirdparty_buyer->price_level];
-                if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) {
-                    // using this option is a bug. kept for backward compatibility
-                    if (isset($this->multiprices_tva_tx[$thirdparty_buyer->price_level])) {
-                        $tva_tx = $this->multiprices_tva_tx[$thirdparty_buyer->price_level];
-                    }
-                    if (isset($this->multiprices_recuperableonly[$thirdparty_buyer->price_level])) {
-                        $tva_npr = $this->multiprices_recuperableonly[$thirdparty_buyer->price_level];
-                    }
-                    if (empty($tva_tx)) {
-                        $tva_npr = 0;
-                    }
-                }
-            }
-        } elseif(getDolGlobalString('PRODUIT_MULTIPRICES') && !empty($thirdparty_buyer->price_level)) { // // If price per segment
+		// if price by customer / level
+		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
+			require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
+
+			$prodcustprice = new ProductCustomerPrice($this->db);
+
+			$filter = array('t.fk_product' => $this->id, 't.fk_soc' => $thirdparty_buyer->id);
+
+			// If a price per customer exist
+			$pricebycustomerexist = false;
+			$result = $prodcustprice->fetchAll('', '', 0, 0, $filter);
+			if ($result) {
+				if (count($prodcustprice->lines) > 0) {
+					$pricebycustomerexist = true;
+					$pu_ht = price($prodcustprice->lines[0]->price);
+					$price_min = price($prodcustprice->lines[0]->price_min);
+					$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
+					$price_base_type = $prodcustprice->lines[0]->price_base_type;
+					$tva_tx = $prodcustprice->lines[0]->tva_tx;
+					if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
+						$tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
+					}
+					$tva_npr = $prodcustprice->lines[0]->recuperableonly;
+					if (empty($tva_tx)) {
+						$tva_npr = 0;
+					}
+				}
+			}
+
+			if ( !$pricebycustomerexist && !empty($thirdparty_buyer->price_level)) {
+				$pu_ht = $this->multiprices[$thirdparty_buyer->price_level];
+				$pu_ttc = $this->multiprices_ttc[$thirdparty_buyer->price_level];
+				$price_min = $this->multiprices_min[$thirdparty_buyer->price_level];
+				$price_base_type = $this->multiprices_base_type[$thirdparty_buyer->price_level];
+				if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) {
+					// using this option is a bug. kept for backward compatibility
+					if (isset($this->multiprices_tva_tx[$thirdparty_buyer->price_level])) {
+						$tva_tx = $this->multiprices_tva_tx[$thirdparty_buyer->price_level];
+					}
+					if (isset($this->multiprices_recuperableonly[$thirdparty_buyer->price_level])) {
+						$tva_npr = $this->multiprices_recuperableonly[$thirdparty_buyer->price_level];
+					}
+					if (empty($tva_tx)) {
+						$tva_npr = 0;
+					}
+				}
+			}
+		} elseif (getDolGlobalString('PRODUIT_MULTIPRICES') && !empty($thirdparty_buyer->price_level)) { // // If price per segment
 			$pu_ht = $this->multiprices[$thirdparty_buyer->price_level];
 			$pu_ttc = $this->multiprices_ttc[$thirdparty_buyer->price_level];
 			$price_min = $this->multiprices_min[$thirdparty_buyer->price_level];
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 5c7b2eadb5d79..1d6df2a3a3e7d 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -76,7 +76,7 @@
 }
 
 // Clean param
-if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) && getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT')) {
+if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) && !getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT')) {
 	$conf->global->PRODUIT_MULTIPRICES_LIMIT = 5;
 }
 
@@ -2116,20 +2116,20 @@ function on_change() {
 			// VAT Rate
 			print '<td class="right">';
 
-		$positiverates = '';
-		if (price2num($object->tva_tx)) {
-			$positiverates .= ($positiverates ? '/' : '').price2num($object->tva_tx);
-		}
-		if (price2num($object->localtax1_type)) {
-			$positiverates .= ($positiverates ? '/' : '').price2num($object->localtax1_tx);
-		}
-		if (price2num($object->localtax2_type)) {
-			$positiverates .= ($positiverates ? '/' : '').price2num($object->localtax2_tx);
-		}
-		if (empty($positiverates)) {
-			$positiverates = '0';
-		}
-		echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), true, $object->tva_npr);
+			$positiverates = '';
+			if (price2num($object->tva_tx)) {
+				$positiverates .= ($positiverates ? '/' : '').price2num($object->tva_tx);
+			}
+			if (price2num($object->localtax1_type)) {
+				$positiverates .= ($positiverates ? '/' : '').price2num($object->localtax1_tx);
+			}
+			if (price2num($object->localtax2_type)) {
+				$positiverates .= ($positiverates ? '/' : '').price2num($object->localtax2_tx);
+			}
+			if (empty($positiverates)) {
+				$positiverates = '0';
+			}
+			echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), true, $object->tva_npr);
 
 			//print vatrate($object->tva_tx, true, $object->tva_npr);
 			//print $object->default_vat_code?' ('.$object->default_vat_code.')':'';

From e92015c2210ba4f7b531b19e258af5cc5dd853e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Cendrier?= <noe.cendrier@altairis.fr>
Date: Mon, 23 Sep 2024 17:56:06 +0200
Subject: [PATCH 7/8] FIX: vatrate call

---
 htdocs/product/price.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 1d6df2a3a3e7d..8e1bd9f562a48 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -2400,7 +2400,7 @@ function on_change() {
 						if (empty($positiverates)) {
 							$positiverates = '0';
 						}
-						echo vatrate($positiverates.($objp->default_vat_code ? ' ('.$objp->default_vat_code.')' : ''), '%', !empty($objp->tva_npr) ? $objp->tva_npr : 0);
+						echo vatrate($positiverates.($objp->default_vat_code ? ' ('.$objp->default_vat_code.')' : ''), true, !empty($objp->tva_npr) ? $objp->tva_npr : 0);
 						/*
 						if ($objp->default_vat_code)
 						{

From 3749c03c00042447c457ac84bc0196e328929400 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Cendrier?= <noe.cendrier@altairis.fr>
Date: Mon, 23 Sep 2024 18:05:36 +0200
Subject: [PATCH 8/8] FIX: get_htmloutput_msg call

---
 htdocs/societe/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index bb0c2dbc29974..74a7ee9cab5a7 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -1144,7 +1144,7 @@
 }
 
 if ($contextpage == 'poslist' && $type == 't' && (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES'))) {
-	print get_htmloutput_mesg(img_warning('default').' '.$langs->trans("BecarefullChangeThirdpartyBeforeAddProductToInvoice"), '', 'warning', 1);
+	print get_htmloutput_mesg(img_warning('default').' '.$langs->trans("BecarefullChangeThirdpartyBeforeAddProductToInvoice"), [], 'warning', 1);
 }
 
 // Show the new button only when this page is not opend from the Extended POS (pop-up window)