Dolibarr / dolibarr

htdocs/societe/canvas/individual/tpl/card_edit.tpl.php

Indentation +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
 	<td colspan="3"><?php echo $this->control->tpl['select_suppliercategory']; ?></td>
 </tr>
 		<?php
-    }
+	}
 }
 ?>
 

Braces +4 added lines, -1 removed lines

@@ -173,7 +173,10 @@
 	<td colspan="3"><?php echo $this->control->tpl['yn_assujtva']; ?></td>
 </tr>
 
-<?php if (!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if (!empty($this->control->tpl['localtax'])) {
+	echo $this->control->tpl['localtax'];
+}
+?>
 
 </table>
 <br>

htdocs/variants/admin/admin.php

Indentation +7 added lines, -7 removed lines

@@ -35,11 +35,11 @@ 
 		setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors');
 	}
 
-    if (dolibarr_set_const($db, 'PRODUIT_ATTRIBUTES_SEPARATOR', GETPOST('PRODUIT_ATTRIBUTES_SEPARATOR'), 'chaine', 0, '', $conf->entity)) {
-        setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors');
-    }
+	if (dolibarr_set_const($db, 'PRODUIT_ATTRIBUTES_SEPARATOR', GETPOST('PRODUIT_ATTRIBUTES_SEPARATOR'), 'chaine', 0, '', $conf->entity)) {
+		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors');
+	}
 }
 
 $title = $langs->trans('ModuleSetup').' '.$langs->trans('ProductAttributes');
@@ -60,9 +60,9 @@ 
 print $form->selectyesno("PRODUIT_ATTRIBUTES_HIDECHILD", $conf->global->PRODUIT_ATTRIBUTES_HIDECHILD, 1).'</td></tr>';
 print '<tr class="oddeven"><td>'.$langs->trans('CombinationsSeparator').'</td>';
 if (isset($conf->global->PRODUIT_ATTRIBUTES_SEPARATOR)) {
-    $separator = $conf->global->PRODUIT_ATTRIBUTES_SEPARATOR;
+	$separator = $conf->global->PRODUIT_ATTRIBUTES_SEPARATOR;
 } else {
-    $separator = "_";
+	$separator = "_";
 }
 print '<td class="right"><input size="3" type="text" class="flat" name="PRODUIT_ATTRIBUTES_SEPARATOR" value="'.$separator.'"></td></tr>';
 print '</table>';

Braces +2 added lines, -1 removed lines

@@ -23,8 +23,9 @@
 $langs->loadLangs(array("admin", "products"));
 
 // Security check
-if (!$user->admin || (empty($conf->product->enabled) && empty($conf->service->enabled)))
+if (!$user->admin || (empty($conf->product->enabled) && empty($conf->service->enabled))) {
 	accessforbidden();
+}
 
 if ($_POST) {
 	$value = GETPOST('PRODUIT_ATTRIBUTES_HIDECHILD');

htdocs/variants/ajax/getCombinations.php

Indentation +7 added lines, -7 removed lines

@@ -31,18 +31,18 @@
 $id = GETPOST('id', 'int');
 
 if (!$id) {
-    print json_encode(array(
-        'error' => 'ID not set'
-    ));
-    exit();
+	print json_encode(array(
+		'error' => 'ID not set'
+	));
+	exit();
 }
 
 $product = new Product($db);
 
 if ($product->fetch($id) < 0) {
-    print json_encode(array(
-        'error' => 'Product not found'
-    ));
+	print json_encode(array(
+		'error' => 'Product not found'
+	));
 }
 
 $prodcomb = new ProductCombination($db);

Braces +15 added lines, -5 removed lines

@@ -16,11 +16,21 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

htdocs/core/modules/modVariants.class.php

Indentation +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
 
 		// Array to add new pages in new tabs
 		$this->tabs = array(
-        //	'product:+combinations:Combinaciones:products:1:/variants/combinations.php?id=__ID__'
+		//	'product:+combinations:Combinaciones:products:1:/variants/combinations.php?id=__ID__'
 		);
 
 		// Dictionaries

htdocs/modulebuilder/template/core/modules/mymodule/modules_myobject.php

Braces +12 added lines, -4 removed lines

@@ -92,10 +92,18 @@
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
+		if ($this->version) {
+			return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }

htdocs/core/class/comment.class.php

Indentation +13 added lines, -13 removed lines

@@ -44,27 +44,27 @@
 	public $description;
 
 	/**
-     * Date modification record (tms)
-     *
-     * @var integer
-     */
+	 * Date modification record (tms)
+	 *
+	 * @var integer
+	 */
 	public $tms;
 
 	/**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
 	/**

Braces +11 added lines, -4 removed lines

@@ -212,8 +212,11 @@ 
 
 			$this->db->free($resql);
 
-			if ($num_rows) return 1;
-			else return 0;
+			if ($num_rows) {
+				return 1;
+			} else {
+				return 0;
+			}
 		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
@@ -234,8 +237,12 @@ 
 		$error = 0;
 
 		// Clean parameters
-		if (isset($this->fk_element)) $this->fk_project = (int) trim($this->fk_element);
-		if (isset($this->description)) $this->description = trim($this->description);
+		if (isset($this->fk_element)) {
+			$this->fk_project = (int) trim($this->fk_element);
+		}
+		if (isset($this->description)) {
+			$this->description = trim($this->description);
+		}
 
 
 		// Update request

htdocs/compta/paiement/index.php

Braces +2 added lines, -1 removed lines

@@ -19,8 +19,9 @@
 require '../../main.inc.php';
 
 // Security check
-if (!$user->admin && $user->socid > 0)
+if (!$user->admin && $user->socid > 0) {
   accessforbidden();
+}
 
 
 /*

htdocs/core/modules/mrp/modules_mo.php

Braces +12 added lines, -4 removed lines

@@ -92,10 +92,18 @@
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
+		if ($this->version) {
+			return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }

htdocs/product/fournisseurs.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -687,7 +687,7 @@
             });
         });
     </script>
-SCRIPT;
+script;
                 } else {
                     // Price qty min
                     print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMin").'</td>';

Spacing +4 added lines, -4 removed lines

@@ -533,7 +533,7 @@ 
 
 					print '<td class="fieldrequired">'.$form->textwithpicto($langs->trans("PackagingForThisProduct"), $langs->trans("PackagingForThisProductDesc")).'</td>';
 					print '<td>';
-					$packaging = GETPOSTISSET('packaging') ? price2num(GETPOST('packaging', 'nohtml'), 'MS') : ((empty($rowid))?"1":price2num($object->packaging, 'MS'));
+					$packaging = GETPOSTISSET('packaging') ? price2num(GETPOST('packaging', 'nohtml'), 'MS') : ((empty($rowid)) ? "1" : price2num($object->packaging, 'MS'));
 					print '<input class="flat" name="packaging" size="5" value="'.$packaging.'">';
 
 					// Units
@@ -899,7 +899,7 @@ 
 						// Show field if not hidden
 						if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
 							$extratitle = $langs->trans($value);
-							$arrayfields['ef.'.$key] = array('label'=>$extratitle, 'checked'=>0, 'position'=>(end($arrayfields)['position']+1), 'langfile'=>$extrafields->attributes["product_fournisseur_price"]['langfile'][$key], 'help'=>$extrafields->attributes["product_fournisseur_price"]['help'][$key]);
+							$arrayfields['ef.'.$key] = array('label'=>$extratitle, 'checked'=>0, 'position'=>(end($arrayfields)['position'] + 1), 'langfile'=>$extrafields->attributes["product_fournisseur_price"]['langfile'][$key], 'help'=>$extrafields->attributes["product_fournisseur_price"]['help'][$key]);
 						}
 					}
 				}
@@ -911,7 +911,7 @@ 
 				$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
 				print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post" name="formulaire">';
-				print '<input type="hidden" name="token" value="'. newToken() . '">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 				print '<input type="hidden" name="action" value="list">';
 				print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
@@ -1042,7 +1042,7 @@ 
 						if (!empty($arrayfields['pfp.multicurrency_unitprice']['checked'])) {
                             print '<td class="right">';
                             print price($productfourn->fourn_multicurrency_unitprice);
-                            print '</td>';}
+                            print '</td>'; }
 
 						// Currency
                         if ($conf->multicurrency->enabled) {

Braces +155 added lines, -53 removed lines

@@ -40,7 +40,9 @@ 
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 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 (!empty($conf->barcode->enabled)) dol_include_once('/core/class/html.formbarcode.class.php');
+if (!empty($conf->barcode->enabled)) {
+	dol_include_once('/core/class/html.formbarcode.class.php');
+}
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'suppliers', 'bills', 'margins', 'stocks'));
 
@@ -69,10 +71,14 @@ 
 // Security check
 $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
 $fieldtype = (!empty($ref) ? 'ref' : 'rowid');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
-if (empty($user->rights->fournisseur->lire)) accessforbidden();
+if (empty($user->rights->fournisseur->lire)) {
+	accessforbidden();
+}
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -82,8 +88,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "s.nom";
-if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) {
+	$sortfield = "s.nom";
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('pricesuppliercard', 'globalcard'));
@@ -97,22 +107,30 @@ 
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 
-if (!$sortfield) $sortfield = "s.nom";
-if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) {
+	$sortfield = "s.nom";
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
 
 
 /*
  * Actions
  */
 
-if ($cancel) $action = '';
+if ($cancel) {
+	$action = '';
+}
 
 $usercanread = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->lire) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->lire));
 $usercancreate = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer));
 
 $parameters = array('socid'=>$socid, 'id_prod'=>$id);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -136,9 +154,11 @@ 
 
 	if ($action == 'confirm_remove_pf')
 	{
-		if ($rowid)	// id of product supplier price to remove
+		if ($rowid) {
+			// id of product supplier price to remove
 		{
 			$action = '';
+		}
 			$result = $object->remove_product_fournisseur_price($rowid);
 			if ($result > 0) {
 				$db->query("DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields WHERE fk_object = $rowid");
@@ -153,11 +173,17 @@ 
 	if ($action == 'save_price')
 	{
 		$id_fourn = GETPOST("id_fourn");
-		if (empty($id_fourn)) $id_fourn = GETPOST("search_id_fourn");
+		if (empty($id_fourn)) {
+			$id_fourn = GETPOST("search_id_fourn");
+		}
 		$ref_fourn = GETPOST("ref_fourn");
-		if (empty($ref_fourn)) $ref_fourn = GETPOST("search_ref_fourn");
+		if (empty($ref_fourn)) {
+			$ref_fourn = GETPOST("search_ref_fourn");
+		}
 		$ref_fourn_old = GETPOST("ref_fourn_old");
-		if (empty($ref_fourn_old)) $ref_fourn_old = $ref_fourn;
+		if (empty($ref_fourn_old)) {
+			$ref_fourn_old = $ref_fourn;
+		}
 		$quantity = price2num(GETPOST("qty", 'nohtml'), 'MS');
 		$remise_percent = price2num(GETPOST('remise_percent', 'alpha'));
 		$npr = preg_match('/\*/', $_POST['tva_tx']) ? 1 : 0;
@@ -203,9 +229,11 @@ 
 		}
 		if (price2num($_POST["price"]) < 0 || $_POST["price"] == '')
 		{
-			if ($price_expression === '')	// Return error of missing price only if price_expression not set
+			if ($price_expression === '') {
+				// Return error of missing price only if price_expression not set
 			{
 				$error++;
+			}
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Price")), null, 'errors');
 			} else {
@@ -290,8 +318,12 @@ 
 
 				$newprice = price2num(GETPOST("price", "alpha"));
 
-				if (empty($packaging)) $packaging = 1;
-				if ($packaging < $quantity) $packaging = $quantity;
+				if (empty($packaging)) {
+					$packaging = 1;
+				}
+				if ($packaging < $quantity) {
+					$packaging = $quantity;
+				}
 				$object->packaging = $packaging;
 
                 if ($conf->multicurrency->enabled)
@@ -391,7 +423,9 @@ 
 		    $object->next_prev_filter = " fk_product_type = ".$object->type;
 
             $shownav = 1;
-            if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+            if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+            	$shownav = 0;
+            }
 
 			dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
@@ -413,7 +447,9 @@ 
             // PMP
             print '<tr><td class="titlefield">'.$form->textwithpicto($langs->trans("AverageUnitPricePMPShort"), $langs->trans("AverageUnitPricePMPDesc")).'</td>';
             print '<td>';
-            if ($object->pmp > 0) print price($object->pmp).' '.$langs->trans("HT");
+            if ($object->pmp > 0) {
+            	print price($object->pmp).' '.$langs->trans("HT");
+            }
             print '</td>';
             print '</tr>';
 
@@ -423,8 +459,11 @@ 
             $product_fourn = new ProductFournisseur($db);
             if ($product_fourn->find_min_price_product_fournisseur($object->id) > 0)
             {
-            	if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur();
-            	else print $langs->trans("NotDefined");
+            	if ($product_fourn->product_fourn_price_id > 0) {
+            		print $product_fourn->display_price_product_fournisseur();
+            	} else {
+            		print $langs->trans("NotDefined");
+            	}
             }
             print '</td></tr>';
 
@@ -554,14 +593,18 @@ 
 				$mysoc2->tva_assuj = 1;
 				$default_vat = get_default_tva($mysoc2, $mysoc, $object->id, 0);
 				$default_npr = get_default_npr($mysoc2, $mysoc, $object->id, 0);
-				if (empty($default_vat)) $default_npr = $default_vat;
+				if (empty($default_vat)) {
+					$default_npr = $default_vat;
+				}
 
 				print '<tr><td class="fieldrequired">'.$langs->trans("VATRateForSupplierProduct").'</td>';
 				print '<td>';
 				//print $form->load_tva('tva_tx',$object->tva_tx,$supplier,$mysoc);    // Do not use list here as it may be any vat rates for any country
-				if (!empty($rowid))	// If we have a supplier, it is an update, we must show the vat of current supplier price
+				if (!empty($rowid)) {
+					// If we have a supplier, it is an update, we must show the vat of current supplier price
 				{
 				    $tmpproductsupplier = new ProductFournisseur($db);
+				}
 				    $tmpproductsupplier->fetch_product_fournisseur_price($rowid, 1);
 					$default_vat = $tmpproductsupplier->fourn_tva_tx;
 					$default_npr = $tmpproductsupplier->fourn_tva_npr;
@@ -576,10 +619,12 @@ 
 				print '<input type="text" class="flat" size="5" name="tva_tx" value="'.$vattosuggest.'">';
 				print '</td></tr>';
 
-				if (!empty($conf->dynamicprices->enabled)) //Only show price mode and expression selector if module is enabled
+				if (!empty($conf->dynamicprices->enabled)) {
+					//Only show price mode and expression selector if module is enabled
 				{
 					// Price mode selector
 					print '<tr><td class="fieldrequired">'.$langs->trans("PriceMode").'</td><td>';
+				}
 					$price_expression = new PriceExpression($db);
 					$price_expression_list = array(0 => $langs->trans("PriceNumeric")); //Put the numeric mode as first option
 					foreach ($price_expression->list_price_expression() as $entry) {
@@ -615,7 +660,9 @@ 
                     print '<tr><td class="fieldrequired">'.$langs->trans("Currency").'</td>';
                     print '<td>';
                     $currencycodetouse = GETPOST('multicurrency_code') ?GETPOST('multicurrency_code') : (isset($object->fourn_multicurrency_code) ? $object->fourn_multicurrency_code : '');
-                    if (empty($currencycodetouse) && $object->fourn_multicurrency_tx == 1) $currencycodetouse = $conf->currency;
+                    if (empty($currencycodetouse) && $object->fourn_multicurrency_tx == 1) {
+                    	$currencycodetouse = $conf->currency;
+                    }
                     print $form->selectMultiCurrency($currencycodetouse, "multicurrency_code", 1);
                     print '</td>';
                     print '</tr>';
@@ -780,11 +827,16 @@ 
                     if (empty($rowid)) {
                         foreach ($extralabels as $key => $value) {
                             if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && ($extrafields->attributes["product_fournisseur_price"]['list'][$key] == 1 || $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 3 || ($action == "update_price" && $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 4))) {
-                                if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) $langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
+                                if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) {
+                                	$langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
+                                }
 
                                 print '<tr><td'.($extrafields->attributes["product_fournisseur_price"]['required'][$key] ? ' class="fieldrequired"' : '').'>';
-                                if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) print $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
-                                else print $langs->trans($value);
+                                if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) {
+                                	print $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
+                                } else {
+                                	print $langs->trans($value);
+                                }
                                 print '</td><td>'.$extrafields->showInputField($key, GETPOSTISSET('options_'.$key) ? $extrafield_values['options_'.$key] : '', '', '', '', '', 0, 'product_fournisseur_price').'</td></tr>';
                             }
                         }
@@ -801,11 +853,16 @@ 
                             $obj = $db->fetch_object($resql);
                             foreach ($extralabels as $key => $value) {
                                 if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && ($extrafields->attributes["product_fournisseur_price"]['list'][$key] == 1 || $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 3 || ($action == "update_price" && $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 4))) {
-                                    if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) $langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
+                                    if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) {
+                                    	$langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
+                                    }
 
                                     print '<tr><td'.($extrafields->attributes["product_fournisseur_price"]['required'][$key] ? ' class="fieldrequired"' : '').'>';
-                                    if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) print $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
-                                    else print $langs->trans($value);
+                                    if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) {
+                                    	print $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
+                                    } else {
+                                    	print $langs->trans($value);
+                                    }
                                     print '</td><td>'.$extrafields->showInputField($key, GETPOSTISSET('options_'.$key) ? $extrafield_values['options_'.$key] : $obj->{$key}, '', '', '', '', 0, 'product_fournisseur_price');
 
                                     print '</td></tr>';
@@ -857,11 +914,17 @@ 
 			print "\n</div>\n";
 			print '<br>';
 
-			if ($user->rights->fournisseur->lire) // Duplicate ? this check is already in the head of this file
+			if ($user->rights->fournisseur->lire) {
+				// Duplicate ? this check is already in the head of this file
 			{
 				$param = '';
-				if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-				if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+			}
+				if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+					$param .= '&contextpage='.urlencode($contextpage);
+				}
+				if ($limit > 0 && $limit != $conf->liste_limit) {
+					$param .= '&limit='.urlencode($limit);
+				}
 				$param .= '&ref='.urlencode($object->ref);
 
 				$product_fourn = new ProductFournisseur($db);
@@ -869,7 +932,9 @@ 
 				$product_fourn_list_all = $product_fourn->list_product_fournisseur_price($object->id, $sortfield, $sortorder, 0, 0);
 				$nbtotalofrecords = count($product_fourn_list_all);
 				$num = count($product_fourn_list);
-				if (($num + ($offset * $limit)) < $nbtotalofrecords) $num++;
+				if (($num + ($offset * $limit)) < $nbtotalofrecords) {
+					$num++;
+				}
 
 				print_barre_liste($langs->trans('SupplierPrices'), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit, 1);
 
@@ -924,24 +989,52 @@ 
 				$param = "&id=".$object->id;
 
 				print '<tr class="liste_titre">';
-				if (!empty($arrayfields['pfp.datec']['checked']))					print_liste_field_titre("AppliedPricesFrom", $_SERVER["PHP_SELF"], "pfp.datec", "", $param, "", $sortfield, $sortorder);
-				if (!empty($arrayfields['s.nom']['checked']))						print_liste_field_titre("Suppliers", $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder);
+				if (!empty($arrayfields['pfp.datec']['checked'])) {
+					print_liste_field_titre("AppliedPricesFrom", $_SERVER["PHP_SELF"], "pfp.datec", "", $param, "", $sortfield, $sortorder);
+				}
+				if (!empty($arrayfields['s.nom']['checked'])) {
+					print_liste_field_titre("Suppliers", $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder);
+				}
 				print_liste_field_titre("SupplierRef", $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
-				if (!empty($arrayfields['pfp.fk_availability']['checked']))			print_liste_field_titre("Availability", $_SERVER["PHP_SELF"], "pfp.fk_availability", "", $param, "", $sortfield, $sortorder);
-				if (!empty($arrayfields['pfp.quantity']['checked']))				print_liste_field_titre("QtyMin", $_SERVER["PHP_SELF"], "pfp.quantity", "", $param, '', $sortfield, $sortorder, 'right ');
+				if (!empty($arrayfields['pfp.fk_availability']['checked'])) {
+					print_liste_field_titre("Availability", $_SERVER["PHP_SELF"], "pfp.fk_availability", "", $param, "", $sortfield, $sortorder);
+				}
+				if (!empty($arrayfields['pfp.quantity']['checked'])) {
+					print_liste_field_titre("QtyMin", $_SERVER["PHP_SELF"], "pfp.quantity", "", $param, '', $sortfield, $sortorder, 'right ');
+				}
 				print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
 				print_liste_field_titre("PriceQtyMinHT", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-                if ($conf->multicurrency->enabled)									print_liste_field_titre("PriceQtyMinHTCurrency", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-                if (!empty($arrayfields['pfp.unitprice']['checked']))				print_liste_field_titre("UnitPriceHT", $_SERVER["PHP_SELF"], "pfp.unitprice", "", $param, '', $sortfield, $sortorder, 'right ');
-				if (!empty($arrayfields['pfp.multicurrency_unitprice']['checked']))	print_liste_field_titre("UnitPriceHTCurrency", $_SERVER["PHP_SELF"], "pfp.multicurrency_unitprice", "", $param, '', $sortfield, $sortorder, 'right ');
-				if ($conf->multicurrency->enabled)									print_liste_field_titre("Currency", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+                if ($conf->multicurrency->enabled) {
+                	print_liste_field_titre("PriceQtyMinHTCurrency", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+                }
+                if (!empty($arrayfields['pfp.unitprice']['checked'])) {
+                	print_liste_field_titre("UnitPriceHT", $_SERVER["PHP_SELF"], "pfp.unitprice", "", $param, '', $sortfield, $sortorder, 'right ');
+                }
+				if (!empty($arrayfields['pfp.multicurrency_unitprice']['checked'])) {
+					print_liste_field_titre("UnitPriceHTCurrency", $_SERVER["PHP_SELF"], "pfp.multicurrency_unitprice", "", $param, '', $sortfield, $sortorder, 'right ');
+				}
+				if ($conf->multicurrency->enabled) {
+					print_liste_field_titre("Currency", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+				}
 				print_liste_field_titre("DiscountQtyMin", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-				if (!empty($arrayfields['pfp.delivery_time_days']['checked']))		print_liste_field_titre("NbDaysToDelivery", $_SERVER["PHP_SELF"], "pfp.delivery_time_days", "", $param, '', $sortfield, $sortorder, 'right ');
-				if (!empty($arrayfields['pfp.supplier_reputation']['checked']))		print_liste_field_titre("ReputationForThisProduct", $_SERVER["PHP_SELF"], "pfp.supplier_reputation", "", $param, '', $sortfield, $sortorder, 'center ');
-				if (!empty($arrayfields['pfp.barcode']['checked']))					print_liste_field_titre("BarcodeValue", $_SERVER["PHP_SELF"], "pfp.barcode", "", $param, '', $sortfield, $sortorder, 'center ');
-				if (!empty($arrayfields['pfp.fk_barcode_type']['checked']))			print_liste_field_titre("BarcodeType", $_SERVER["PHP_SELF"], "pfp.fk_barcode_type", "", $param, '', $sortfield, $sortorder, 'center ');
-				if (!empty($arrayfields['pfp.packaging']['checked']))				print_liste_field_titre("PackagingForThisProduct", $_SERVER["PHP_SELF"], "pfp.packaging", "", $param, 'align="center"', $sortfield, $sortorder);
-				if (!empty($arrayfields['pfp.tms']['checked']))						print_liste_field_titre("DateModification", $_SERVER["PHP_SELF"], "pfp.tms", "", $param, '', $sortfield, $sortorder, 'right ');
+				if (!empty($arrayfields['pfp.delivery_time_days']['checked'])) {
+					print_liste_field_titre("NbDaysToDelivery", $_SERVER["PHP_SELF"], "pfp.delivery_time_days", "", $param, '', $sortfield, $sortorder, 'right ');
+				}
+				if (!empty($arrayfields['pfp.supplier_reputation']['checked'])) {
+					print_liste_field_titre("ReputationForThisProduct", $_SERVER["PHP_SELF"], "pfp.supplier_reputation", "", $param, '', $sortfield, $sortorder, 'center ');
+				}
+				if (!empty($arrayfields['pfp.barcode']['checked'])) {
+					print_liste_field_titre("BarcodeValue", $_SERVER["PHP_SELF"], "pfp.barcode", "", $param, '', $sortfield, $sortorder, 'center ');
+				}
+				if (!empty($arrayfields['pfp.fk_barcode_type']['checked'])) {
+					print_liste_field_titre("BarcodeType", $_SERVER["PHP_SELF"], "pfp.fk_barcode_type", "", $param, '', $sortfield, $sortorder, 'center ');
+				}
+				if (!empty($arrayfields['pfp.packaging']['checked'])) {
+					print_liste_field_titre("PackagingForThisProduct", $_SERVER["PHP_SELF"], "pfp.packaging", "", $param, 'align="center"', $sortfield, $sortorder);
+				}
+				if (!empty($arrayfields['pfp.tms']['checked'])) {
+					print_liste_field_titre("DateModification", $_SERVER["PHP_SELF"], "pfp.tms", "", $param, '', $sortfield, $sortorder, 'right ');
+				}
 
 				// fetch optionals attributes and labels
 				$extrafields->fetch_name_optionals_label("product_fournisseur_price");
@@ -951,10 +1044,17 @@ 
 					foreach ($extralabels as $key => $value) {
 						// Show field if not hidden
 						if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
-                            if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) $langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
-                            if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) $extratitle = $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
-							else $extratitle = $langs->trans($value);
-							if (!empty($arrayfields['ef.'.$key]['checked'])) print_liste_field_titre($extratitle, $_SERVER["PHP_SELF"], 'ef.'.$key, '', $param, '', $sortfield, $sortorder, 'right ');
+                            if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) {
+                            	$langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
+                            }
+                            if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) {
+                            	$extratitle = $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
+                            } else {
+								$extratitle = $langs->trans($value);
+							}
+							if (!empty($arrayfields['ef.'.$key]['checked'])) {
+								print_liste_field_titre($extratitle, $_SERVER["PHP_SELF"], 'ef.'.$key, '', $param, '', $sortfield, $sortorder, 'right ');
+							}
 						}
 					}
 				}
@@ -984,9 +1084,11 @@ 
 						}
 
 						// Supplier ref
-						if ($usercancreate) // change required right here
+						if ($usercancreate) {
+							// change required right here
 						{
 							print '<td class="left">'.$productfourn->getNomUrl().'</td>';
+						}
 						} else {
 							print '<td class="left">'.$productfourn->fourn_ref.'</td>';
 						}

Indentation +283 added lines, -283 removed lines

@@ -91,7 +91,7 @@ 
 $object = new ProductFournisseur($db);
 if ($id > 0 || $ref)
 {
-    $object->fetch($id, $ref);
+	$object->fetch($id, $ref);
 }
 
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -126,7 +126,7 @@ 
 			if ($result > 0)
 			{
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-		        $action = '';
+				$action = '';
 			} else {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -167,8 +167,8 @@ 
 		$delivery_time_days = GETPOST('delivery_time_days', 'int') ? GETPOST('delivery_time_days', 'int') : '';
 		$supplier_reputation = GETPOST('supplier_reputation');
 		$supplier_description = GETPOST('supplier_description', 'restricthtml');
-        $barcode = GETPOST('barcode', 'alpha');
-        $fk_barcode_type = GETPOST('fk_barcode_type', 'int');
+		$barcode = GETPOST('barcode', 'alpha');
+		$fk_barcode_type = GETPOST('fk_barcode_type', 'int');
 		$packaging = price2num(GETPOST("packaging", 'alphanohtml'), 'MS');
 
 		if ($tva_tx == '')
@@ -212,23 +212,23 @@ 
 				$_POST["price"] = 0;
 			}
 		}
-        if ($conf->multicurrency->enabled) {
-            if (empty($_POST["multicurrency_code"])) {
-                $error++;
-                $langs->load("errors");
-                setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Currency")), null, 'errors');
-            }
-            if (price2num($_POST["multicurrency_tx"]) <= 0 || $_POST["multicurrency_tx"] == '') {
-                $error++;
-                $langs->load("errors");
-                setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("CurrencyRate")), null, 'errors');
-            }
-            if (price2num($_POST["multicurrency_price"]) < 0 || $_POST["multicurrency_price"] == '') {
-                $error++;
-                $langs->load("errors");
-                setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PriceCurrency")), null, 'errors');
-            }
-        }
+		if ($conf->multicurrency->enabled) {
+			if (empty($_POST["multicurrency_code"])) {
+				$error++;
+				$langs->load("errors");
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Currency")), null, 'errors');
+			}
+			if (price2num($_POST["multicurrency_tx"]) <= 0 || $_POST["multicurrency_tx"] == '') {
+				$error++;
+				$langs->load("errors");
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("CurrencyRate")), null, 'errors');
+			}
+			if (price2num($_POST["multicurrency_price"]) < 0 || $_POST["multicurrency_price"] == '') {
+				$error++;
+				$langs->load("errors");
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PriceCurrency")), null, 'errors');
+			}
+		}
 
 		if (!$error)
 		{
@@ -263,30 +263,30 @@ 
 				$extralabels = $extrafields->fetch_name_optionals_label("product_fournisseur_price");
 				$extrafield_values = $extrafields->getOptionalsFromPost("product_fournisseur_price");
 				if (!empty($extrafield_values)) {
-                    $resql = $db->query("SELECT fk_object FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields WHERE fk_object = ".$object->product_fourn_price_id);
-                    // Insert a new extrafields row, if none exists
-                    if ($db->num_rows($resql) != 1) {
-                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields (fk_object, ";
-                        foreach ($extrafield_values as $key => $value) {
-                            $sql .= str_replace('options_', '', $key).', ';
-                        }
-                        $sql = substr($sql, 0, strlen($sql) - 2).") VALUES (".$object->product_fourn_price_id.", ";
-                        foreach ($extrafield_values as $key => $value) {
-                            $sql .= '"'.$value.'", ';
-                        }
-                        $sql = substr($sql, 0, strlen($sql) - 2).')';
-                    } else {
-                        // update the existing one
-                        $sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields SET ";
-                        foreach ($extrafield_values as $key => $value) {
-                            $sql .= str_replace('options_', '', $key).' = "'.$value.'", ';
-                        }
-                        $sql = substr($sql, 0, strlen($sql) - 2).' WHERE fk_object = '.$object->product_fourn_price_id;
-                    }
-
-                    // Execute the sql command from above
-                    $db->query($sql);
-                }
+					$resql = $db->query("SELECT fk_object FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields WHERE fk_object = ".$object->product_fourn_price_id);
+					// Insert a new extrafields row, if none exists
+					if ($db->num_rows($resql) != 1) {
+						$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields (fk_object, ";
+						foreach ($extrafield_values as $key => $value) {
+							$sql .= str_replace('options_', '', $key).', ';
+						}
+						$sql = substr($sql, 0, strlen($sql) - 2).") VALUES (".$object->product_fourn_price_id.", ";
+						foreach ($extrafield_values as $key => $value) {
+							$sql .= '"'.$value.'", ';
+						}
+						$sql = substr($sql, 0, strlen($sql) - 2).')';
+					} else {
+						// update the existing one
+						$sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields SET ";
+						foreach ($extrafield_values as $key => $value) {
+							$sql .= str_replace('options_', '', $key).' = "'.$value.'", ';
+						}
+						$sql = substr($sql, 0, strlen($sql) - 2).' WHERE fk_object = '.$object->product_fourn_price_id;
+					}
+
+					// Execute the sql command from above
+					$db->query($sql);
+				}
 
 				$newprice = price2num(GETPOST("price", "alpha"));
 
@@ -294,16 +294,16 @@ 
 				if ($packaging < $quantity) $packaging = $quantity;
 				$object->packaging = $packaging;
 
-                if ($conf->multicurrency->enabled)
-                {
-                	$multicurrency_tx = price2num(GETPOST("multicurrency_tx", 'alpha'));
-                	$multicurrency_price = price2num(GETPOST("multicurrency_price", 'alpha'));
-                	$multicurrency_code = GETPOST("multicurrency_code", 'alpha');
+				if ($conf->multicurrency->enabled)
+				{
+					$multicurrency_tx = price2num(GETPOST("multicurrency_tx", 'alpha'));
+					$multicurrency_price = price2num(GETPOST("multicurrency_price", 'alpha'));
+					$multicurrency_code = GETPOST("multicurrency_code", 'alpha');
 
-                    $ret = $object->update_buyprice($quantity, $newprice, $user, $_POST["price_base_type"], $supplier, $_POST["oselDispo"], $ref_fourn, $tva_tx, $_POST["charges"], $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', $multicurrency_price, $_POST["multicurrency_price_base_type"], $multicurrency_tx, $multicurrency_code, $supplier_description, $barcode, $fk_barcode_type);
-                } else {
-                    $ret = $object->update_buyprice($quantity, $newprice, $user, $_POST["price_base_type"], $supplier, $_POST["oselDispo"], $ref_fourn, $tva_tx, $_POST["charges"], $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', 0, 'HT', 1, '', $supplier_description, $barcode, $fk_barcode_type);
-                }
+					$ret = $object->update_buyprice($quantity, $newprice, $user, $_POST["price_base_type"], $supplier, $_POST["oselDispo"], $ref_fourn, $tva_tx, $_POST["charges"], $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', $multicurrency_price, $_POST["multicurrency_price_base_type"], $multicurrency_tx, $multicurrency_code, $supplier_description, $barcode, $fk_barcode_type);
+				} else {
+					$ret = $object->update_buyprice($quantity, $newprice, $user, $_POST["price_base_type"], $supplier, $_POST["oselDispo"], $ref_fourn, $tva_tx, $_POST["charges"], $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', 0, 'HT', 1, '', $supplier_description, $barcode, $fk_barcode_type);
+				}
 				if ($ret < 0)
 				{
 					$error++;
@@ -312,9 +312,9 @@ 
 					if (!empty($conf->dynamicprices->enabled) && $price_expression !== '')
 					{
 						//Check the expression validity by parsing it
-                        $priceparser = new PriceParser($db);
-                        $object->fk_supplier_price_expression = $price_expression;
-                        $price_result = $priceparser->parseProductSupplier($object);
+						$priceparser = new PriceParser($db);
+						$object->fk_supplier_price_expression = $price_expression;
+						$price_result = $priceparser->parseProductSupplier($object);
 						if ($price_result < 0) { //Expression is not valid
 							$error++;
 							setEventMessages($priceparser->translatedError(), null, 'errors');
@@ -388,50 +388,50 @@ 
 			print dol_get_fiche_head($head, 'suppliers', $titre, -1, $picto);
 
 			$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-		    $object->next_prev_filter = " fk_product_type = ".$object->type;
+			$object->next_prev_filter = " fk_product_type = ".$object->type;
 
-            $shownav = 1;
-            if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+			$shownav = 1;
+			if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
 			dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-            print '<div class="fichecenter">';
+			print '<div class="fichecenter">';
 
-            print '<div class="underbanner clearboth"></div>';
-            print '<table class="border tableforfield" width="100%">';
+			print '<div class="underbanner clearboth"></div>';
+			print '<table class="border tableforfield" width="100%">';
 
 			// Cost price. Can be used for margin module for option "calculate margin on explicit cost price
-            print '<tr><td>';
+			print '<tr><td>';
 			$textdesc = $langs->trans("CostPriceDescription");
 			$textdesc .= "<br>".$langs->trans("CostPriceUsage");
 			$text = $form->textwithpicto($langs->trans("CostPrice"), $textdesc, 1, 'help', '');
 			print $form->editfieldkey($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
-            print '</td><td colspan="2">';
-            print $form->editfieldval($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
-            print '</td></tr>';
-
-            // PMP
-            print '<tr><td class="titlefield">'.$form->textwithpicto($langs->trans("AverageUnitPricePMPShort"), $langs->trans("AverageUnitPricePMPDesc")).'</td>';
-            print '<td>';
-            if ($object->pmp > 0) print price($object->pmp).' '.$langs->trans("HT");
-            print '</td>';
-            print '</tr>';
-
-            // Best buying Price
-            print '<tr><td class="titlefield">'.$langs->trans("BuyingPriceMin").'</td>';
-            print '<td colspan="2">';
-            $product_fourn = new ProductFournisseur($db);
-            if ($product_fourn->find_min_price_product_fournisseur($object->id) > 0)
-            {
-            	if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur();
-            	else print $langs->trans("NotDefined");
-            }
-            print '</td></tr>';
-
-            print '</table>';
-
-            print '</div>';
-            print '<div style="clear:both"></div>';
+			print '</td><td colspan="2">';
+			print $form->editfieldval($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
+			print '</td></tr>';
+
+			// PMP
+			print '<tr><td class="titlefield">'.$form->textwithpicto($langs->trans("AverageUnitPricePMPShort"), $langs->trans("AverageUnitPricePMPDesc")).'</td>';
+			print '<td>';
+			if ($object->pmp > 0) print price($object->pmp).' '.$langs->trans("HT");
+			print '</td>';
+			print '</tr>';
+
+			// Best buying Price
+			print '<tr><td class="titlefield">'.$langs->trans("BuyingPriceMin").'</td>';
+			print '<td colspan="2">';
+			$product_fourn = new ProductFournisseur($db);
+			if ($product_fourn->find_min_price_product_fournisseur($object->id) > 0)
+			{
+				if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur();
+				else print $langs->trans("NotDefined");
+			}
+			print '</td></tr>';
+
+			print '</table>';
+
+			print '</div>';
+			print '<div style="clear:both"></div>';
 
 			print dol_get_fiche_end();
 
@@ -474,7 +474,7 @@ 
 					print $form->select_company(GETPOST("id_fourn", 'alpha'), 'id_fourn', 'fournisseur=1', 'SelectThirdParty', 0, 0, $events);
 
 					$parameters = array('filtre'=>"fournisseur=1", 'html_name'=>'id_fourn', 'selected'=>GETPOST("id_fourn"), 'showempty'=>1, 'prod_id'=>$object->id);
-				    $reshook = $hookmanager->executeHooks('formCreateThirdpartyOptions', $parameters, $object, $action);
+					$reshook = $hookmanager->executeHooks('formCreateThirdpartyOptions', $parameters, $object, $action);
 					if (empty($reshook))
 					{
 						if (empty($form->result))
@@ -489,8 +489,8 @@ 
 				print '<tr><td class="fieldrequired">'.$langs->trans("SupplierRef").'</td><td>';
 				if ($rowid)
 				{
-                    print '<input type="hidden" name="ref_fourn_old" value="'.$object->ref_supplier.'">';
-                    print '<input class="flat" name="ref_fourn" size="12" value="'.$object->ref_supplier.'">';
+					print '<input type="hidden" name="ref_fourn_old" value="'.$object->ref_supplier.'">';
+					print '<input class="flat" name="ref_fourn" size="12" value="'.$object->ref_supplier.'">';
 				} else {
 					print '<input class="flat" name="ref_fourn" size="12" value="'.(GETPOST("ref_fourn") ?GETPOST("ref_fourn") : '').'">';
 				}
@@ -518,13 +518,13 @@ 
 				} else {
 					print '<input class="flat" name="qty" size="5" value="'.$quantity.'">';
 				}
-                // Units
-                if ($conf->global->PRODUCT_USE_UNITS) {
-                    $unit = $object->getLabelOfUnit();
-                    if ($unit !== '') {
-                        print '&nbsp;&nbsp;'.$langs->trans($unit);
-                    }
-                }
+				// Units
+				if ($conf->global->PRODUCT_USE_UNITS) {
+					$unit = $object->getLabelOfUnit();
+					if ($unit !== '') {
+						print '&nbsp;&nbsp;'.$langs->trans($unit);
+					}
+				}
 				print '</td></tr>';
 
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
@@ -561,15 +561,15 @@ 
 				//print $form->load_tva('tva_tx',$object->tva_tx,$supplier,$mysoc);    // Do not use list here as it may be any vat rates for any country
 				if (!empty($rowid))	// If we have a supplier, it is an update, we must show the vat of current supplier price
 				{
-				    $tmpproductsupplier = new ProductFournisseur($db);
-				    $tmpproductsupplier->fetch_product_fournisseur_price($rowid, 1);
+					$tmpproductsupplier = new ProductFournisseur($db);
+					$tmpproductsupplier->fetch_product_fournisseur_price($rowid, 1);
 					$default_vat = $tmpproductsupplier->fourn_tva_tx;
 					$default_npr = $tmpproductsupplier->fourn_tva_npr;
 				} else {
-                    if (empty($default_vat))
-                    {
-                        $default_vat = $object->tva_tx;
-                    }
+					if (empty($default_vat))
+					{
+						$default_vat = $object->tva_tx;
+					}
 				}
 				$vattosuggest = (GETPOST("tva_tx") ?vatrate(GETPOST("tva_tx")) : ($default_vat != '' ?vatrate($default_vat) : ''));
 				$vattosuggest = preg_replace('/\s*\(.*\)$/', '', $vattosuggest);
@@ -610,52 +610,52 @@ 
 					</script>';
 				}
 
-                if ($conf->multicurrency->enabled) {
-                    // Currency
-                    print '<tr><td class="fieldrequired">'.$langs->trans("Currency").'</td>';
-                    print '<td>';
-                    $currencycodetouse = GETPOST('multicurrency_code') ?GETPOST('multicurrency_code') : (isset($object->fourn_multicurrency_code) ? $object->fourn_multicurrency_code : '');
-                    if (empty($currencycodetouse) && $object->fourn_multicurrency_tx == 1) $currencycodetouse = $conf->currency;
-                    print $form->selectMultiCurrency($currencycodetouse, "multicurrency_code", 1);
-                    print '</td>';
-                    print '</tr>';
-
-                    // Currency tx
-                    print '<tr><td class="fieldrequired">'.$langs->trans("CurrencyRate").'</td>';
-                    print '<td><input class="flat" name="multicurrency_tx" size="4" value="'.vatrate(GETPOST('multicurrency_tx') ?GETPOST('multicurrency_tx') : (isset($object->fourn_multicurrency_tx) ? $object->fourn_multicurrency_tx : '')).'">';
-                    print '</td>';
-                    print '</tr>';
-
-                    // Currency price qty min
-                    print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMinCurrency").'</td>';
-                    $pricesupplierincurrencytouse = (GETPOST('multicurrency_price') ?GETPOST('multicurrency_price') : (isset($object->fourn_multicurrency_price) ? $object->fourn_multicurrency_price : ''));
-                    print '<td><input class="flat" name="multicurrency_price" size="8" value="'.price($pricesupplierincurrencytouse).'">';
-                    print '&nbsp;';
-                    print $form->selectPriceBaseType((GETPOST('multicurrency_price_base_type') ?GETPOST('multicurrency_price_base_type') : 'HT'), "multicurrency_price_base_type"); // We keep 'HT' here, multicurrency_price_base_type is not yet supported for supplier prices
-                    print '</td></tr>';
-
-                    // Price qty min
-                    print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMin").'</td>';
-                    print '<td><input class="flat" name="disabled_price" size="8" value="">';
-                    print '<input type="hidden" name="price" value="">';
-                    print '<input type="hidden" name="price_base_type" value="">';
-                    print '&nbsp;';
-                    print $form->selectPriceBaseType('', "disabled_price_base_type");
-                    print '</td></tr>';
-
-                    $currencies = array();
-                    $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'multicurrency WHERE entity = '.$conf->entity;
-                    $resql = $db->query($sql);
-                    if ($resql) {
-                        $currency = new MultiCurrency($db);
-                        while ($obj = $db->fetch_object($resql)) {
-                            $currency->fetch($obj->rowid);
-                            $currencies[$currency->code] = $currency->rate->rate;
-                        }
-                    }
-                    $currencies = json_encode($currencies);
-
-                    print <<<SCRIPT
+				if ($conf->multicurrency->enabled) {
+					// Currency
+					print '<tr><td class="fieldrequired">'.$langs->trans("Currency").'</td>';
+					print '<td>';
+					$currencycodetouse = GETPOST('multicurrency_code') ?GETPOST('multicurrency_code') : (isset($object->fourn_multicurrency_code) ? $object->fourn_multicurrency_code : '');
+					if (empty($currencycodetouse) && $object->fourn_multicurrency_tx == 1) $currencycodetouse = $conf->currency;
+					print $form->selectMultiCurrency($currencycodetouse, "multicurrency_code", 1);
+					print '</td>';
+					print '</tr>';
+
+					// Currency tx
+					print '<tr><td class="fieldrequired">'.$langs->trans("CurrencyRate").'</td>';
+					print '<td><input class="flat" name="multicurrency_tx" size="4" value="'.vatrate(GETPOST('multicurrency_tx') ?GETPOST('multicurrency_tx') : (isset($object->fourn_multicurrency_tx) ? $object->fourn_multicurrency_tx : '')).'">';
+					print '</td>';
+					print '</tr>';
+
+					// Currency price qty min
+					print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMinCurrency").'</td>';
+					$pricesupplierincurrencytouse = (GETPOST('multicurrency_price') ?GETPOST('multicurrency_price') : (isset($object->fourn_multicurrency_price) ? $object->fourn_multicurrency_price : ''));
+					print '<td><input class="flat" name="multicurrency_price" size="8" value="'.price($pricesupplierincurrencytouse).'">';
+					print '&nbsp;';
+					print $form->selectPriceBaseType((GETPOST('multicurrency_price_base_type') ?GETPOST('multicurrency_price_base_type') : 'HT'), "multicurrency_price_base_type"); // We keep 'HT' here, multicurrency_price_base_type is not yet supported for supplier prices
+					print '</td></tr>';
+
+					// Price qty min
+					print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMin").'</td>';
+					print '<td><input class="flat" name="disabled_price" size="8" value="">';
+					print '<input type="hidden" name="price" value="">';
+					print '<input type="hidden" name="price_base_type" value="">';
+					print '&nbsp;';
+					print $form->selectPriceBaseType('', "disabled_price_base_type");
+					print '</td></tr>';
+
+					$currencies = array();
+					$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'multicurrency WHERE entity = '.$conf->entity;
+					$resql = $db->query($sql);
+					if ($resql) {
+						$currency = new MultiCurrency($db);
+						while ($obj = $db->fetch_object($resql)) {
+							$currency->fetch($obj->rowid);
+							$currencies[$currency->code] = $currency->rate->rate;
+						}
+					}
+					$currencies = json_encode($currencies);
+
+					print <<<SCRIPT
     <script type="text/javascript">
         function update_price_from_multicurrency() {
             var multicurrency_price = $('input[name="multicurrency_price"]').val();
@@ -696,14 +696,14 @@ 
         });
     </script>
 SCRIPT;
-                } else {
-                    // Price qty min
-                    print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMin").'</td>';
-                    print '<td><input class="flat" name="price" size="8" value="'.(GETPOST('price') ? price(GETPOST('price')) : (isset($object->fourn_price) ? price($object->fourn_price) : '')).'">';
-                    print '&nbsp;';
-                    print $form->selectPriceBaseType((GETPOST('price_base_type') ? GETPOST('price_base_type') : 'HT'), "price_base_type"); // We keep 'HT' here, price_base_type is not yet supported for supplier prices
-                    print '</td></tr>';
-                }
+				} else {
+					// Price qty min
+					print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMin").'</td>';
+					print '<td><input class="flat" name="price" size="8" value="'.(GETPOST('price') ? price(GETPOST('price')) : (isset($object->fourn_price) ? price($object->fourn_price) : '')).'">';
+					print '&nbsp;';
+					print $form->selectPriceBaseType((GETPOST('price_base_type') ? GETPOST('price_base_type') : 'HT'), "price_base_type"); // We keep 'HT' here, price_base_type is not yet supported for supplier prices
+					print '</td></tr>';
+				}
 
 
 				// Discount qty min
@@ -724,23 +724,23 @@ 
 				print '</td></tr>';
 
 				// Barcode
-                if (!empty($conf->barcode->enabled))
-                {
-				    // Option to define a transport cost on supplier price
-                    print '<tr>';
-                    print '<td>'.$langs->trans('BarcodeValue').'</td>';
-                    print '<td><input class="flat" name="barcode"  value="'.($rowid ? $object->fourn_barcode : '').'"></td>';
-                    print '</tr>';
-                    $formbarcode = new FormBarCode($db);
-
-                    // Barcode type
-                    print '<tr>';
-                    print '<td>'.$langs->trans('BarcodeType').'</td>';
-                    print '<td>';
-                    print $formbarcode->selectBarcodeType(($rowid ? $object->fourn_fk_barcode_type : $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE), 'fk_barcode_type', 1);
-                    print '</td>';
-                    print '</tr>';
-                }
+				if (!empty($conf->barcode->enabled))
+				{
+					// Option to define a transport cost on supplier price
+					print '<tr>';
+					print '<td>'.$langs->trans('BarcodeValue').'</td>';
+					print '<td><input class="flat" name="barcode"  value="'.($rowid ? $object->fourn_barcode : '').'"></td>';
+					print '</tr>';
+					$formbarcode = new FormBarCode($db);
+
+					// Barcode type
+					print '<tr>';
+					print '<td>'.$langs->trans('BarcodeType').'</td>';
+					print '<td>';
+					print $formbarcode->selectBarcodeType(($rowid ? $object->fourn_fk_barcode_type : $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE), 'fk_barcode_type', 1);
+					print '</td>';
+					print '</tr>';
+				}
 
 				// Option to define a transport cost on supplier price
 				if ($conf->global->PRODUCT_CHARGES)
@@ -750,7 +750,7 @@ 
 						print '<tr>';
 						print '<td>'.$langs->trans("Charges").'</td>';
 						print '<td><input class="flat" name="charges" size="8" value="'.(GETPOST('charges') ?price(GETPOST('charges')) : (isset($object->fourn_charges) ?price($object->fourn_charges) : '')).'">';
-		        		print '</td>';
+						print '</td>';
 						print '</tr>';
 					}
 				}
@@ -758,69 +758,69 @@ 
 				// Product description of the supplier
 				if (!empty($conf->global->PRODUIT_FOURN_TEXTS))
 				{
-				    //WYSIWYG Editor
-				    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+					//WYSIWYG Editor
+					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-    				print '<tr>';
-    				print '<td>'.$langs->trans('ProductSupplierDescription').'</td>';
-    				print '<td>';
+					print '<tr>';
+					print '<td>'.$langs->trans('ProductSupplierDescription').'</td>';
+					print '<td>';
 
-    				$doleditor = new DolEditor('supplier_description', $object->desc_supplier, '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
-    				$doleditor->Create();
+					$doleditor = new DolEditor('supplier_description', $object->desc_supplier, '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
+					$doleditor->Create();
 
-    				print '</td>';
-    				print '</tr>';
+					print '</td>';
+					print '</tr>';
 				}
 
-                // Extrafields
+				// Extrafields
 				$extrafields->fetch_name_optionals_label("product_fournisseur_price");
 				$extralabels = $extrafields->attributes["product_fournisseur_price"]['label'];
-                $extrafield_values = $extrafields->getOptionalsFromPost("product_fournisseur_price");
+				$extrafield_values = $extrafields->getOptionalsFromPost("product_fournisseur_price");
 				if (!empty($extralabels)) {
-                    if (empty($rowid)) {
-                        foreach ($extralabels as $key => $value) {
-                            if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && ($extrafields->attributes["product_fournisseur_price"]['list'][$key] == 1 || $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 3 || ($action == "update_price" && $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 4))) {
-                                if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) $langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
-
-                                print '<tr><td'.($extrafields->attributes["product_fournisseur_price"]['required'][$key] ? ' class="fieldrequired"' : '').'>';
-                                if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) print $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
-                                else print $langs->trans($value);
-                                print '</td><td>'.$extrafields->showInputField($key, GETPOSTISSET('options_'.$key) ? $extrafield_values['options_'.$key] : '', '', '', '', '', 0, 'product_fournisseur_price').'</td></tr>';
-                            }
-                        }
-                    } else {
-                        $sql  = "SELECT";
-                        $sql .= " fk_object";
-                        foreach ($extralabels as $key => $value) {
-                            $sql .= ", ".$key;
-                        }
-                        $sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields";
-                        $sql .= " WHERE fk_object = ".$rowid;
-                        $resql = $db->query($sql);
-                        if ($resql) {
-                            $obj = $db->fetch_object($resql);
-                            foreach ($extralabels as $key => $value) {
-                                if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && ($extrafields->attributes["product_fournisseur_price"]['list'][$key] == 1 || $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 3 || ($action == "update_price" && $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 4))) {
-                                    if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) $langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
-
-                                    print '<tr><td'.($extrafields->attributes["product_fournisseur_price"]['required'][$key] ? ' class="fieldrequired"' : '').'>';
-                                    if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) print $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
-                                    else print $langs->trans($value);
-                                    print '</td><td>'.$extrafields->showInputField($key, GETPOSTISSET('options_'.$key) ? $extrafield_values['options_'.$key] : $obj->{$key}, '', '', '', '', 0, 'product_fournisseur_price');
-
-                                    print '</td></tr>';
-                                }
-                            }
-                            $db->free($resql);
-                        }
-                    }
+					if (empty($rowid)) {
+						foreach ($extralabels as $key => $value) {
+							if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && ($extrafields->attributes["product_fournisseur_price"]['list'][$key] == 1 || $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 3 || ($action == "update_price" && $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 4))) {
+								if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) $langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
+
+								print '<tr><td'.($extrafields->attributes["product_fournisseur_price"]['required'][$key] ? ' class="fieldrequired"' : '').'>';
+								if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) print $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
+								else print $langs->trans($value);
+								print '</td><td>'.$extrafields->showInputField($key, GETPOSTISSET('options_'.$key) ? $extrafield_values['options_'.$key] : '', '', '', '', '', 0, 'product_fournisseur_price').'</td></tr>';
+							}
+						}
+					} else {
+						$sql  = "SELECT";
+						$sql .= " fk_object";
+						foreach ($extralabels as $key => $value) {
+							$sql .= ", ".$key;
+						}
+						$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields";
+						$sql .= " WHERE fk_object = ".$rowid;
+						$resql = $db->query($sql);
+						if ($resql) {
+							$obj = $db->fetch_object($resql);
+							foreach ($extralabels as $key => $value) {
+								if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && ($extrafields->attributes["product_fournisseur_price"]['list'][$key] == 1 || $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 3 || ($action == "update_price" && $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 4))) {
+									if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) $langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
+
+									print '<tr><td'.($extrafields->attributes["product_fournisseur_price"]['required'][$key] ? ' class="fieldrequired"' : '').'>';
+									if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) print $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
+									else print $langs->trans($value);
+									print '</td><td>'.$extrafields->showInputField($key, GETPOSTISSET('options_'.$key) ? $extrafield_values['options_'.$key] : $obj->{$key}, '', '', '', '', 0, 'product_fournisseur_price');
+
+									print '</td></tr>';
+								}
+							}
+							$db->free($resql);
+						}
+					}
 				}
 
 				if (is_object($hookmanager))
 				{
 					$parameters = array('id_fourn'=>$id_fourn, 'prod_id'=>$object->id);
-				    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
-                    print $hookmanager->resPrint;
+					$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
+					print $hookmanager->resPrint;
 				}
 
 				print '</table>';
@@ -931,8 +931,8 @@ 
 				if (!empty($arrayfields['pfp.quantity']['checked']))				print_liste_field_titre("QtyMin", $_SERVER["PHP_SELF"], "pfp.quantity", "", $param, '', $sortfield, $sortorder, 'right ');
 				print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
 				print_liste_field_titre("PriceQtyMinHT", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-                if ($conf->multicurrency->enabled)									print_liste_field_titre("PriceQtyMinHTCurrency", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-                if (!empty($arrayfields['pfp.unitprice']['checked']))				print_liste_field_titre("UnitPriceHT", $_SERVER["PHP_SELF"], "pfp.unitprice", "", $param, '', $sortfield, $sortorder, 'right ');
+				if ($conf->multicurrency->enabled)									print_liste_field_titre("PriceQtyMinHTCurrency", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+				if (!empty($arrayfields['pfp.unitprice']['checked']))				print_liste_field_titre("UnitPriceHT", $_SERVER["PHP_SELF"], "pfp.unitprice", "", $param, '', $sortfield, $sortorder, 'right ');
 				if (!empty($arrayfields['pfp.multicurrency_unitprice']['checked']))	print_liste_field_titre("UnitPriceHTCurrency", $_SERVER["PHP_SELF"], "pfp.multicurrency_unitprice", "", $param, '', $sortfield, $sortorder, 'right ');
 				if ($conf->multicurrency->enabled)									print_liste_field_titre("Currency", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
 				print_liste_field_titre("DiscountQtyMin", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
@@ -951,8 +951,8 @@ 
 					foreach ($extralabels as $key => $value) {
 						// Show field if not hidden
 						if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
-                            if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) $langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
-                            if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) $extratitle = $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
+							if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) $langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
+							if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) $extratitle = $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
 							else $extratitle = $langs->trans($value);
 							if (!empty($arrayfields['ef.'.$key]['checked'])) print_liste_field_titre($extratitle, $_SERVER["PHP_SELF"], 'ef.'.$key, '', $param, '', $sortfield, $sortorder, 'right ');
 						}
@@ -961,8 +961,8 @@ 
 
 				if (is_object($hookmanager))
 				{
-				    $parameters = array('id_fourn'=>$id_fourn, 'prod_id'=>$object->id);
-				    $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action);
+					$parameters = array('id_fourn'=>$id_fourn, 'prod_id'=>$object->id);
+					$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action);
 				}
 				print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 				print "</tr>\n";
@@ -995,7 +995,7 @@ 
 						if (!empty($arrayfields['pfp.fk_availability']['checked']))
 						{
 							$form->load_cache_availability();
-                			$availability = $form->cache_availability[$productfourn->fk_availability]['label'];
+							$availability = $form->cache_availability[$productfourn->fk_availability]['label'];
 							print '<td class="left">'.$availability.'</td>';
 						}
 
@@ -1023,12 +1023,12 @@ 
 						print $productfourn->fourn_price ?price($productfourn->fourn_price) : "";
 						print '</td>';
 
-                        if ($conf->multicurrency->enabled) {
-                            // Price for the quantity in currency
-                            print '<td class="right">';
-                            print $productfourn->fourn_multicurrency_price ? price($productfourn->fourn_multicurrency_price) : "";
-                            print '</td>';
-                        }
+						if ($conf->multicurrency->enabled) {
+							// Price for the quantity in currency
+							print '<td class="right">';
+							print $productfourn->fourn_multicurrency_price ? price($productfourn->fourn_multicurrency_price) : "";
+							print '</td>';
+						}
 
 						// Unit price
 						if (!empty($arrayfields['pfp.unitprice']['checked'])) {
@@ -1040,16 +1040,16 @@ 
 
 						// Unit price in currency
 						if (!empty($arrayfields['pfp.multicurrency_unitprice']['checked'])) {
-                            print '<td class="right">';
-                            print price($productfourn->fourn_multicurrency_unitprice);
-                            print '</td>';}
+							print '<td class="right">';
+							print price($productfourn->fourn_multicurrency_unitprice);
+							print '</td>';}
 
 						// Currency
-                        if ($conf->multicurrency->enabled) {
-                            print '<td class="right">';
-                            print $productfourn->fourn_multicurrency_code ? currency_name($productfourn->fourn_multicurrency_code) : '';
-                            print '</td>';
-                        }
+						if ($conf->multicurrency->enabled) {
+							print '<td class="right">';
+							print $productfourn->fourn_multicurrency_code ? currency_name($productfourn->fourn_multicurrency_code) : '';
+							print '</td>';
+						}
 
 						// Discount
 						print '<td class="right">';
@@ -1074,18 +1074,18 @@ 
 
 						// Barcode
 						if (!empty($arrayfields['pfp.barcode']['checked'])) {
-                            print '<td align="right">';
-                            print $productfourn->barcode;
+							print '<td align="right">';
+							print $productfourn->barcode;
 							print '</td>';
 						}
 
 						// Barcode type
 						if (!empty($arrayfields['pfp.fk_barcode_type']['checked'])) {
-                            print '<td class="center">';
-                            $productfourn->barcode_type = !empty($productfourn->fk_barcode_type) ? $productfourn->fk_barcode_type : 0;
-                            $productfourn->fetch_barcode();
-                            print $productfourn->barcode_type_label ? $productfourn->barcode_type_label : ($productfourn->barcode ? '<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>' : '');
-                            print '</td>';
+							print '<td class="center">';
+							$productfourn->barcode_type = !empty($productfourn->fk_barcode_type) ? $productfourn->fk_barcode_type : 0;
+							$productfourn->fetch_barcode();
+							print $productfourn->barcode_type_label ? $productfourn->barcode_type_label : ($productfourn->barcode ? '<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>' : '');
+							print '</td>';
 						}
 
 						// Packaging
@@ -1104,37 +1104,37 @@ 
 
 						// Extrafields
 						if (!empty($extralabels)) {
-                            $sql  = "SELECT";
-                            $sql .= " fk_object";
-                            foreach ($extralabels as $key => $value) {
-                                $sql .= ", ".$key;
-                            }
-                            $sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields";
-                            $sql .= " WHERE fk_object = ".$productfourn->product_fourn_price_id;
-                            $resql = $db->query($sql);
-                            if ($resql) {
-                                if ($db->num_rows($resql) != 1) {
-                                    foreach ($extralabels as $key => $value) {
-                                        if (!empty($arrayfields['ef.'.$key]['checked']) && !empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
-                                            print "<td></td>";
-                                        }
-                                    }
-                                } else {
-                                    $obj = $db->fetch_object($resql);
-                                    foreach ($extralabels as $key => $value) {
-                                        if (!empty($arrayfields['ef.'.$key]['checked']) && !empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
-                                            print '<td align="right">'.$extrafields->showOutputField($key, $obj->{$key})."</td>";
-                                        }
-                                    }
-                                }
-                                $db->free($resql);
-                            }
+							$sql  = "SELECT";
+							$sql .= " fk_object";
+							foreach ($extralabels as $key => $value) {
+								$sql .= ", ".$key;
+							}
+							$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields";
+							$sql .= " WHERE fk_object = ".$productfourn->product_fourn_price_id;
+							$resql = $db->query($sql);
+							if ($resql) {
+								if ($db->num_rows($resql) != 1) {
+									foreach ($extralabels as $key => $value) {
+										if (!empty($arrayfields['ef.'.$key]['checked']) && !empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
+											print "<td></td>";
+										}
+									}
+								} else {
+									$obj = $db->fetch_object($resql);
+									foreach ($extralabels as $key => $value) {
+										if (!empty($arrayfields['ef.'.$key]['checked']) && !empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
+											print '<td align="right">'.$extrafields->showOutputField($key, $obj->{$key})."</td>";
+										}
+									}
+								}
+								$db->free($resql);
+							}
 						}
 
 						if (is_object($hookmanager))
 						{
 							$parameters = array('id_pfp'=>$productfourn->product_fourn_price_id, 'id_fourn'=>$id_fourn, 'prod_id'=>$object->id);
-						    $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action);
+							$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action);
 						}
 
 						// Modify-Remove
@@ -1152,7 +1152,7 @@ 
 						print '</tr>';
 					}
 				} else {
-				    dol_print_error($db);
+					dol_print_error($db);
 				}
 
 				print '</table>';