diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index e8dc595c6c3..c3575ae249b 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -21,10 +21,11 @@
  */
 
 /**
- * \file htdocs/societe/price.php
+ * \file    htdocs/societe/price.php
  * \ingroup product
- * \brief Page to show product prices by customer
+ * \brief   Page to show product prices by customer
  */
+
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
@@ -42,7 +43,8 @@ $langs->load("companies");
 $langs->load("bills");
 
 $action = GETPOST('action', 'alpha');
-$search_prod = GETPOST('search_prod');
+$search_prod = GETPOST('search_prod','alpha');
+$cancel = GETPOST('cancel','alpha');
 
 // Security check
 $socid = GETPOST('socid', 'int')?GETPOST('socid', 'int'):GETPOST('id', 'int');
@@ -71,36 +73,72 @@ if (empty($reshook))
     {
         $search_prod = '';
     }
-    
-    if ($action == 'add_customer_price_confirm' && ! $_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {
-    
+
+    if ($action == 'add_customer_price_confirm' && ! $cancel && ($user->rights->produit->creer || $user->rights->service->creer)) {
+
     	$update_child_soc = GETPOST('updatechildprice');
-    
+
     	// add price by customer
     	$prodcustprice->fk_soc = $socid;
     	$prodcustprice->fk_product = GETPOST('prodid', 'int');
     	$prodcustprice->price = price2num(GETPOST("price"), 'MU');
     	$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
     	$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
-    	$prodcustprice->tva_tx = str_replace('*', '', GETPOST("tva_tx"));
-    	$prodcustprice->recuperableonly = (preg_match('/\*/', GETPOST("tva_tx")) ? 1 : 0);
-    
+
+    	$tva_tx_txt = GETPOST('tva_tx', 'alpha');           // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
+
+    	// We must define tva_tx, npr and local taxes
+    	$vatratecode = '';
+    	$tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt);     // keep remove all after the numbers and dot
+    	$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
+    	$localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
+    	// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
+    	if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+    	{
+    	    // We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in update price.
+    	    $vatratecode=$reg[1];
+    	    // Get record from code
+    	    $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+    	    $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+    	    $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$mysoc->country_code."'";
+    	    $sql.= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+    	    $sql.= " AND t.code ='".$vatratecode."'";
+    	    $resql=$db->query($sql);
+    	    if ($resql)
+    	    {
+    	        $obj = $db->fetch_object($resql);
+    	        $npr = $obj->recuperableonly;
+    	        $localtax1 = $obj->localtax1;
+    	        $localtax2 = $obj->localtax2;
+    	        $localtax1_type = $obj->localtax1_type;
+    	        $localtax2_type = $obj->localtax2_type;
+    	    }
+    	}
+
+    	$prodcustprice->default_vat_code = $vatratecode;
+    	$prodcustprice->tva_tx = $tva_tx;
+    	$prodcustprice->recuperableonly = $npr;
+    	$prodcustprice->localtax1_tx = $localtax1;
+    	$prodcustprice->localtax2_tx = $localtax2;
+    	$prodcustprice->localtax1_type = $localtax1_type;
+    	$prodcustprice->localtax2_type = $localtax2_type;
+
     	$result = $prodcustprice->create($user, 0, $update_child_soc);
-    
+
     	if ($result < 0) {
     		setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
     	} else {
     		setEventMessages($langs->trans('Save'), null, 'mesgs');
     	}
-    
+
     	$action = '';
     }
-    
+
     if ($action == 'delete_customer_price' && ($user->rights->produit->creer || $user->rights->service->creer)) {
     	// Delete price by customer
     	$prodcustprice->id = GETPOST('lineid');
     	$result = $prodcustprice->delete($user);
-    
+
     	if ($result < 0) {
     		setEventMessages($prodcustprice->error, $prodcustprice->errors, 'mesgs');
     	} else {
@@ -108,27 +146,27 @@ if (empty($reshook))
     	}
     	$action = '';
     }
-    
+
     if ($action == 'update_customer_price_confirm' && ! $_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {
-    
+
     	$prodcustprice->fetch(GETPOST('lineid', 'int'));
-    
+
     	$update_child_soc = GETPOST('updatechildprice');
-    
+
     	// update price by customer
     	$prodcustprice->price = price2num(GETPOST("price"), 'MU');
     	$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
     	$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
     	$prodcustprice->tva_tx = str_replace('*', '', GETPOST("tva_tx"));
     	$prodcustprice->recuperableonly = (preg_match('/\*/', GETPOST("tva_tx")) ? 1 : 0);
-    
+
     	$result = $prodcustprice->update($user, 0, $update_child_soc);
     	if ($result < 0) {
     		setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
     	} else {
     		setEventMessages($langs->trans('Save'), null, 'mesgs');
     	}
-    
+
     	$action = '';
     }
 }
@@ -154,7 +192,7 @@ dol_fiche_head($head, 'price', $langs->trans("ThirdParty"), 0, 'company');
 $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
 
 dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
-    
+
 print '<div class="fichecenter">';
 
 print '<div class="underbanner clearboth"></div>';
@@ -239,7 +277,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 		// VAT
 		print '<tr><td>' . $langs->trans("VATRate") . '</td><td>';
-		print $form->load_tva("tva_tx", $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr);
+		print $form->load_tva("tva_tx", $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr, '', false, 1);
 		print '</td></tr>';
 
 		// Price base
@@ -299,7 +337,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print load_fiche_titre($langs->trans('PriceByCustomer'));
 
 		$result = $prodcustprice->fetch(GETPOST('lineid', 'int'));
-		if ($result < 0) 
+		if ($result < 0)
 		{
 			setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
 		}
@@ -374,6 +412,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print '<br></form>';
 	} elseif ($action == 'showlog_customer_price') {
 
+	    print '<!-- showlog_customer_price -->'."\n";
+
 		$filter = array (
 			't.fk_product' => GETPOST('prodid', 'int'),'t.fk_soc' => $socid
 		);
@@ -385,7 +425,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		}
 
 		$result = $prodcustprice->fetch_all_log($sortorder, $sortfield, $conf->liste_limit, $offset, $filter);
-		if ($result < 0) 
+		if ($result < 0)
 		{
 			setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
 		}
@@ -440,8 +480,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 				print '</td>';
 			}
 			print "</table>";
-		} 
-		else 
+		}
+		else
 		{
 			print $langs->trans('None');
 		}
@@ -449,8 +489,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print "\n" . '<div class="tabsAction">' . "\n";
 		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?socid=' . $object->id . '">' . $langs->trans("Ok") . '</a></div>';
 		print "\n</div><br>\n";
-	} 
-	else 
+	}
+	else
 	{
         // View mode
 
@@ -466,30 +506,32 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 			print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=add_customer_price&amp;socid=' . $object->id . '">' . $langs->trans("AddCustomerPrice") . '</a></div>';
 		}
 		print "\n</div>\n";
-	    
-	    
+
+
         // Count total nb of records
         $nbtotalofrecords = '';
         if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
         {
             $nbtotalofrecords = $prodcustprice->fetch_all('', '', 0, 0, $filter);
         }
-        
+
         $result = $prodcustprice->fetch_all($sortorder, $sortfield, $conf->liste_limit, $offset, $filter);
         if ($result < 0)
         {
             setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
         }
-        
+
         $option = '&search_prod=' . $search_prod . '&id=' . $object->id;
-        
-        print_barre_liste($langs->trans('PriceForEachProduct'), $page, $_SERVEUR['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords, '');
-        
+
+	    print '<!-- view specific price for each product -->'."\n";
+
+	    print_barre_liste($langs->trans('PriceForEachProduct'), $page, $_SERVEUR['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords, '');
+
         print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
         print '<input type="hidden" name="id" value="' . $object->id . '">';
-        
+
         print '<table class="noborder" width="100%">';
-        
+
         print '<tr class="liste_titre">';
         print '<td>' . $langs->trans("Product") . '</td>';
         print '<td>' . $langs->trans("AppliedPricesFrom") . '</td>';
@@ -502,12 +544,12 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
         print '<td align="right">' . $langs->trans("ChangedBy") . '</td>';
         print '<td>&nbsp;</td>';
         print '</tr>';
-        
+
         if (count($prodcustprice->lines) > 0 || $search_prod)
         {
             print '<tr class="liste_titre">';
-			print '<td><input type="text" class="flat" name="search_prod" value="' . $search_prod . '" size="20"></td>';
-            print '<td colspan="8">&nbsp;</td>';
+			print '<td class="liste_titre"><input type="text" class="flat" name="search_prod" value="' . $search_prod . '" size="20"></td>';
+            print '<td class="liste_titre" colspan="8">&nbsp;</td>';
             // Print the search button
             print '<td class="liste_titre" align="right">';
             $searchpitco=$form->showFilterAndCheckAddButtons(0);
@@ -515,35 +557,35 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
             print '</td>';
             print '</tr>';
         }
-        
+
         if (count($prodcustprice->lines) > 0)
         {
             $var = False;
-            
+
             foreach ($prodcustprice->lines as $line)
             {
                 print "<tr " . $bc[$var] . ">";
-                
+
                 $staticprod = new Product($db);
                 $staticprod->fetch($line->fk_product);
-                
+
                 print "<td>" . $staticprod->getNomUrl(1) . "</td>";
                 print "<td>" . dol_print_date($line->datec, "dayhour") . "</td>";
-                
+
                 print '<td align="center">' . $langs->trans($line->price_base_type) . "</td>";
-                print '<td align="right">' . vatrate($line->tva_tx, true, $line->recuperableonly) . "</td>";
+                print '<td align="right">' . vatrate($line->tva_tx.($line->default_vat_code?' ('.$line->default_vat_code.')':''), true, $line->recuperableonly) . "</td>";
                 print '<td align="right">' . price($line->price) . "</td>";
                 print '<td align="right">' . price($line->price_ttc) . "</td>";
                 print '<td align="right">' . price($line->price_min) . '</td>';
                 print '<td align="right">' . price($line->price_min_ttc) . '</td>';
-                
+
                 // User
                 $userstatic = new User($db);
                 $userstatic->fetch($line->fk_user);
                 print '<td align="right">';
                 print $userstatic->getLoginUrl(1);
                 print '</td>';
-                
+
                 // Action
                 if ($user->rights->produit->creer || $user->rights->service->creer)
                 {
@@ -561,21 +603,21 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
                     print '</a>';
                     print '</td>';
                 }
-                
+
                 print "</tr>\n";
             }
         }
         else
         {
             $colspan=9;
-            if ($user->rights->produit->supprimer || $user->rights->service->supprimer) $colspan+=1;            
+            if ($user->rights->produit->supprimer || $user->rights->service->supprimer) $colspan+=1;
             print '<tr ' . $bc[false] . '><td colspan="'.$colspan.'">' . $langs->trans('None') . '</td></tr>';
         }
-        
+
         print "</table>";
-        
+
         print "</form>";
-		
+
 	}
 }