alxarafe / alixar

dolibarr/htdocs/takepos/floors.php

Braces +42 added lines, -16 removed lines

@@ -19,11 +19,21 @@ 
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))		define('NOCSRFCHECK','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('NOCSRFCHECK')) {
+    define('NOCSRFCHECK','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');
+}
 
 $_GET['theme']="md"; // Force theme. MD theme provides better look and feel to TakePOS
 
@@ -32,7 +42,9 @@ 
 $langs->loadLangs(array("bills","orders","commercial","cashdesk"));
 
 $floor=GETPOST('floor','alpha');
-if ($floor=="") $floor=1;
+if ($floor=="") {
+    $floor=1;
+}
 $id = GETPOST('id','int');
 $action = GETPOST('action','alpha');
 $left = GETPOST('left','alpha');
@@ -54,16 +66,26 @@ 
 
 if ($action=="update")
 {
-    if ($left>95) $left=95;
-    if ($top>95) $top=95;
-    if ($left>3 or $top>4) $db->query("update ".MAIN_DB_PREFIX."takepos_floor_tables set leftpos=$left, toppos=$top where label='$place'");
-    else $db->query("delete from ".MAIN_DB_PREFIX."takepos_floor_tables where label='$place'");
-}
+    if ($left>95) {
+        $left=95;
+    }
+    if ($top>95) {
+        $top=95;
+    }
+    if ($left>3 or $top>4) {
+        $db->query("update ".MAIN_DB_PREFIX."takepos_floor_tables set leftpos=$left, toppos=$top where label='$place'");
+    } else {
+        $db->query("delete from ".MAIN_DB_PREFIX."takepos_floor_tables where label='$place'");
+    }
+    }
 
 if ($action=="updatename")
 {
 	$newname = preg_replace("/[^a-zA-Z0-9\s]/", "", $newname); // Only English chars
-	if (strlen($newname) > 3) $newname = substr($newname, 0, 3); // Only 3 chars
+	if (strlen($newname) > 3) {
+	    $newname = substr($newname, 0, 3);
+	}
+	// Only 3 chars
     $db->query("update ".MAIN_DB_PREFIX."takepos_floor_tables set label='$newname' where label='$place'");
 }
 
@@ -75,7 +97,9 @@ 
 
 // Title
 $title='TakePOS - Dolibarr '.DOL_VERSION;
-if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title='TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+if (! empty($conf->global->MAIN_APPLICATION_TITLE)) {
+    $title='TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+}
 top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 ?>
 <link rel="stylesheet" href="css/pos.css?a=xxx">
@@ -147,8 +171,7 @@ 
 			$('#'+val.label).draggable().bind('click', function(){
 				$(this).focus();
 			})
-			<?php }
-			else {?>
+			<?php } else {?>
 			$('body').append('<div class="tablediv" onclick="LoadPlace('+val.label+');" style="position: absolute; left: '+val.leftpos+'%; top: '+val.toppos+'%;" id="'+val.label+'">'+val.label+'</div>');
 			<?php } ?>
 		});
@@ -171,7 +194,10 @@ 
 
 <div style="position: absolute; left: 25%; bottom: 8%; width:50%; height:3%;">
     <center>
-    <h1><img src="./img/arrow-prev.png" width="5%" onclick="location.href='floors.php?floor=<?php if ($floor>1) { $floor--; echo $floor; $floor++;} else echo "1"; ?>';"><?php echo $langs->trans("Floor")." ".$floor; ?><img src="./img/arrow-next.png" width="5%" onclick="location.href='floors.php?floor=<?php $floor++; echo $floor; ?>';"></h1>
+    <h1><img src="./img/arrow-prev.png" width="5%" onclick="location.href='floors.php?floor=<?php if ($floor>1) { $floor--; echo $floor; $floor++;} else {
+    echo "1";
+}
+?>';"><?php echo $langs->trans("Floor")." ".$floor; ?><img src="./img/arrow-next.png" width="5%" onclick="location.href='floors.php?floor=<?php $floor++; echo $floor; ?>';"></h1>
     </center>
 </div>
 </body>

Indentation +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
 require DOL_BASE_PATH . '/main.inc.php';
-	// Load $user and permissions
+    // Load $user and permissions
 
 $langs->loadLangs(array("bills","orders","commercial","cashdesk"));
 
@@ -66,15 +66,15 @@ 
 
 if ($action=="updatename")
 {
-	$newname = preg_replace("/[^a-zA-Z0-9\s]/", "", $newname); // Only English chars
-	if (strlen($newname) > 3) $newname = substr($newname, 0, 3); // Only 3 chars
+    $newname = preg_replace("/[^a-zA-Z0-9\s]/", "", $newname); // Only English chars
+    if (strlen($newname) > 3) $newname = substr($newname, 0, 3); // Only 3 chars
     $db->query("update ".MAIN_DB_PREFIX."takepos_floor_tables set label='$newname' where label='$place'");
 }
 
 if ($action=="add")
 {
     $asdf=$db->query("insert into ".MAIN_DB_PREFIX."takepos_floor_tables values ('', '', '', '45', '45', $floor)");
-	$db->query("update ".MAIN_DB_PREFIX."takepos_floor_tables set label=rowid where label=''"); // No empty table names
+    $db->query("update ".MAIN_DB_PREFIX."takepos_floor_tables set label=rowid where label=''"); // No empty table names
 }
 
 // Title
@@ -152,7 +152,7 @@ 
 				$(this).focus();
 			})
 			<?php }
-			else {?>
+            else {?>
 			$('body').append('<div class="tablediv" onclick="LoadPlace('+val.label+');" style="position: absolute; left: '+val.leftpos+'%; top: '+val.toppos+'%;" id="'+val.label+'">'+val.label+'</div>');
 			<?php } ?>
 		});

Spacing +36 added lines, -36 removed lines

@@ -19,67 +19,67 @@ 
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))		define('NOCSRFCHECK','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('NOCSRFCHECK'))		define('NOCSRFCHECK', '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');
 
-$_GET['theme']="md"; // Force theme. MD theme provides better look and feel to TakePOS
+$_GET['theme'] = "md"; // Force theme. MD theme provides better look and feel to TakePOS
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 	// Load $user and permissions
 
-$langs->loadLangs(array("bills","orders","commercial","cashdesk"));
+$langs->loadLangs(array("bills", "orders", "commercial", "cashdesk"));
 
-$floor=GETPOST('floor','alpha');
-if ($floor=="") $floor=1;
-$id = GETPOST('id','int');
-$action = GETPOST('action','alpha');
-$left = GETPOST('left','alpha');
-$top = GETPOST('top','alpha');
-$place = GETPOST('place','int');
+$floor = GETPOST('floor', 'alpha');
+if ($floor == "") $floor = 1;
+$id = GETPOST('id', 'int');
+$action = GETPOST('action', 'alpha');
+$left = GETPOST('left', 'alpha');
+$top = GETPOST('top', 'alpha');
+$place = GETPOST('place', 'int');
 $newname = GETPOST('newname');
-$mode = GETPOST('mode','alpha');
+$mode = GETPOST('mode', 'alpha');
 
-if ($action=="getTables"){
-    $sql="SELECT * from ".MAIN_DB_PREFIX."takepos_floor_tables where floor=".$floor;
+if ($action == "getTables") {
+    $sql = "SELECT * from ".MAIN_DB_PREFIX."takepos_floor_tables where floor=".$floor;
     $resql = $db->query($sql);
     $rows = array();
-    while($row = $db->fetch_array ($resql)){
+    while ($row = $db->fetch_array($resql)) {
         $rows[] = $row;
     }
     echo json_encode($rows);
     exit;
 }
 
-if ($action=="update")
+if ($action == "update")
 {
-    if ($left>95) $left=95;
-    if ($top>95) $top=95;
-    if ($left>3 or $top>4) $db->query("update ".MAIN_DB_PREFIX."takepos_floor_tables set leftpos=$left, toppos=$top where label='$place'");
+    if ($left > 95) $left = 95;
+    if ($top > 95) $top = 95;
+    if ($left > 3 or $top > 4) $db->query("update ".MAIN_DB_PREFIX."takepos_floor_tables set leftpos=$left, toppos=$top where label='$place'");
     else $db->query("delete from ".MAIN_DB_PREFIX."takepos_floor_tables where label='$place'");
 }
 
-if ($action=="updatename")
+if ($action == "updatename")
 {
 	$newname = preg_replace("/[^a-zA-Z0-9\s]/", "", $newname); // Only English chars
 	if (strlen($newname) > 3) $newname = substr($newname, 0, 3); // Only 3 chars
     $db->query("update ".MAIN_DB_PREFIX."takepos_floor_tables set label='$newname' where label='$place'");
 }
 
-if ($action=="add")
+if ($action == "add")
 {
-    $asdf=$db->query("insert into ".MAIN_DB_PREFIX."takepos_floor_tables values ('', '', '', '45', '45', $floor)");
+    $asdf = $db->query("insert into ".MAIN_DB_PREFIX."takepos_floor_tables values ('', '', '', '45', '45', $floor)");
 	$db->query("update ".MAIN_DB_PREFIX."takepos_floor_tables set label=rowid where label=''"); // No empty table names
 }
 
 // Title
-$title='TakePOS - Dolibarr '.DOL_VERSION;
-if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title='TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+$title = 'TakePOS - Dolibarr '.DOL_VERSION;
+if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
 top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 ?>
 <link rel="stylesheet" href="css/pos.css?a=xxx">
@@ -110,7 +110,7 @@ 
 		url: "floors.php",
 		data: { action: "update", left: left, top: top, place: idplace }
 		}).done(function( msg ) {
-		window.location.href='floors.php?mode=edit&floor=<?php echo $floor;?>';
+		window.location.href='floors.php?mode=edit&floor=<?php echo $floor; ?>';
 	});
 }
 
@@ -121,7 +121,7 @@ 
 		url: "floors.php",
 		data: { action: "updatename", place: before, newname: after }
 		}).done(function( msg ) {
-		window.location.href='floors.php?mode=edit&floor=<?php echo $floor;?>';
+		window.location.href='floors.php?mode=edit&floor=<?php echo $floor; ?>';
 		});
 	}
 
@@ -133,7 +133,7 @@ 
 $( document ).ready(function() {
 	$.getJSON('./floors.php?action=getTables&floor=<?php echo $floor; ?>', function(data) {
         $.each(data, function(key, val) {
-			<?php if ($mode=="edit"){?>
+			<?php if ($mode == "edit") {?>
 			$('body').append('<div class="tablediv" contenteditable onblur="updatename('+val.label+');" style="position: absolute; left: '+val.leftpos+'%; top: '+val.toppos+'%;" id="'+val.label+'">'+val.label+'</div>');
 			$( "#"+val.label ).draggable(
 				{
@@ -162,12 +162,12 @@ 
 </script>
 </head>
 <body style="overflow: hidden">
-<?php if ($user->admin){?>
+<?php if ($user->admin) {?>
 <div style="position: absolute; left: 0.1%; top: 0.8%; width:8%; height:11%;">
-<?php if ($mode=="edit"){?>
-<a id="add" onclick="window.location.href='floors.php?mode=edit&action=add&floor=<?php echo $floor;?>';"><?php echo $langs->trans("AddTable"); ?></a>
+<?php if ($mode == "edit") {?>
+<a id="add" onclick="window.location.href='floors.php?mode=edit&action=add&floor=<?php echo $floor; ?>';"><?php echo $langs->trans("AddTable"); ?></a>
 <?php } else { ?>
-<a onclick="window.location.href='floors.php?mode=edit&floor=<?php echo $floor;?>';"><?php echo $langs->trans("Edit"); ?></a>
+<a onclick="window.location.href='floors.php?mode=edit&floor=<?php echo $floor; ?>';"><?php echo $langs->trans("Edit"); ?></a>
 <?php } ?>
 </div>
 <?php }
@@ -175,7 +175,7 @@ 
 
 <div style="position: absolute; left: 25%; bottom: 8%; width:50%; height:3%;">
     <center>
-    <h1><img src="./img/arrow-prev.png" width="5%" onclick="location.href='floors.php?floor=<?php if ($floor>1) { $floor--; echo $floor; $floor++;} else echo "1"; ?>';"><?php echo $langs->trans("Floor")." ".$floor; ?><img src="./img/arrow-next.png" width="5%" onclick="location.href='floors.php?floor=<?php $floor++; echo $floor; ?>';"></h1>
+    <h1><img src="./img/arrow-prev.png" width="5%" onclick="location.href='floors.php?floor=<?php if ($floor > 1) { $floor--; echo $floor; $floor++; } else echo "1"; ?>';"><?php echo $langs->trans("Floor")." ".$floor; ?><img src="./img/arrow-next.png" width="5%" onclick="location.href='floors.php?floor=<?php $floor++; echo $floor; ?>';"></h1>
     </center>
 </div>
 </body>

dolibarr/htdocs/takepos/admin/about.php

Indentation +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 // Access control
 if (! $user->admin) {
-	accessforbidden();
+    accessforbidden();
 }
 
 // Parameters

Spacing +4 added lines, -4 removed lines

@@ -25,16 +25,16 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';	// Load $user and permissions
+require DOL_BASE_PATH.'/main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once '../lib/takepos.lib.php';
 
 // Translations
-$langs->loadLangs(array("errors","admin","cashdesk"));
+$langs->loadLangs(array("errors", "admin", "cashdesk"));
 
 // Access control
-if (! $user->admin) {
+if (!$user->admin) {
 	accessforbidden();
 }
 
@@ -60,7 +60,7 @@ 
 llxHeader('', $langs->trans($page_name));
 
 // Subheader
-$linkback = '<a href="'.($backtopage?$backtopage:DOL_URL_ROOT.'/admin/modules.php').'">'.$langs->trans("BackToModuleList").'</a>';
+$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php').'">'.$langs->trans("BackToModuleList").'</a>';
 
 print load_fiche_titre($langs->trans($page_name), $linkback, 'object_takepos@takepos');
 

dolibarr/htdocs/takepos/admin/setup.php

Indentation +79 added lines, -79 removed lines

@@ -29,9 +29,9 @@ 
 // If socid provided by ajax company selector
 if (! empty($_REQUEST['CASHDESK_ID_THIRDPARTY_id']))
 {
-	$_GET['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id','alpha');
-	$_POST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id','alpha');
-	$_REQUEST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id','alpha');
+    $_GET['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id','alpha');
+    $_POST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id','alpha');
+    $_REQUEST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id','alpha');
 }
 
 // Security check
@@ -44,35 +44,35 @@ 
  */
 if (GETPOST('action','alpha') == 'set')
 {
-	$db->begin();
-
-	if (GETPOST('socid','int') < 0) $_POST["socid"]='';
-
-	$res = dolibarr_set_const($db,"CASHDESK_ID_THIRDPARTY",(GETPOST('socid','int') > 0 ? GETPOST('socid','int') : ''),'chaine',0,'',$conf->entity);
-	$res = dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT_CASH",(GETPOST('CASHDESK_ID_BANKACCOUNT_CASH','alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CASH','alpha') : ''),'chaine',0,'',$conf->entity);
-	$res = dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT_CHEQUE",(GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE','alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE','alpha') : ''),'chaine',0,'',$conf->entity);
-	$res = dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT_CB",(GETPOST('CASHDESK_ID_BANKACCOUNT_CB','alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CB','alpha') : ''),'chaine',0,'',$conf->entity);
-	$res = dolibarr_set_const($db,"CASHDESK_ID_WAREHOUSE",(GETPOST('CASHDESK_ID_WAREHOUSE','alpha') > 0 ? GETPOST('CASHDESK_ID_WAREHOUSE','alpha') : ''),'chaine',0,'',$conf->entity);
-	$res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",GETPOST('CASHDESK_NO_DECREASE_STOCK','alpha'),'chaine',0,'',$conf->entity);
-	$res = dolibarr_set_const($db,"CASHDESK_SERVICES", GETPOST('CASHDESK_SERVICES','alpha'),'chaine',0,'',$conf->entity);
-	$res = dolibarr_set_const($db,"TAKEPOSCONNECTOR", GETPOST('TAKEPOSCONNECTOR','alpha'),'chaine',0,'',$conf->entity);
-	$res = dolibarr_set_const($db,"TAKEPOS_BAR_RESTAURANT", GETPOST('TAKEPOS_BAR_RESTAURANT','alpha'),'chaine',0,'',$conf->entity);
+    $db->begin();
+
+    if (GETPOST('socid','int') < 0) $_POST["socid"]='';
+
+    $res = dolibarr_set_const($db,"CASHDESK_ID_THIRDPARTY",(GETPOST('socid','int') > 0 ? GETPOST('socid','int') : ''),'chaine',0,'',$conf->entity);
+    $res = dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT_CASH",(GETPOST('CASHDESK_ID_BANKACCOUNT_CASH','alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CASH','alpha') : ''),'chaine',0,'',$conf->entity);
+    $res = dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT_CHEQUE",(GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE','alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE','alpha') : ''),'chaine',0,'',$conf->entity);
+    $res = dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT_CB",(GETPOST('CASHDESK_ID_BANKACCOUNT_CB','alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CB','alpha') : ''),'chaine',0,'',$conf->entity);
+    $res = dolibarr_set_const($db,"CASHDESK_ID_WAREHOUSE",(GETPOST('CASHDESK_ID_WAREHOUSE','alpha') > 0 ? GETPOST('CASHDESK_ID_WAREHOUSE','alpha') : ''),'chaine',0,'',$conf->entity);
+    $res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",GETPOST('CASHDESK_NO_DECREASE_STOCK','alpha'),'chaine',0,'',$conf->entity);
+    $res = dolibarr_set_const($db,"CASHDESK_SERVICES", GETPOST('CASHDESK_SERVICES','alpha'),'chaine',0,'',$conf->entity);
+    $res = dolibarr_set_const($db,"TAKEPOSCONNECTOR", GETPOST('TAKEPOSCONNECTOR','alpha'),'chaine',0,'',$conf->entity);
+    $res = dolibarr_set_const($db,"TAKEPOS_BAR_RESTAURANT", GETPOST('TAKEPOS_BAR_RESTAURANT','alpha'),'chaine',0,'',$conf->entity);
     $res = dolibarr_set_const($db,"TAKEPOS_PRINT_SERVER", GETPOST('TAKEPOS_PRINT_SERVER','alpha'),'chaine',0,'',$conf->entity);
-	$res = dolibarr_set_const($db,"TAKEPOS_ORDER_PRINTERS", GETPOST('TAKEPOS_ORDER_PRINTERS','alpha'),'chaine',0,'',$conf->entity);
+    $res = dolibarr_set_const($db,"TAKEPOS_ORDER_PRINTERS", GETPOST('TAKEPOS_ORDER_PRINTERS','alpha'),'chaine',0,'',$conf->entity);
 
-	dol_syslog("admin/cashdesk: level ".GETPOST('level','alpha'));
+    dol_syslog("admin/cashdesk: level ".GETPOST('level','alpha'));
 
-	if (! $res > 0) $error++;
+    if (! $res > 0) $error++;
 
- 	if (! $error)
+        if (! $error)
     {
         $db->commit();
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
     else
     {
         $db->rollback();
-	    setEventMessages($langs->trans("Error"), null, 'errors');
+        setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
 
@@ -103,11 +103,11 @@ 
 
 if (! empty($conf->service->enabled))
 {
-	print '<tr class="oddeven"><td>';
-	print $langs->trans("CashdeskShowServices");
-	print '<td colspan="2">';
-	print $form->selectyesno("CASHDESK_SERVICES",$conf->global->CASHDESK_SERVICES,1);
-	print "</td></tr>\n";
+    print '<tr class="oddeven"><td>';
+    print $langs->trans("CashdeskShowServices");
+    print '<td colspan="2">';
+    print $form->selectyesno("CASHDESK_SERVICES",$conf->global->CASHDESK_SERVICES,1);
+    print "</td></tr>\n";
 }
 
 // Use Takepos printing
@@ -118,11 +118,11 @@ 
 print "</td></tr>\n";
 
 if ($conf->global->TAKEPOSCONNECTOR){
-	print '<tr class="oddeven value"><td>';
-	print $langs->trans("IPAddress").' (<a href="http://en.takepos.com/connector">'.$langs->trans("TakeposConnectorNecesary").'</a>)';
-	print '<td colspan="2">';
-	print '<input type="text" size="20" id="TAKEPOS_PRINT_SERVER" name="TAKEPOS_PRINT_SERVER" value="'.$conf->global->TAKEPOS_PRINT_SERVER.'">';
-	print '</td></tr>';
+    print '<tr class="oddeven value"><td>';
+    print $langs->trans("IPAddress").' (<a href="http://en.takepos.com/connector">'.$langs->trans("TakeposConnectorNecesary").'</a>)';
+    print '<td colspan="2">';
+    print '<input type="text" size="20" id="TAKEPOS_PRINT_SERVER" name="TAKEPOS_PRINT_SERVER" value="'.$conf->global->TAKEPOS_PRINT_SERVER.'">';
+    print '</td></tr>';
 }
 
 // Bar Restaurant mode
@@ -133,11 +133,11 @@ 
 print "</td></tr>\n";
 
 if ($conf->global->TAKEPOS_BAR_RESTAURANT && $conf->global->TAKEPOSCONNECTOR){
-	print '<tr class="oddeven value"><td>';
-	print $langs->trans("OrderPrinters").' (<a href="orderprinters.php?leftmenu=setup">'.$langs->trans("Setup").'</a>)';
-	print '<td colspan="2">';
-	print $form->selectyesno("TAKEPOS_ORDER_PRINTERS",$conf->global->TAKEPOS_ORDER_PRINTERS,1);
-	print '</td></tr>';
+    print '<tr class="oddeven value"><td>';
+    print $langs->trans("OrderPrinters").' (<a href="orderprinters.php?leftmenu=setup">'.$langs->trans("Setup").'</a>)';
+    print '<td colspan="2">';
+    print $form->selectyesno("TAKEPOS_ORDER_PRINTERS",$conf->global->TAKEPOS_ORDER_PRINTERS,1);
+    print '</td></tr>';
 }
 
 print '</table>';
@@ -157,57 +157,57 @@ 
 if (! empty($conf->banque->enabled))
 {
 
-	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForSell").'</td>';
-	print '<td colspan="2">';
-	$form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CASH,'CASHDESK_ID_BANKACCOUNT_CASH',0,"courant=2",1);
-	print '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForSell").'</td>';
+    print '<td colspan="2">';
+    $form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CASH,'CASHDESK_ID_BANKACCOUNT_CASH',0,"courant=2",1);
+    print '</td></tr>';
 
 
-	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForCheque").'</td>';
-	print '<td colspan="2">';
-	$form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE,'CASHDESK_ID_BANKACCOUNT_CHEQUE',0,"courant=1",1);
-	print '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForCheque").'</td>';
+    print '<td colspan="2">';
+    $form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE,'CASHDESK_ID_BANKACCOUNT_CHEQUE',0,"courant=1",1);
+    print '</td></tr>';
 
 
-	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForCB").'</td>';
-	print '<td colspan="2">';
-	$form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CB,'CASHDESK_ID_BANKACCOUNT_CB',0,"courant=1",1);
-	print '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForCB").'</td>';
+    print '<td colspan="2">';
+    $form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CB,'CASHDESK_ID_BANKACCOUNT_CB',0,"courant=1",1);
+    print '</td></tr>';
 }
 
 if (! empty($conf->stock->enabled))
 {
 
-	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskDoNotDecreaseStock").'</td>';	// Force warehouse (this is not a default value)
-	print '<td colspan="2">';
-	if (empty($conf->productbatch->enabled)) {
-	   print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK',$conf->global->CASHDESK_NO_DECREASE_STOCK,1);
-	}
-	else
-	{
-	    if (!$conf->global->CASHDESK_NO_DECREASE_STOCK) {
-	       $res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",1,'chaine',0,'',$conf->entity);
-	    }
-	    print $langs->trans("Yes").'<br>';
-	    print '<span class="opacitymedium">'.$langs->trans('StockDecreaseForPointOfSaleDisabledbyBatch').'</span>';
-	}
-	print '</td></tr>';
-
-	$disabled=$conf->global->CASHDESK_NO_DECREASE_STOCK;
-
-
-	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskIdWareHouse").'</td>';	// Force warehouse (this is not a default value)
-	print '<td colspan="2">';
-	if (! $disabled)
-	{
-		print $formproduct->selectWarehouses($conf->global->CASHDESK_ID_WAREHOUSE,'CASHDESK_ID_WAREHOUSE','',1,$disabled);
-		print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">('.$langs->trans("Create").')</a>';
-	}
-	else
-	{
-		print '<span class="opacitymedium">'.$langs->trans("StockDecreaseForPointOfSaleDisabled").'</span>';
-	}
-	print '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("CashDeskDoNotDecreaseStock").'</td>';	// Force warehouse (this is not a default value)
+    print '<td colspan="2">';
+    if (empty($conf->productbatch->enabled)) {
+        print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK',$conf->global->CASHDESK_NO_DECREASE_STOCK,1);
+    }
+    else
+    {
+        if (!$conf->global->CASHDESK_NO_DECREASE_STOCK) {
+            $res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",1,'chaine',0,'',$conf->entity);
+        }
+        print $langs->trans("Yes").'<br>';
+        print '<span class="opacitymedium">'.$langs->trans('StockDecreaseForPointOfSaleDisabledbyBatch').'</span>';
+    }
+    print '</td></tr>';
+
+    $disabled=$conf->global->CASHDESK_NO_DECREASE_STOCK;
+
+
+    print '<tr class="oddeven"><td>'.$langs->trans("CashDeskIdWareHouse").'</td>';	// Force warehouse (this is not a default value)
+    print '<td colspan="2">';
+    if (! $disabled)
+    {
+        print $formproduct->selectWarehouses($conf->global->CASHDESK_ID_WAREHOUSE,'CASHDESK_ID_WAREHOUSE','',1,$disabled);
+        print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">('.$langs->trans("Create").')</a>';
+    }
+    else
+    {
+        print '<span class="opacitymedium">'.$langs->trans("StockDecreaseForPointOfSaleDisabled").'</span>';
+    }
+    print '</td></tr>';
 }
 
 print '</table>';

Braces +12 added lines, -9 removed lines

@@ -35,7 +35,9 @@ 
 }
 
 // Security check
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+    accessforbidden();
+}
 
 $langs->loadLangs(array("admin", "cashdesk"));
 
@@ -46,7 +48,9 @@ 
 {
 	$db->begin();
 
-	if (GETPOST('socid','int') < 0) $_POST["socid"]='';
+	if (GETPOST('socid','int') < 0) {
+	    $_POST["socid"]='';
+	}
 
 	$res = dolibarr_set_const($db,"CASHDESK_ID_THIRDPARTY",(GETPOST('socid','int') > 0 ? GETPOST('socid','int') : ''),'chaine',0,'',$conf->entity);
 	$res = dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT_CASH",(GETPOST('CASHDESK_ID_BANKACCOUNT_CASH','alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CASH','alpha') : ''),'chaine',0,'',$conf->entity);
@@ -62,14 +66,15 @@ 
 
 	dol_syslog("admin/cashdesk: level ".GETPOST('level','alpha'));
 
-	if (! $res > 0) $error++;
+	if (! $res > 0) {
+	    $error++;
+	}
 
  	if (! $error)
     {
         $db->commit();
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
+    } else
     {
         $db->rollback();
 	    setEventMessages($langs->trans("Error"), null, 'errors');
@@ -182,8 +187,7 @@ 
 	print '<td colspan="2">';
 	if (empty($conf->productbatch->enabled)) {
 	   print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK',$conf->global->CASHDESK_NO_DECREASE_STOCK,1);
-	}
-	else
+	} else
 	{
 	    if (!$conf->global->CASHDESK_NO_DECREASE_STOCK) {
 	       $res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",1,'chaine',0,'',$conf->entity);
@@ -202,8 +206,7 @@ 
 	{
 		print $formproduct->selectWarehouses($conf->global->CASHDESK_ID_WAREHOUSE,'CASHDESK_ID_WAREHOUSE','',1,$disabled);
 		print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">('.$langs->trans("Create").')</a>';
-	}
-	else
+	} else
 	{
 		print '<span class="opacitymedium">'.$langs->trans("StockDecreaseForPointOfSaleDisabled").'</span>';
 	}

Spacing +47 added lines, -47 removed lines

@@ -25,16 +25,16 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';	// Load $user and permissions
+require DOL_BASE_PATH.'/main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 
 // If socid provided by ajax company selector
-if (! empty($_REQUEST['CASHDESK_ID_THIRDPARTY_id']))
+if (!empty($_REQUEST['CASHDESK_ID_THIRDPARTY_id']))
 {
-	$_GET['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id','alpha');
-	$_POST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id','alpha');
-	$_REQUEST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id','alpha');
+	$_GET['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha');
+	$_POST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha');
+	$_REQUEST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha');
 }
 
 // Security check
@@ -45,29 +45,29 @@ 
 /*
  * Actions
  */
-if (GETPOST('action','alpha') == 'set')
+if (GETPOST('action', 'alpha') == 'set')
 {
 	$db->begin();
 
-	if (GETPOST('socid','int') < 0) $_POST["socid"]='';
+	if (GETPOST('socid', 'int') < 0) $_POST["socid"] = '';
 
-	$res = dolibarr_set_const($db,"CASHDESK_ID_THIRDPARTY",(GETPOST('socid','int') > 0 ? GETPOST('socid','int') : ''),'chaine',0,'',$conf->entity);
-	$res = dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT_CASH",(GETPOST('CASHDESK_ID_BANKACCOUNT_CASH','alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CASH','alpha') : ''),'chaine',0,'',$conf->entity);
-	$res = dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT_CHEQUE",(GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE','alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE','alpha') : ''),'chaine',0,'',$conf->entity);
-	$res = dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT_CB",(GETPOST('CASHDESK_ID_BANKACCOUNT_CB','alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CB','alpha') : ''),'chaine',0,'',$conf->entity);
-	$res = dolibarr_set_const($db,"CASHDESK_ID_WAREHOUSE",(GETPOST('CASHDESK_ID_WAREHOUSE','alpha') > 0 ? GETPOST('CASHDESK_ID_WAREHOUSE','alpha') : ''),'chaine',0,'',$conf->entity);
-	$res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",GETPOST('CASHDESK_NO_DECREASE_STOCK','alpha'),'chaine',0,'',$conf->entity);
-	$res = dolibarr_set_const($db,"CASHDESK_SERVICES", GETPOST('CASHDESK_SERVICES','alpha'),'chaine',0,'',$conf->entity);
-	$res = dolibarr_set_const($db,"TAKEPOSCONNECTOR", GETPOST('TAKEPOSCONNECTOR','alpha'),'chaine',0,'',$conf->entity);
-	$res = dolibarr_set_const($db,"TAKEPOS_BAR_RESTAURANT", GETPOST('TAKEPOS_BAR_RESTAURANT','alpha'),'chaine',0,'',$conf->entity);
-    $res = dolibarr_set_const($db,"TAKEPOS_PRINT_SERVER", GETPOST('TAKEPOS_PRINT_SERVER','alpha'),'chaine',0,'',$conf->entity);
-	$res = dolibarr_set_const($db,"TAKEPOS_ORDER_PRINTERS", GETPOST('TAKEPOS_ORDER_PRINTERS','alpha'),'chaine',0,'',$conf->entity);
+	$res = dolibarr_set_const($db, "CASHDESK_ID_THIRDPARTY", (GETPOST('socid', 'int') > 0 ? GETPOST('socid', 'int') : ''), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CASH", (GETPOST('CASHDESK_ID_BANKACCOUNT_CASH', 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CASH', 'alpha') : ''), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CHEQUE", (GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE', 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE', 'alpha') : ''), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CB", (GETPOST('CASHDESK_ID_BANKACCOUNT_CB', 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CB', 'alpha') : ''), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "CASHDESK_ID_WAREHOUSE", (GETPOST('CASHDESK_ID_WAREHOUSE', 'alpha') > 0 ? GETPOST('CASHDESK_ID_WAREHOUSE', 'alpha') : ''), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", GETPOST('CASHDESK_NO_DECREASE_STOCK', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "CASHDESK_SERVICES", GETPOST('CASHDESK_SERVICES', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOSCONNECTOR", GETPOST('TAKEPOSCONNECTOR', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_BAR_RESTAURANT", GETPOST('TAKEPOS_BAR_RESTAURANT', 'alpha'), 'chaine', 0, '', $conf->entity);
+    $res = dolibarr_set_const($db, "TAKEPOS_PRINT_SERVER", GETPOST('TAKEPOS_PRINT_SERVER', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTERS", GETPOST('TAKEPOS_ORDER_PRINTERS', 'alpha'), 'chaine', 0, '', $conf->entity);
 
-	dol_syslog("admin/cashdesk: level ".GETPOST('level','alpha'));
+	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
 
-	if (! $res > 0) $error++;
+	if (!$res > 0) $error++;
 
- 	if (! $error)
+ 	if (!$error)
     {
         $db->commit();
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -83,13 +83,13 @@ 
  * View
  */
 
-$form=new Form($db);
-$formproduct=new FormProduct($db);
+$form = new Form($db);
+$formproduct = new FormProduct($db);
 
-llxHeader('',$langs->trans("CashDeskSetup"));
+llxHeader('', $langs->trans("CashDeskSetup"));
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)',$linkback,'title_setup');
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
 print '<br>';
 
 
@@ -104,12 +104,12 @@ 
 print '<td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-if (! empty($conf->service->enabled))
+if (!empty($conf->service->enabled))
 {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("CashdeskShowServices");
 	print '<td colspan="2">';
-	print $form->selectyesno("CASHDESK_SERVICES",$conf->global->CASHDESK_SERVICES,1);
+	print $form->selectyesno("CASHDESK_SERVICES", $conf->global->CASHDESK_SERVICES, 1);
 	print "</td></tr>\n";
 }
 
@@ -117,10 +117,10 @@ 
 print '<tr class="oddeven"><td>';
 print $langs->trans("DolibarrReceiptPrinter").' (<a href="http://en.takepos.com/connector">'.$langs->trans("TakeposConnectorNecesary").'</a>)';
 print '<td colspan="2">';
-print $form->selectyesno("TAKEPOSCONNECTOR",$conf->global->TAKEPOSCONNECTOR,1);
+print $form->selectyesno("TAKEPOSCONNECTOR", $conf->global->TAKEPOSCONNECTOR, 1);
 print "</td></tr>\n";
 
-if ($conf->global->TAKEPOSCONNECTOR){
+if ($conf->global->TAKEPOSCONNECTOR) {
 	print '<tr class="oddeven value"><td>';
 	print $langs->trans("IPAddress").' (<a href="http://en.takepos.com/connector">'.$langs->trans("TakeposConnectorNecesary").'</a>)';
 	print '<td colspan="2">';
@@ -132,14 +132,14 @@ 
 print '<tr class="oddeven"><td>';
 print 'Bar Restaurant';
 print '<td colspan="2">';
-print $form->selectyesno("TAKEPOS_BAR_RESTAURANT",$conf->global->TAKEPOS_BAR_RESTAURANT,1);
+print $form->selectyesno("TAKEPOS_BAR_RESTAURANT", $conf->global->TAKEPOS_BAR_RESTAURANT, 1);
 print "</td></tr>\n";
 
-if ($conf->global->TAKEPOS_BAR_RESTAURANT && $conf->global->TAKEPOSCONNECTOR){
+if ($conf->global->TAKEPOS_BAR_RESTAURANT && $conf->global->TAKEPOSCONNECTOR) {
 	print '<tr class="oddeven value"><td>';
 	print $langs->trans("OrderPrinters").' (<a href="orderprinters.php?leftmenu=setup">'.$langs->trans("Setup").'</a>)';
 	print '<td colspan="2">';
-	print $form->selectyesno("TAKEPOS_ORDER_PRINTERS",$conf->global->TAKEPOS_ORDER_PRINTERS,1);
+	print $form->selectyesno("TAKEPOS_ORDER_PRINTERS", $conf->global->TAKEPOS_ORDER_PRINTERS, 1);
 	print '</td></tr>';
 }
 
@@ -157,53 +157,53 @@ 
 print '<td colspan="2">';
 print $form->select_company($conf->global->CASHDESK_ID_THIRDPARTY, 'socid', 's.client in (1,3) AND s.status = 1', 1, 0, 0, array(), 0);
 print '</td></tr>';
-if (! empty($conf->banque->enabled))
+if (!empty($conf->banque->enabled))
 {
 
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForSell").'</td>';
 	print '<td colspan="2">';
-	$form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CASH,'CASHDESK_ID_BANKACCOUNT_CASH',0,"courant=2",1);
+	$form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CASH, 'CASHDESK_ID_BANKACCOUNT_CASH', 0, "courant=2", 1);
 	print '</td></tr>';
 
 
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForCheque").'</td>';
 	print '<td colspan="2">';
-	$form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE,'CASHDESK_ID_BANKACCOUNT_CHEQUE',0,"courant=1",1);
+	$form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE, 'CASHDESK_ID_BANKACCOUNT_CHEQUE', 0, "courant=1", 1);
 	print '</td></tr>';
 
 
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForCB").'</td>';
 	print '<td colspan="2">';
-	$form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CB,'CASHDESK_ID_BANKACCOUNT_CB',0,"courant=1",1);
+	$form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CB, 'CASHDESK_ID_BANKACCOUNT_CB', 0, "courant=1", 1);
 	print '</td></tr>';
 }
 
-if (! empty($conf->stock->enabled))
+if (!empty($conf->stock->enabled))
 {
 
-	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskDoNotDecreaseStock").'</td>';	// Force warehouse (this is not a default value)
+	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskDoNotDecreaseStock").'</td>'; // Force warehouse (this is not a default value)
 	print '<td colspan="2">';
 	if (empty($conf->productbatch->enabled)) {
-	   print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK',$conf->global->CASHDESK_NO_DECREASE_STOCK,1);
+	   print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK', $conf->global->CASHDESK_NO_DECREASE_STOCK, 1);
 	}
 	else
 	{
 	    if (!$conf->global->CASHDESK_NO_DECREASE_STOCK) {
-	       $res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",1,'chaine',0,'',$conf->entity);
+	       $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", 1, 'chaine', 0, '', $conf->entity);
 	    }
 	    print $langs->trans("Yes").'<br>';
 	    print '<span class="opacitymedium">'.$langs->trans('StockDecreaseForPointOfSaleDisabledbyBatch').'</span>';
 	}
 	print '</td></tr>';
 
-	$disabled=$conf->global->CASHDESK_NO_DECREASE_STOCK;
+	$disabled = $conf->global->CASHDESK_NO_DECREASE_STOCK;
 
 
-	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskIdWareHouse").'</td>';	// Force warehouse (this is not a default value)
+	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskIdWareHouse").'</td>'; // Force warehouse (this is not a default value)
 	print '<td colspan="2">';
-	if (! $disabled)
+	if (!$disabled)
 	{
-		print $formproduct->selectWarehouses($conf->global->CASHDESK_ID_WAREHOUSE,'CASHDESK_ID_WAREHOUSE','',1,$disabled);
+		print $formproduct->selectWarehouses($conf->global->CASHDESK_ID_WAREHOUSE, 'CASHDESK_ID_WAREHOUSE', '', 1, $disabled);
 		print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">('.$langs->trans("Create").')</a>';
 	}
 	else
@@ -231,7 +231,7 @@ 
 print '</tr>';
 
 print "<tr class=\"oddeven\">\n";
-$url='https://www.dolistore.com/en/modules/980-TakePOS-7-mobile.html';
+$url = 'https://www.dolistore.com/en/modules/980-TakePOS-7-mobile.html';
 print '<td align="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="../img/marketplace/takeposmobile.jpg"></a></td>';
 print '<td>TakePOS for mobile devices</td>';
 print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
@@ -248,7 +248,7 @@ 
 print '</tr>';
 
 print "<tr class=\"oddeven\">\n";
-$url='http://www.takepos.com';
+$url = 'http://www.takepos.com';
 print '<td align="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="../img/takepos.png"></a></td>';
 print '<td>TakePOS original developers</td>';
 print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';

dolibarr/htdocs/takepos/admin/orderprinters.php

Indentation +53 added lines, -53 removed lines

@@ -49,19 +49,19 @@ 
  * Actions
  */
 if ($action=="SavePrinter1"){
-	$printedcategories=";";
-	if (is_array($printer1)) foreach ($printer1 as $cat){
-		$printedcategories=$printedcategories.$cat.";";
-	}
-	dolibarr_set_const($db,"TAKEPOS_PRINTED_CATEGORIES_1", $printedcategories,'chaine',0,'',$conf->entity);
+    $printedcategories=";";
+    if (is_array($printer1)) foreach ($printer1 as $cat){
+        $printedcategories=$printedcategories.$cat.";";
+    }
+    dolibarr_set_const($db,"TAKEPOS_PRINTED_CATEGORIES_1", $printedcategories,'chaine',0,'',$conf->entity);
 }
 
 if ($action=="SavePrinter2"){
-	$printedcategories=";";
-	if (is_array($printer2)) foreach ($printer2 as $cat){
-		$printedcategories=$printedcategories.$cat.";";
-	}
-	dolibarr_set_const($db,"TAKEPOS_PRINTED_CATEGORIES_2", $printedcategories,'chaine',0,'',$conf->entity);
+    $printedcategories=";";
+    if (is_array($printer2)) foreach ($printer2 as $cat){
+        $printedcategories=$printedcategories.$cat.";";
+    }
+    dolibarr_set_const($db,"TAKEPOS_PRINTED_CATEGORIES_2", $printedcategories,'chaine',0,'',$conf->entity);
 }
 
 
@@ -116,19 +116,19 @@ 
 $data[] = array('rowid'=>0,'fk_menu'=>-1,'title'=>"racine",'mainmenu'=>'','leftmenu'=>'','fk_mainmenu'=>'','fk_leftmenu'=>'');
 foreach($fulltree as $key => $val)
 {
-	$categstatic->id=$val['id'];
-	$categstatic->ref=$val['label'];
-	$categstatic->color=$val['color'];
-	$categstatic->type=$type;
-	$li=$categstatic->getNomUrl(1,'',60);
-	$desc=dol_htmlcleanlastbr($val['description']);
-
-	$data[] = array(
-	'rowid'=>$val['rowid'],
-	'fk_menu'=>$val['fk_menu'],
-	'fk_menu'=>$val['fk_parent'],
-	'label'=>$val['label']
-	);
+    $categstatic->id=$val['id'];
+    $categstatic->ref=$val['label'];
+    $categstatic->color=$val['color'];
+    $categstatic->type=$type;
+    $li=$categstatic->getNomUrl(1,'',60);
+    $desc=dol_htmlcleanlastbr($val['description']);
+
+    $data[] = array(
+    'rowid'=>$val['rowid'],
+    'fk_menu'=>$val['fk_menu'],
+    'fk_menu'=>$val['fk_parent'],
+    'label'=>$val['label']
+    );
 }
 
 //Printer1
@@ -139,24 +139,24 @@ 
 print '<form action="orderprinters.php">';
 if ($nbofentries > 0)
 {
-	print '<tr class="pair"><td colspan="3">';
-	print '<input type="hidden" name="action" value="SavePrinter1">';
-	foreach ($data as $row) {
-		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_1, ';'.$row["rowid"].';') !== false) $checked='checked'; else $checked='';
-		if ($row["fk_menu"]==0) print '<input type="checkbox" name="printer1[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
-	}
-	print '</td></tr>';
+    print '<tr class="pair"><td colspan="3">';
+    print '<input type="hidden" name="action" value="SavePrinter1">';
+    foreach ($data as $row) {
+        if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_1, ';'.$row["rowid"].';') !== false) $checked='checked'; else $checked='';
+        if ($row["fk_menu"]==0) print '<input type="checkbox" name="printer1[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
+    }
+    print '</td></tr>';
 }
 else
 {
-	print '<tr class="pair">';
-	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('','treemenu/branchbottom.gif').'</td>';
-	print '<td valign="middle">';
-	print $langs->trans("NoCategoryYet");
-	print '</td>';
-	print '<td>&nbsp;</td>';
-	print '</table></td>';
-	print '</tr>';
+    print '<tr class="pair">';
+    print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('','treemenu/branchbottom.gif').'</td>';
+    print '<td valign="middle">';
+    print $langs->trans("NoCategoryYet");
+    print '</td>';
+    print '<td>&nbsp;</td>';
+    print '</table></td>';
+    print '</tr>';
 }
 print "</table>";
 print '<input type="submit" value="'.$langs->trans("Save").'"></form><br><br>';
@@ -169,24 +169,24 @@ 
 print '<form action="orderprinters.php">';
 if ($nbofentries > 0)
 {
-	print '<tr class="pair"><td colspan="3">';
-	print '<input type="hidden" name="action" value="SavePrinter2">';
-	foreach ($data as $row) {
-		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_2, ';'.$row["rowid"].';') !== false) $checked='checked'; else $checked='';
-		if ($row["fk_menu"]==0) print '<input type="checkbox" name="printer2[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
-	}
-	print '</td></tr>';
+    print '<tr class="pair"><td colspan="3">';
+    print '<input type="hidden" name="action" value="SavePrinter2">';
+    foreach ($data as $row) {
+        if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_2, ';'.$row["rowid"].';') !== false) $checked='checked'; else $checked='';
+        if ($row["fk_menu"]==0) print '<input type="checkbox" name="printer2[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
+    }
+    print '</td></tr>';
 }
 else
 {
-	print '<tr class="pair">';
-	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('','treemenu/branchbottom.gif').'</td>';
-	print '<td valign="middle">';
-	print $langs->trans("NoCategoryYet");
-	print '</td>';
-	print '<td>&nbsp;</td>';
-	print '</table></td>';
-	print '</tr>';
+    print '<tr class="pair">';
+    print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('','treemenu/branchbottom.gif').'</td>';
+    print '<td valign="middle">';
+    print $langs->trans("NoCategoryYet");
+    print '</td>';
+    print '<td>&nbsp;</td>';
+    print '</table></td>';
+    print '</tr>';
 }
 print "</table>";
 print '<input type="submit" value="'.$langs->trans("Save").'"></form>';

Braces +32 added lines, -21 removed lines

@@ -34,7 +34,9 @@ 
 
 $langs->loadLangs(array("main"), "categories", "takepos", "printing");
 
-if (! $user->rights->categorie->lire) accessforbidden();
+if (! $user->rights->categorie->lire) {
+    accessforbidden();
+}
 
 $id=GETPOST('id','int');
 $type=(GETPOST('type','aZ09') ? GETPOST('type','aZ09') : Categorie::TYPE_PRODUCT);
@@ -43,24 +45,31 @@ 
 $printer1=GETPOST('printer1','alpha');
 $printer2=GETPOST('printer2','alpha');
 
-if (is_numeric($type)) $type=Categorie::$MAP_ID_TO_CODE[$type];	// For backward compatibility
+if (is_numeric($type)) {
+    $type=Categorie::$MAP_ID_TO_CODE[$type];
+}
+// For backward compatibility
 
 /*
  * Actions
  */
 if ($action=="SavePrinter1"){
 	$printedcategories=";";
-	if (is_array($printer1)) foreach ($printer1 as $cat){
+	if (is_array($printer1)) {
+	    foreach ($printer1 as $cat){
 		$printedcategories=$printedcategories.$cat.";";
 	}
+	}
 	dolibarr_set_const($db,"TAKEPOS_PRINTED_CATEGORIES_1", $printedcategories,'chaine',0,'',$conf->entity);
 }
 
 if ($action=="SavePrinter2"){
 	$printedcategories=";";
-	if (is_array($printer2)) foreach ($printer2 as $cat){
+	if (is_array($printer2)) {
+	    foreach ($printer2 as $cat){
 		$printedcategories=$printedcategories.$cat.";";
 	}
+	}
 	dolibarr_set_const($db,"TAKEPOS_PRINTED_CATEGORIES_2", $printedcategories,'chaine',0,'',$conf->entity);
 }
 
@@ -72,15 +81,7 @@ 
 $categstatic = new Categorie($db);
 $form = new Form($db);
 
-if ($type == Categorie::TYPE_PRODUCT)       { $title=$langs->trans("ProductsCategoriesArea");  $typetext='product'; }
-elseif ($type == Categorie::TYPE_SUPPLIER)  { $title=$langs->trans("SuppliersCategoriesArea"); $typetext='supplier'; }
-elseif ($type == Categorie::TYPE_CUSTOMER)  { $title=$langs->trans("CustomersCategoriesArea"); $typetext='customer'; }
-elseif ($type == Categorie::TYPE_MEMBER)    { $title=$langs->trans("MembersCategoriesArea");   $typetext='member'; }
-elseif ($type == Categorie::TYPE_CONTACT)   { $title=$langs->trans("ContactsCategoriesArea");  $typetext='contact'; }
-elseif ($type == Categorie::TYPE_ACCOUNT)   { $title=$langs->trans("AccountsCategoriesArea");  $typetext='bank_account'; }
-elseif ($type == Categorie::TYPE_PROJECT)   { $title=$langs->trans("ProjectsCategoriesArea");  $typetext='project'; }
-elseif ($type == Categorie::TYPE_USER)      { $title=$langs->trans("UsersCategoriesArea");     $typetext='user'; }
-else                                        { $title=$langs->trans("CategoriesArea");          $typetext='unknown'; }
+if ($type == Categorie::TYPE_PRODUCT)       { $title=$langs->trans("ProductsCategoriesArea");  $typetext='product'; } elseif ($type == Categorie::TYPE_SUPPLIER)  { $title=$langs->trans("SuppliersCategoriesArea"); $typetext='supplier'; } elseif ($type == Categorie::TYPE_CUSTOMER)  { $title=$langs->trans("CustomersCategoriesArea"); $typetext='customer'; } elseif ($type == Categorie::TYPE_MEMBER)    { $title=$langs->trans("MembersCategoriesArea");   $typetext='member'; } elseif ($type == Categorie::TYPE_CONTACT)   { $title=$langs->trans("ContactsCategoriesArea");  $typetext='contact'; } elseif ($type == Categorie::TYPE_ACCOUNT)   { $title=$langs->trans("AccountsCategoriesArea");  $typetext='bank_account'; } elseif ($type == Categorie::TYPE_PROJECT)   { $title=$langs->trans("ProjectsCategoriesArea");  $typetext='project'; } elseif ($type == Categorie::TYPE_USER)      { $title=$langs->trans("UsersCategoriesArea");     $typetext='user'; } else                                        { $title=$langs->trans("CategoriesArea");          $typetext='unknown'; }
 
 $arrayofjs=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
 $arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
@@ -142,12 +143,17 @@ 
 	print '<tr class="pair"><td colspan="3">';
 	print '<input type="hidden" name="action" value="SavePrinter1">';
 	foreach ($data as $row) {
-		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_1, ';'.$row["rowid"].';') !== false) $checked='checked'; else $checked='';
-		if ($row["fk_menu"]==0) print '<input type="checkbox" name="printer1[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
+		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_1, ';'.$row["rowid"].';') !== false) {
+		    $checked='checked';
+		} else {
+		    $checked='';
+		}
+		if ($row["fk_menu"]==0) {
+		    print '<input type="checkbox" name="printer1[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
+		}
 	}
 	print '</td></tr>';
-}
-else
+} else
 {
 	print '<tr class="pair">';
 	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('','treemenu/branchbottom.gif').'</td>';
@@ -172,12 +178,17 @@ 
 	print '<tr class="pair"><td colspan="3">';
 	print '<input type="hidden" name="action" value="SavePrinter2">';
 	foreach ($data as $row) {
-		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_2, ';'.$row["rowid"].';') !== false) $checked='checked'; else $checked='';
-		if ($row["fk_menu"]==0) print '<input type="checkbox" name="printer2[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
+		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_2, ';'.$row["rowid"].';') !== false) {
+		    $checked='checked';
+		} else {
+		    $checked='';
+		}
+		if ($row["fk_menu"]==0) {
+		    print '<input type="checkbox" name="printer2[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
+		}
 	}
 	print '</td></tr>';
-}
-else
+} else
 {
 	print '<tr class="pair">';
 	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('','treemenu/branchbottom.gif').'</td>';

Spacing +49 added lines, -49 removed lines

@@ -29,7 +29,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';	// Load $user and permissions
+require DOL_BASE_PATH.'/main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -37,34 +37,34 @@ 
 
 $langs->loadLangs(array("main"), "categories", "takepos", "printing");
 
-if (! $user->rights->categorie->lire) accessforbidden();
+if (!$user->rights->categorie->lire) accessforbidden();
 
-$id=GETPOST('id','int');
-$type=(GETPOST('type','aZ09') ? GETPOST('type','aZ09') : Categorie::TYPE_PRODUCT);
-$catname=GETPOST('catname','alpha');
-$action=GETPOST('action','alpha');
-$printer1=GETPOST('printer1','alpha');
-$printer2=GETPOST('printer2','alpha');
+$id = GETPOST('id', 'int');
+$type = (GETPOST('type', 'aZ09') ? GETPOST('type', 'aZ09') : Categorie::TYPE_PRODUCT);
+$catname = GETPOST('catname', 'alpha');
+$action = GETPOST('action', 'alpha');
+$printer1 = GETPOST('printer1', 'alpha');
+$printer2 = GETPOST('printer2', 'alpha');
 
-if (is_numeric($type)) $type=Categorie::$MAP_ID_TO_CODE[$type];	// For backward compatibility
+if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
 
 /*
  * Actions
  */
-if ($action=="SavePrinter1"){
-	$printedcategories=";";
-	if (is_array($printer1)) foreach ($printer1 as $cat){
-		$printedcategories=$printedcategories.$cat.";";
+if ($action == "SavePrinter1") {
+	$printedcategories = ";";
+	if (is_array($printer1)) foreach ($printer1 as $cat) {
+		$printedcategories = $printedcategories.$cat.";";
 	}
-	dolibarr_set_const($db,"TAKEPOS_PRINTED_CATEGORIES_1", $printedcategories,'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "TAKEPOS_PRINTED_CATEGORIES_1", $printedcategories, 'chaine', 0, '', $conf->entity);
 }
 
-if ($action=="SavePrinter2"){
-	$printedcategories=";";
-	if (is_array($printer2)) foreach ($printer2 as $cat){
-		$printedcategories=$printedcategories.$cat.";";
+if ($action == "SavePrinter2") {
+	$printedcategories = ";";
+	if (is_array($printer2)) foreach ($printer2 as $cat) {
+		$printedcategories = $printedcategories.$cat.";";
 	}
-	dolibarr_set_const($db,"TAKEPOS_PRINTED_CATEGORIES_2", $printedcategories,'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "TAKEPOS_PRINTED_CATEGORIES_2", $printedcategories, 'chaine', 0, '', $conf->entity);
 }
 
 
@@ -75,20 +75,20 @@ 
 $categstatic = new Categorie($db);
 $form = new Form($db);
 
-if ($type == Categorie::TYPE_PRODUCT)       { $title=$langs->trans("ProductsCategoriesArea");  $typetext='product'; }
-elseif ($type == Categorie::TYPE_SUPPLIER)  { $title=$langs->trans("SuppliersCategoriesArea"); $typetext='supplier'; }
-elseif ($type == Categorie::TYPE_CUSTOMER)  { $title=$langs->trans("CustomersCategoriesArea"); $typetext='customer'; }
-elseif ($type == Categorie::TYPE_MEMBER)    { $title=$langs->trans("MembersCategoriesArea");   $typetext='member'; }
-elseif ($type == Categorie::TYPE_CONTACT)   { $title=$langs->trans("ContactsCategoriesArea");  $typetext='contact'; }
-elseif ($type == Categorie::TYPE_ACCOUNT)   { $title=$langs->trans("AccountsCategoriesArea");  $typetext='bank_account'; }
-elseif ($type == Categorie::TYPE_PROJECT)   { $title=$langs->trans("ProjectsCategoriesArea");  $typetext='project'; }
-elseif ($type == Categorie::TYPE_USER)      { $title=$langs->trans("UsersCategoriesArea");     $typetext='user'; }
-else                                        { $title=$langs->trans("CategoriesArea");          $typetext='unknown'; }
+if ($type == Categorie::TYPE_PRODUCT) { $title = $langs->trans("ProductsCategoriesArea"); $typetext = 'product'; }
+elseif ($type == Categorie::TYPE_SUPPLIER) { $title = $langs->trans("SuppliersCategoriesArea"); $typetext = 'supplier'; }
+elseif ($type == Categorie::TYPE_CUSTOMER) { $title = $langs->trans("CustomersCategoriesArea"); $typetext = 'customer'; }
+elseif ($type == Categorie::TYPE_MEMBER) { $title = $langs->trans("MembersCategoriesArea"); $typetext = 'member'; }
+elseif ($type == Categorie::TYPE_CONTACT) { $title = $langs->trans("ContactsCategoriesArea"); $typetext = 'contact'; }
+elseif ($type == Categorie::TYPE_ACCOUNT) { $title = $langs->trans("AccountsCategoriesArea"); $typetext = 'bank_account'; }
+elseif ($type == Categorie::TYPE_PROJECT) { $title = $langs->trans("ProjectsCategoriesArea"); $typetext = 'project'; }
+elseif ($type == Categorie::TYPE_USER) { $title = $langs->trans("UsersCategoriesArea"); $typetext = 'user'; }
+else { $title = $langs->trans("CategoriesArea"); $typetext = 'unknown'; }
 
-$arrayofjs=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
-$arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
+$arrayofjs = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
+$arrayofcss = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
 
-llxHeader('',$title,'','',0,0,$arrayofjs,$arrayofcss);
+llxHeader('', $title, '', '', 0, 0, $arrayofjs, $arrayofcss);
 
 
 print load_fiche_titre($langs->trans("OrderPrinters"));
@@ -112,19 +112,19 @@ 
 $cate_arbo = $categstatic->get_full_arbo($typetext);
 
 // Define fulltree array
-$fulltree=$cate_arbo;
+$fulltree = $cate_arbo;
 
 // Define data (format for treeview)
-$data=array();
-$data[] = array('rowid'=>0,'fk_menu'=>-1,'title'=>"racine",'mainmenu'=>'','leftmenu'=>'','fk_mainmenu'=>'','fk_leftmenu'=>'');
-foreach($fulltree as $key => $val)
+$data = array();
+$data[] = array('rowid'=>0, 'fk_menu'=>-1, 'title'=>"racine", 'mainmenu'=>'', 'leftmenu'=>'', 'fk_mainmenu'=>'', 'fk_leftmenu'=>'');
+foreach ($fulltree as $key => $val)
 {
-	$categstatic->id=$val['id'];
-	$categstatic->ref=$val['label'];
-	$categstatic->color=$val['color'];
-	$categstatic->type=$type;
-	$li=$categstatic->getNomUrl(1,'',60);
-	$desc=dol_htmlcleanlastbr($val['description']);
+	$categstatic->id = $val['id'];
+	$categstatic->ref = $val['label'];
+	$categstatic->color = $val['color'];
+	$categstatic->type = $type;
+	$li = $categstatic->getNomUrl(1, '', 60);
+	$desc = dol_htmlcleanlastbr($val['description']);
 
 	$data[] = array(
 	'rowid'=>$val['rowid'],
@@ -138,22 +138,22 @@ 
 print '<table class="liste nohover" width="100%">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Printer").' 1</td><td></td><td align="right">';
 print '</td></tr>';
-$nbofentries=(count($data) - 1);
+$nbofentries = (count($data) - 1);
 print '<form action="orderprinters.php">';
 if ($nbofentries > 0)
 {
 	print '<tr class="pair"><td colspan="3">';
 	print '<input type="hidden" name="action" value="SavePrinter1">';
 	foreach ($data as $row) {
-		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_1, ';'.$row["rowid"].';') !== false) $checked='checked'; else $checked='';
-		if ($row["fk_menu"]==0) print '<input type="checkbox" name="printer1[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
+		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_1, ';'.$row["rowid"].';') !== false) $checked = 'checked'; else $checked = '';
+		if ($row["fk_menu"] == 0) print '<input type="checkbox" name="printer1[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
 	}
 	print '</td></tr>';
 }
 else
 {
 	print '<tr class="pair">';
-	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('','treemenu/branchbottom.gif').'</td>';
+	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
 	print '<td valign="middle">';
 	print $langs->trans("NoCategoryYet");
 	print '</td>';
@@ -168,22 +168,22 @@ 
 print '<table class="liste nohover" width="100%">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Printer").' 2</td><td></td><td align="right">';
 print '</td></tr>';
-$nbofentries=(count($data) - 1);
+$nbofentries = (count($data) - 1);
 print '<form action="orderprinters.php">';
 if ($nbofentries > 0)
 {
 	print '<tr class="pair"><td colspan="3">';
 	print '<input type="hidden" name="action" value="SavePrinter2">';
 	foreach ($data as $row) {
-		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_2, ';'.$row["rowid"].';') !== false) $checked='checked'; else $checked='';
-		if ($row["fk_menu"]==0) print '<input type="checkbox" name="printer2[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
+		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_2, ';'.$row["rowid"].';') !== false) $checked = 'checked'; else $checked = '';
+		if ($row["fk_menu"] == 0) print '<input type="checkbox" name="printer2[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
 	}
 	print '</td></tr>';
 }
 else
 {
 	print '<tr class="pair">';
-	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('','treemenu/branchbottom.gif').'</td>';
+	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
 	print '<td valign="middle">';
 	print $langs->trans("NoCategoryYet");
 	print '</td>';

dolibarr/htdocs/takepos/customers.php

Braces +583 added lines, -193 removed lines

@@ -70,7 +70,9 @@ 
 
 // Security check
 $socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user,'societe',$socid,'');
 
 $search_all=trim(GETPOST('search_all', 'alphanohtml')?GETPOST('search_all', 'alphanohtml'):GETPOST('sall', 'alphanohtml'));
@@ -121,8 +123,12 @@ 
 $sortfield=GETPOST("sortfield",'alpha');
 $sortorder=GETPOST("sortorder",'alpha');
 $page=GETPOST("page",'int');
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="s.nom";
+if (! $sortorder) {
+    $sortorder="ASC";
+}
+if (! $sortfield) {
+    $sortfield="s.nom";
+}
 if (empty($page) || $page == -1) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
@@ -134,9 +140,18 @@ 
 if ($search_type == '2,3') { $contextpage='prospectlist'; $type='p'; }
 if ($search_type == '4') { $contextpage='supplierlist'; $type='f'; }
 */
-if ($type == 'c') { $contextpage='customerlist'; if ($search_type=='') $search_type='1,3'; }
-if ($type == 'p') { $contextpage='prospectlist'; if ($search_type=='') $search_type='2,3'; }
-if ($type == 'f') { $contextpage='supplierlist'; if ($search_type=='') $search_type='4'; }
+if ($type == 'c') { $contextpage='customerlist'; if ($search_type=='') {
+    $search_type='1,3';
+}
+}
+if ($type == 'p') { $contextpage='prospectlist'; if ($search_type=='') {
+    $search_type='2,3';
+}
+}
+if ($type == 'f') { $contextpage='supplierlist'; if ($search_type=='') {
+    $search_type='4';
+}
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
@@ -161,10 +176,18 @@ 
 	's.siret'=>"ProfId2",
 	's.ape'=>"ProfId3",
 );
-if (($tmp = $langs->transnoentities("ProfId4".$mysoc->country_code)) && $tmp != "ProfId4".$mysoc->country_code && $tmp != '-') $fieldstosearchall['s.idprof4']='ProfId4';
-if (($tmp = $langs->transnoentities("ProfId5".$mysoc->country_code)) && $tmp != "ProfId5".$mysoc->country_code && $tmp != '-') $fieldstosearchall['s.idprof5']='ProfId5';
-if (($tmp = $langs->transnoentities("ProfId6".$mysoc->country_code)) && $tmp != "ProfId6".$mysoc->country_code && $tmp != '-') $fieldstosearchall['s.idprof6']='ProfId6';
-if (!empty($conf->barcode->enabled)) $fieldstosearchall['s.barcode']='Gencod';
+if (($tmp = $langs->transnoentities("ProfId4".$mysoc->country_code)) && $tmp != "ProfId4".$mysoc->country_code && $tmp != '-') {
+    $fieldstosearchall['s.idprof4']='ProfId4';
+}
+if (($tmp = $langs->transnoentities("ProfId5".$mysoc->country_code)) && $tmp != "ProfId5".$mysoc->country_code && $tmp != '-') {
+    $fieldstosearchall['s.idprof5']='ProfId5';
+}
+if (($tmp = $langs->transnoentities("ProfId6".$mysoc->country_code)) && $tmp != "ProfId6".$mysoc->country_code && $tmp != '-') {
+    $fieldstosearchall['s.idprof6']='ProfId6';
+}
+if (!empty($conf->barcode->enabled)) {
+    $fieldstosearchall['s.barcode']='Gencod';
+}
 
 // Define list of fields to show into list
 $checkedcustomercode=(in_array($contextpage, array('thirdpartylist', 'customerlist', 'prospectlist')) ? 1 : 0);
@@ -221,7 +244,9 @@ 
 {
    foreach($extrafields->attribute_label as $key => $val)
    {
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+		if (! empty($extrafields->attribute_list[$key])) {
+		    $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+		}
    }
 }
 
@@ -237,7 +262,9 @@ 
 
 $parameters=array();
 $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))
 {
@@ -245,9 +272,11 @@ 
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Did we click on purge search criteria ?
-	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) {
+	    // All tests are required to be compatible with all browsers
 	{
 		$search_id='';
+	}
 		$search_nom='';
 		$search_alias='';
 		$search_categ_cus=0;
@@ -297,13 +326,18 @@ 
 		$result=$object->fetch(GETPOST('stcommsocid'));
 		$object->stcomm_id=dol_getIdFromCode($db, GETPOST('stcomm','alpha'), 'c_stcomm');
 		$result=$object->update($object->id, $user);
-		if ($result < 0) setEventMessages($object->error,$object->errors,'errors');
+		if ($result < 0) {
+		    setEventMessages($object->error,$object->errors,'errors');
+		}
 
 		$action='';
 	}
 }
 
-if ($search_status=='') $search_status=1; // always display active thirdparty first
+if ($search_status=='') {
+    $search_status=1;
+}
+// always display active thirdparty first
 
 
 
@@ -330,9 +364,15 @@ 
 
 
 $title=$langs->trans("ListOfThirdParties");
-if ($type == 'c' && (empty($search_type) || ($search_type == '1,3'))) $title=$langs->trans("ListOfCustomers");
-if ($type == 'p' && (empty($search_type) || ($search_type == '2,3'))) $title=$langs->trans("ListOfProspects");
-if ($type == 'f' && (empty($search_type) || ($search_type == '4'))) $title=$langs->trans("ListOfSuppliers");
+if ($type == 'c' && (empty($search_type) || ($search_type == '1,3'))) {
+    $title=$langs->trans("ListOfCustomers");
+}
+if ($type == 'p' && (empty($search_type) || ($search_type == '2,3'))) {
+    $title=$langs->trans("ListOfProspects");
+}
+if ($type == 'f' && (empty($search_type) || ($search_type == '4'))) {
+    $title=$langs->trans("ListOfSuppliers");
+}
 
 // If both parameters are set, search for everything BETWEEN them
 if ($search_level_from != '' && $search_level_to != '')
@@ -393,7 +433,9 @@ 
 	{
 		// Compute level text
 		$level=$langs->trans($obj->code);
-		if ($level == $obj->code) $level=$langs->trans($obj->label);
+		if ($level == $obj->code) {
+		    $level=$langs->trans($obj->label);
+		}
 
 		// Put it in the array sorted by sortorder
 		$tab_level[$obj->sortorder] = $level;
@@ -408,8 +450,9 @@ 
 	// Implode the $search_levels array so that it can be use in a "IN (...)" where clause.
 	// If no paramters was set, $search_levels will be empty
 	$search_levels = implode(',', $search_levels);
+} else {
+    dol_print_error($db);
 }
-else dol_print_error($db);
 
 $sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.barcode, s.town, s.zip, s.datec, s.code_client, s.code_fournisseur, s.logo,";
 $sql.= " st.libelle as stcomm, s.fk_stcomm as stcomm_id, s.fk_prospectlevel, s.prefix_comm, s.client, s.fournisseur, s.canvas, s.status as status,";
@@ -420,76 +463,182 @@ 
 $sql.= " state.code_departement as state_code, state.nom as state_name,";
 $sql.= " region.code_region as region_code, region.nom as region_name";
 // We'll need these fields in order to filter by sale (including the case where the user can only see his prospects)
-if ($search_sale) $sql .= ", sc.fk_soc, sc.fk_user";
+if ($search_sale) {
+    $sql .= ", sc.fk_soc, sc.fk_user";
+}
 // We'll need these fields in order to filter by categ
-if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
-if ($search_categ_sup) $sql .= ", cs.fk_categorie, cs.fk_soc";
+if ($search_categ_cus) {
+    $sql .= ", cc.fk_categorie, cc.fk_soc";
+}
+if ($search_categ_sup) {
+    $sql .= ", cs.fk_categorie, cs.fk_soc";
+}
 // Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+foreach ($extrafields->attribute_label as $key => $val) {
+    $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+}
 // Add fields from hooks
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as ef on (s.rowid = ef.fk_object)";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as ef on (s.rowid = ef.fk_object)";
+}
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as region on (region.	code_region = state.fk_region)";
 // We'll need this table joined to the select in order to filter by categ
-if (! empty($search_categ_cus)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
-if (! empty($search_categ_sup)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cs ON s.rowid = cs.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+if (! empty($search_categ_cus)) {
+    $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc";
+}
+// We'll need this table joined to the select in order to filter by categ
+if (! empty($search_categ_sup)) {
+    $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cs ON s.rowid = cs.fk_soc";
+}
+// We'll need this table joined to the select in order to filter by categ
 $sql.= " ,".MAIN_DB_PREFIX."c_stcomm as st";
 // We'll need this table joined to the select in order to filter by sale
-if ($search_sale || (!$user->rights->societe->client->voir && !$socid)) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if ($search_sale || (!$user->rights->societe->client->voir && !$socid)) {
+    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql.= " WHERE s.fk_stcomm = st.id";
 $sql.= " AND s.entity IN (".getEntity('societe').")";
-if (! $user->rights->societe->client->voir && ! $socid)	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid)                $sql.= " AND s.rowid = ".$socid;
-if ($search_sale)          $sql.= " AND s.rowid = sc.fk_soc";        // Join for the needed table to filter by sale
-if (! $user->rights->fournisseur->lire) $sql.=" AND (s.fournisseur <> 1 OR s.client <> 0)";    // client=0, fournisseur=0 must be visible
-if ($search_sale)          $sql.= " AND sc.fk_user = ".$db->escape($search_sale);
-if ($search_categ_cus > 0) $sql.= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
-if ($search_categ_sup > 0) $sql.= " AND cs.fk_categorie = ".$db->escape($search_categ_sup);
-if ($search_categ_cus == -2)   $sql.= " AND cc.fk_categorie IS NULL";
-if ($search_categ_sup == -2)   $sql.= " AND cs.fk_categorie IS NULL";
-
-if ($search_all)           $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
-if (strlen($search_cti))   $sql.= natural_search('s.phone', $search_cti);
-
-if ($search_id > 0)        $sql.= natural_search("s.rowid",$search_id,1);
-if ($search_nom)           $sql.= natural_search("s.nom",$search_nom);
-if ($search_alias)         $sql.= natural_search("s.name_alias",$search_alias);
-if ($search_nom_only)      $sql.= natural_search("s.nom",$search_nom_only);
-if ($search_customer_code) $sql.= natural_search("s.code_client",$search_customer_code);
-if ($search_supplier_code) $sql.= natural_search("s.code_fournisseur",$search_supplier_code);
-if ($search_account_customer_code) $sql.= natural_search("s.code_compta",$search_account_customer_code);
-if ($search_account_supplier_code) $sql.= natural_search("s.code_compta_fournisseur",$search_account_supplier_code);
-if ($search_town)          $sql.= natural_search("s.town",$search_town);
-if (strlen($search_zip))   $sql.= natural_search("s.zip",$search_zip);
-if ($search_state)         $sql.= natural_search("state.nom",$search_state);
-if ($search_region)         $sql.= natural_search("region.nom",$search_region);
-if ($search_country)       $sql .= " AND s.fk_pays IN (".$search_country.')';
-if ($search_email)         $sql.= natural_search("s.email",$search_email);
-if (strlen($search_phone)) $sql.= natural_search("s.phone", $search_phone);
-if ($search_url)           $sql.= natural_search("s.url",$search_url);
-if (strlen($search_idprof1)) $sql.= natural_search("s.siren",$search_idprof1);
-if (strlen($search_idprof2)) $sql.= natural_search("s.siret",$search_idprof2);
-if (strlen($search_idprof3)) $sql.= natural_search("s.ape",$search_idprof3);
-if (strlen($search_idprof4)) $sql.= natural_search("s.idprof4",$search_idprof4);
-if (strlen($search_idprof5)) $sql.= natural_search("s.idprof5",$search_idprof5);
-if (strlen($search_idprof6)) $sql.= natural_search("s.idprof6",$search_idprof6);
-if (strlen($search_vat))     $sql.= natural_search("s.tva_intra",$search_vat);
+if (! $user->rights->societe->client->voir && ! $socid) {
+    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+}
+if ($socid) {
+    $sql.= " AND s.rowid = ".$socid;
+}
+if ($search_sale) {
+    $sql.= " AND s.rowid = sc.fk_soc";
+}
+// Join for the needed table to filter by sale
+if (! $user->rights->fournisseur->lire) {
+    $sql.=" AND (s.fournisseur <> 1 OR s.client <> 0)";
+}
+// client=0, fournisseur=0 must be visible
+if ($search_sale) {
+    $sql.= " AND sc.fk_user = ".$db->escape($search_sale);
+}
+if ($search_categ_cus > 0) {
+    $sql.= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
+}
+if ($search_categ_sup > 0) {
+    $sql.= " AND cs.fk_categorie = ".$db->escape($search_categ_sup);
+}
+if ($search_categ_cus == -2) {
+    $sql.= " AND cc.fk_categorie IS NULL";
+}
+if ($search_categ_sup == -2) {
+    $sql.= " AND cs.fk_categorie IS NULL";
+}
+
+if ($search_all) {
+    $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
+}
+if (strlen($search_cti)) {
+    $sql.= natural_search('s.phone', $search_cti);
+}
+
+if ($search_id > 0) {
+    $sql.= natural_search("s.rowid",$search_id,1);
+}
+if ($search_nom) {
+    $sql.= natural_search("s.nom",$search_nom);
+}
+if ($search_alias) {
+    $sql.= natural_search("s.name_alias",$search_alias);
+}
+if ($search_nom_only) {
+    $sql.= natural_search("s.nom",$search_nom_only);
+}
+if ($search_customer_code) {
+    $sql.= natural_search("s.code_client",$search_customer_code);
+}
+if ($search_supplier_code) {
+    $sql.= natural_search("s.code_fournisseur",$search_supplier_code);
+}
+if ($search_account_customer_code) {
+    $sql.= natural_search("s.code_compta",$search_account_customer_code);
+}
+if ($search_account_supplier_code) {
+    $sql.= natural_search("s.code_compta_fournisseur",$search_account_supplier_code);
+}
+if ($search_town) {
+    $sql.= natural_search("s.town",$search_town);
+}
+if (strlen($search_zip)) {
+    $sql.= natural_search("s.zip",$search_zip);
+}
+if ($search_state) {
+    $sql.= natural_search("state.nom",$search_state);
+}
+if ($search_region) {
+    $sql.= natural_search("region.nom",$search_region);
+}
+if ($search_country) {
+    $sql .= " AND s.fk_pays IN (".$search_country.')';
+}
+if ($search_email) {
+    $sql.= natural_search("s.email",$search_email);
+}
+if (strlen($search_phone)) {
+    $sql.= natural_search("s.phone", $search_phone);
+}
+if ($search_url) {
+    $sql.= natural_search("s.url",$search_url);
+}
+if (strlen($search_idprof1)) {
+    $sql.= natural_search("s.siren",$search_idprof1);
+}
+if (strlen($search_idprof2)) {
+    $sql.= natural_search("s.siret",$search_idprof2);
+}
+if (strlen($search_idprof3)) {
+    $sql.= natural_search("s.ape",$search_idprof3);
+}
+if (strlen($search_idprof4)) {
+    $sql.= natural_search("s.idprof4",$search_idprof4);
+}
+if (strlen($search_idprof5)) {
+    $sql.= natural_search("s.idprof5",$search_idprof5);
+}
+if (strlen($search_idprof6)) {
+    $sql.= natural_search("s.idprof6",$search_idprof6);
+}
+if (strlen($search_vat)) {
+    $sql.= natural_search("s.tva_intra",$search_vat);
+}
 // Filter on type of thirdparty
-if ($search_type > 0 && in_array($search_type,array('1,3','2,3'))) $sql .= " AND s.client IN (".$db->escape($search_type).")";
-if ($search_type > 0 && in_array($search_type,array('4')))         $sql .= " AND s.fournisseur = 1";
-if ($search_type == '0') $sql .= " AND s.client = 0 AND s.fournisseur = 0";
-if ($search_status!='' && $search_status >= 0) $sql .= " AND s.status = ".$db->escape($search_status);
-if (!empty($conf->barcode->enabled) && $search_barcode) $sql.= natural_search("s.barcode", $search_barcode);
-if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
-if ($search_levels)  $sql .= " AND s.fk_prospectlevel IN (".$search_levels.')';
-if ($search_stcomm != '' && $search_stcomm != -2) $sql.= natural_search("s.fk_stcomm",$search_stcomm,2);
-if ($search_import_key)    $sql.= natural_search("s.import_key",$search_import_key);
+if ($search_type > 0 && in_array($search_type,array('1,3','2,3'))) {
+    $sql .= " AND s.client IN (".$db->escape($search_type).")";
+}
+if ($search_type > 0 && in_array($search_type,array('4'))) {
+    $sql .= " AND s.fournisseur = 1";
+}
+if ($search_type == '0') {
+    $sql .= " AND s.client = 0 AND s.fournisseur = 0";
+}
+if ($search_status!='' && $search_status >= 0) {
+    $sql .= " AND s.status = ".$db->escape($search_status);
+}
+if (!empty($conf->barcode->enabled) && $search_barcode) {
+    $sql.= natural_search("s.barcode", $search_barcode);
+}
+if ($search_type_thirdparty) {
+    $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
+}
+if ($search_levels) {
+    $sql .= " AND s.fk_prospectlevel IN (".$search_levels.')';
+}
+if ($search_stcomm != '' && $search_stcomm != -2) {
+    $sql.= natural_search("s.fk_stcomm",$search_stcomm,2);
+}
+if ($search_import_key) {
+    $sql.= natural_search("s.import_key",$search_import_key);
+}
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 
@@ -533,44 +682,120 @@ 
 llxHeader('',$langs->trans("ThirdParty"),$help_url);
 
 $param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if ($search_all != '')     $param = "&sall=".urlencode($search_all);
-if ($sall != '')           $param .= "&sall=".urlencode($sall);
-if ($search_categ_cus > 0) $param.='&search_categ_cus='.urlencode($search_categ_cus);
-if ($search_categ_sup > 0) $param.='&search_categ_sup='.urlencode($search_categ_sup);
-if ($search_sale > 0)	   $param.='&search_sale='.urlencode($search_sale);
-if ($search_id > 0)        $param.= "&search_id=".urlencode($search_id);
-if ($search_nom != '')     $param.= "&search_nom=".urlencode($search_nom);
-if ($search_alias != '')   $param.= "&search_alias=".urlencode($search_alias);
-if ($search_town != '')    $param.= "&search_town=".urlencode($search_town);
-if ($search_zip != '')     $param.= "&search_zip=".urlencode($search_zip);
-if ($search_phone != '')   $param.= "&search_phone=".urlencode($search_phone);
-if ($search_email != '')   $param.= "&search_email=".urlencode($search_email);
-if ($search_url != '')     $param.= "&search_url=".urlencode($search_url);
-if ($search_state != '')   $param.= "&search_state=".urlencode($search_state);
-if ($search_country != '') $param.= "&search_country=".urlencode($search_country);
-if ($search_customer_code != '') $param.= "&search_customer_code=".urlencode($search_customer_code);
-if ($search_supplier_code != '') $param.= "&search_supplier_code=".urlencode($search_supplier_code);
-if ($search_account_customer_code != '') $param.= "&search_account_customer_code=".urlencode($search_account_customer_code);
-if ($search_account_supplier_code != '') $param.= "&search_account_supplier_code=".urlencode($search_account_supplier_code);
-if ($search_barcode != '') $param.= "&search_barcode=".urlencode($search_barcode);
-if ($search_idprof1 != '') $param.= '&search_idprof1='.urlencode($search_idprof1);
-if ($search_idprof2 != '') $param.= '&search_idprof2='.urlencode($search_idprof2);
-if ($search_idprof3 != '') $param.= '&search_idprof3='.urlencode($search_idprof3);
-if ($search_idprof4 != '') $param.= '&search_idprof4='.urlencode($search_idprof4);
-if ($search_idprof5 != '') $param.= '&search_idprof5='.urlencode($search_idprof5);
-if ($search_idprof6 != '') $param.= '&search_idprof6='.urlencode($search_idprof6);
-if ($search_vat != '')     $param.= '&search_vat='.urlencode($search_vat);
-if ($search_type_thirdparty != '')    $param.='&search_type_thirdparty='.urlencode($search_type_thirdparty);
-if ($search_type != '')    $param.='&search_type='.urlencode($search_type);
-if ($optioncss != '')      $param.='&optioncss='.urlencode($optioncss);
-if ($search_status != '')  $param.='&search_status='.urlencode($search_status);
-if ($search_stcomm != '')  $param.='&search_stcomm='.urlencode($search_stcomm);
-if ($search_level_from != '') $param.='&search_level_from='.urlencode($search_level_from);
-if ($search_level_to != '')   $param.='&search_level_to='.urlencode($search_level_to);
-if ($search_import_key != '') $param.='&search_import_key='.urlencode($search_import_key);
-if ($type != '') $param.='&type='.urlencode($type);
+if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+    $param.='&contextpage='.$contextpage;
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+    $param.='&limit='.$limit;
+}
+if ($search_all != '') {
+    $param = "&sall=".urlencode($search_all);
+}
+if ($sall != '') {
+    $param .= "&sall=".urlencode($sall);
+}
+if ($search_categ_cus > 0) {
+    $param.='&search_categ_cus='.urlencode($search_categ_cus);
+}
+if ($search_categ_sup > 0) {
+    $param.='&search_categ_sup='.urlencode($search_categ_sup);
+}
+if ($search_sale > 0) {
+    $param.='&search_sale='.urlencode($search_sale);
+}
+if ($search_id > 0) {
+    $param.= "&search_id=".urlencode($search_id);
+}
+if ($search_nom != '') {
+    $param.= "&search_nom=".urlencode($search_nom);
+}
+if ($search_alias != '') {
+    $param.= "&search_alias=".urlencode($search_alias);
+}
+if ($search_town != '') {
+    $param.= "&search_town=".urlencode($search_town);
+}
+if ($search_zip != '') {
+    $param.= "&search_zip=".urlencode($search_zip);
+}
+if ($search_phone != '') {
+    $param.= "&search_phone=".urlencode($search_phone);
+}
+if ($search_email != '') {
+    $param.= "&search_email=".urlencode($search_email);
+}
+if ($search_url != '') {
+    $param.= "&search_url=".urlencode($search_url);
+}
+if ($search_state != '') {
+    $param.= "&search_state=".urlencode($search_state);
+}
+if ($search_country != '') {
+    $param.= "&search_country=".urlencode($search_country);
+}
+if ($search_customer_code != '') {
+    $param.= "&search_customer_code=".urlencode($search_customer_code);
+}
+if ($search_supplier_code != '') {
+    $param.= "&search_supplier_code=".urlencode($search_supplier_code);
+}
+if ($search_account_customer_code != '') {
+    $param.= "&search_account_customer_code=".urlencode($search_account_customer_code);
+}
+if ($search_account_supplier_code != '') {
+    $param.= "&search_account_supplier_code=".urlencode($search_account_supplier_code);
+}
+if ($search_barcode != '') {
+    $param.= "&search_barcode=".urlencode($search_barcode);
+}
+if ($search_idprof1 != '') {
+    $param.= '&search_idprof1='.urlencode($search_idprof1);
+}
+if ($search_idprof2 != '') {
+    $param.= '&search_idprof2='.urlencode($search_idprof2);
+}
+if ($search_idprof3 != '') {
+    $param.= '&search_idprof3='.urlencode($search_idprof3);
+}
+if ($search_idprof4 != '') {
+    $param.= '&search_idprof4='.urlencode($search_idprof4);
+}
+if ($search_idprof5 != '') {
+    $param.= '&search_idprof5='.urlencode($search_idprof5);
+}
+if ($search_idprof6 != '') {
+    $param.= '&search_idprof6='.urlencode($search_idprof6);
+}
+if ($search_vat != '') {
+    $param.= '&search_vat='.urlencode($search_vat);
+}
+if ($search_type_thirdparty != '') {
+    $param.='&search_type_thirdparty='.urlencode($search_type_thirdparty);
+}
+if ($search_type != '') {
+    $param.='&search_type='.urlencode($search_type);
+}
+if ($optioncss != '') {
+    $param.='&optioncss='.urlencode($optioncss);
+}
+if ($search_status != '') {
+    $param.='&search_status='.urlencode($search_status);
+}
+if ($search_stcomm != '') {
+    $param.='&search_stcomm='.urlencode($search_stcomm);
+}
+if ($search_level_from != '') {
+    $param.='&search_level_from='.urlencode($search_level_from);
+}
+if ($search_level_to != '') {
+    $param.='&search_level_to='.urlencode($search_level_to);
+}
+if ($search_import_key != '') {
+    $param.='&search_import_key='.urlencode($search_import_key);
+}
+if ($type != '') {
+    $param.='&type='.urlencode($type);
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -586,12 +811,18 @@ 
 //    'builddoc'=>$langs->trans("PDFMerge"),
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
-if ($user->rights->societe->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
-if (GETPOST('nomassaction','int') || in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
+if ($user->rights->societe->supprimer) {
+    $arrayofmassactions['predelete']=$langs->trans("Delete");
+}
+if (GETPOST('nomassaction','int') || in_array($massaction, array('presend','predelete'))) {
+    $arrayofmassactions=array();
+}
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+    print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
@@ -608,7 +839,9 @@ 
 	$textprofid[$key]='';
 	if ($label != "ProfId".$key.$mysoc->country_code)
 	{	// Get only text between ()
-		if (preg_match('/\((.*)\)/i',$label,$reg)) $label=$reg[1];
+		if (preg_match('/\((.*)\)/i',$label,$reg)) {
+		    $label=$reg[1];
+		}
 		$textprofid[$key]=$langs->trans("ProfIdShortDesc",$key,$mysoc->country_code,$label);
 	}
 }
@@ -621,7 +854,9 @@ 
 
 if ($search_all)
 {
-	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+	foreach($fieldstosearchall as $key => $val) {
+	    $fieldstosearchall[$key]=$langs->trans($val);
+	}
 	print $langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall);
 }
 
@@ -670,9 +905,13 @@ 
 
 $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+if ($massactionbutton) {
+    $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+}
 
-if (empty($arrayfields['customerorsupplier']['checked'])) print '<input type="hidden" name="type" value="'.$type.'">';
+if (empty($arrayfields['customerorsupplier']['checked'])) {
+    print '<input type="hidden" name="type" value="'.$type.'">';
+}
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
@@ -688,7 +927,9 @@ 
 if (! empty($arrayfields['s.nom']['checked']))
 {
 	print '<td class="liste_titre">';
-	if (! empty($search_nom_only) && empty($search_nom)) $search_nom=$search_nom_only;
+	if (! empty($search_nom_only) && empty($search_nom)) {
+	    $search_nom=$search_nom_only;
+	}
 	print '<input class="flat searchstring" type="text" name="search_nom" size="8" value="'.dol_escape_htmltag($search_nom).'">';
 	print '</td>';
 }
@@ -850,11 +1091,17 @@ 
 if (! empty($arrayfields['customerorsupplier']['checked']))
 {
 	print '<td class="liste_titre maxwidthonsmartphone" align="middle">';
-	if ($type != '') print '<input type="hidden" name="type" value="'.$type.'">';
+	if ($type != '') {
+	    print '<input type="hidden" name="type" value="'.$type.'">';
+	}
 	print '<select class="flat" name="search_type">';
 	print '<option value="-1"'.($search_type==''?' selected':'').'>&nbsp;</option>';
-	if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1,3"'.($search_type=='1,3'?' selected':'').'>'.$langs->trans('Customer').'</option>';
-	if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2,3"'.($search_type=='2,3'?' selected':'').'>'.$langs->trans('Prospect').'</option>';
+	if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+	    print '<option value="1,3"'.($search_type=='1,3'?' selected':'').'>'.$langs->trans('Customer').'</option>';
+	}
+	if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+	    print '<option value="2,3"'.($search_type=='2,3'?' selected':'').'>'.$langs->trans('Prospect').'</option>';
+	}
 	//if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="3"'.($search_type=='3'?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
 	print '<option value="4"'.($search_type=='4'?' selected':'').'>'.$langs->trans('Supplier').'</option>';
 	print '<option value="0"'.($search_type=='0'?' selected':'').'>'.$langs->trans('Others').'</option>';
@@ -941,43 +1188,106 @@ 
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-if (! empty($arrayfields['s.rowid']['checked']))                   print_liste_field_titre($arrayfields['s.rowid']['label'], $_SERVER["PHP_SELF"],"s.rowid","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['s.nom']['checked']))                     print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['s.name_alias']['checked']))              print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"],"s.name_alias","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['s.barcode']['checked']))                 print_liste_field_titre($arrayfields['s.barcode']['label'], $_SERVER["PHP_SELF"], "s.barcode",$param,'','',$sortfield,$sortorder);
-if (! empty($arrayfields['s.code_client']['checked']))             print_liste_field_titre($arrayfields['s.code_client']['label'],$_SERVER["PHP_SELF"],"s.code_client","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.code_fournisseur']['checked']))        print_liste_field_titre($arrayfields['s.code_fournisseur']['label'],$_SERVER["PHP_SELF"],"s.code_fournisseur","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.code_compta']['checked']))             print_liste_field_titre($arrayfields['s.code_compta']['label'],$_SERVER["PHP_SELF"],"s.code_compta","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.code_compta_fournisseur']['checked'])) print_liste_field_titre($arrayfields['s.code_compta_fournisseur']['label'],$_SERVER["PHP_SELF"],"s.code_compta_fournisseur","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],"s.town","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],"s.zip","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['region.nom']['checked']))       print_liste_field_titre($arrayfields['region.nom']['label'],$_SERVER["PHP_SELF"],"region.nom","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.email']['checked']))          print_liste_field_titre($arrayfields['s.email']['label'],$_SERVER["PHP_SELF"],"s.email","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.phone']['checked']))          print_liste_field_titre($arrayfields['s.phone']['label'],$_SERVER["PHP_SELF"],"s.phone","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.url']['checked']))            print_liste_field_titre($arrayfields['s.url']['label'],$_SERVER["PHP_SELF"],"s.url","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.siren']['checked']))          print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"),$textprofid[1],1,0),$_SERVER["PHP_SELF"],"s.siren","",$param,'class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.siret']['checked']))          print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"),$textprofid[2],1,0),$_SERVER["PHP_SELF"],"s.siret","",$param,'class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.ape']['checked']))            print_liste_field_titre($form->textwithpicto($langs->trans("ProfId3Short"),$textprofid[3],1,0),$_SERVER["PHP_SELF"],"s.ape","",$param,'class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.idprof4']['checked']))        print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof4","",$param,'class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.idprof5']['checked']))        print_liste_field_titre($form->textwithpicto($langs->trans("ProfId5Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof5","",$param,'class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.idprof6']['checked']))        print_liste_field_titre($form->textwithpicto($langs->trans("ProfId6Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof6","",$param,'class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.tva_intra']['checked']))      print_liste_field_titre($arrayfields['s.tva_intra']['label'],$_SERVER["PHP_SELF"],"s.tva_intra","",$param,'class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['customerorsupplier']['checked']))        print_liste_field_titre('');   // type of customer
-if (! empty($arrayfields['s.fk_prospectlevel']['checked']))        print_liste_field_titre($arrayfields['s.fk_prospectlevel']['label'],$_SERVER["PHP_SELF"],"s.fk_prospectlevel","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.fk_stcomm']['checked']))               print_liste_field_titre($arrayfields['s.fk_stcomm']['label'],$_SERVER["PHP_SELF"],"s.fk_stcomm","",$param,'align="center"',$sortfield,$sortorder);
+if (! empty($arrayfields['s.rowid']['checked'])) {
+    print_liste_field_titre($arrayfields['s.rowid']['label'], $_SERVER["PHP_SELF"],"s.rowid","",$param,"",$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.nom']['checked'])) {
+    print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.name_alias']['checked'])) {
+    print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"],"s.name_alias","",$param,"",$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.barcode']['checked'])) {
+    print_liste_field_titre($arrayfields['s.barcode']['label'], $_SERVER["PHP_SELF"], "s.barcode",$param,'','',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.code_client']['checked'])) {
+    print_liste_field_titre($arrayfields['s.code_client']['label'],$_SERVER["PHP_SELF"],"s.code_client","",$param,'',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.code_fournisseur']['checked'])) {
+    print_liste_field_titre($arrayfields['s.code_fournisseur']['label'],$_SERVER["PHP_SELF"],"s.code_fournisseur","",$param,'',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.code_compta']['checked'])) {
+    print_liste_field_titre($arrayfields['s.code_compta']['label'],$_SERVER["PHP_SELF"],"s.code_compta","",$param,'',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.code_compta_fournisseur']['checked'])) {
+    print_liste_field_titre($arrayfields['s.code_compta_fournisseur']['label'],$_SERVER["PHP_SELF"],"s.code_compta_fournisseur","",$param,'',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.town']['checked'])) {
+    print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],"s.town","",$param,'',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.zip']['checked'])) {
+    print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],"s.zip","",$param,'',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['state.nom']['checked'])) {
+    print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['region.nom']['checked'])) {
+    print_liste_field_titre($arrayfields['region.nom']['label'],$_SERVER["PHP_SELF"],"region.nom","",$param,'',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['country.code_iso']['checked'])) {
+    print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['typent.code']['checked'])) {
+    print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.email']['checked'])) {
+    print_liste_field_titre($arrayfields['s.email']['label'],$_SERVER["PHP_SELF"],"s.email","",$param,'',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.phone']['checked'])) {
+    print_liste_field_titre($arrayfields['s.phone']['label'],$_SERVER["PHP_SELF"],"s.phone","",$param,'',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.url']['checked'])) {
+    print_liste_field_titre($arrayfields['s.url']['label'],$_SERVER["PHP_SELF"],"s.url","",$param,'',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.siren']['checked'])) {
+    print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"),$textprofid[1],1,0),$_SERVER["PHP_SELF"],"s.siren","",$param,'class="nowrap"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.siret']['checked'])) {
+    print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"),$textprofid[2],1,0),$_SERVER["PHP_SELF"],"s.siret","",$param,'class="nowrap"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.ape']['checked'])) {
+    print_liste_field_titre($form->textwithpicto($langs->trans("ProfId3Short"),$textprofid[3],1,0),$_SERVER["PHP_SELF"],"s.ape","",$param,'class="nowrap"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.idprof4']['checked'])) {
+    print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof4","",$param,'class="nowrap"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.idprof5']['checked'])) {
+    print_liste_field_titre($form->textwithpicto($langs->trans("ProfId5Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof5","",$param,'class="nowrap"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.idprof6']['checked'])) {
+    print_liste_field_titre($form->textwithpicto($langs->trans("ProfId6Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof6","",$param,'class="nowrap"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.tva_intra']['checked'])) {
+    print_liste_field_titre($arrayfields['s.tva_intra']['label'],$_SERVER["PHP_SELF"],"s.tva_intra","",$param,'class="nowrap"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['customerorsupplier']['checked'])) {
+    print_liste_field_titre('');
+}
+// type of customer
+if (! empty($arrayfields['s.fk_prospectlevel']['checked'])) {
+    print_liste_field_titre($arrayfields['s.fk_prospectlevel']['label'],$_SERVER["PHP_SELF"],"s.fk_prospectlevel","",$param,'align="center"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.fk_stcomm']['checked'])) {
+    print_liste_field_titre($arrayfields['s.fk_stcomm']['label'],$_SERVER["PHP_SELF"],"s.fk_stcomm","",$param,'align="center"',$sortfield,$sortorder);
+}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
 $parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
 $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-if (! empty($arrayfields['s.datec']['checked']))      print_liste_field_titre($arrayfields['s.datec']['label'],$_SERVER["PHP_SELF"],"s.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.tms']['checked']))        print_liste_field_titre($arrayfields['s.tms']['label'],$_SERVER["PHP_SELF"],"s.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.status']['checked']))     print_liste_field_titre($arrayfields['s.status']['label'],$_SERVER["PHP_SELF"],"s.status","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.import_key']['checked'])) print_liste_field_titre($arrayfields['s.import_key']['label'],$_SERVER["PHP_SELF"],"s.import_key","",$param,'align="center"',$sortfield,$sortorder);
+if (! empty($arrayfields['s.datec']['checked'])) {
+    print_liste_field_titre($arrayfields['s.datec']['label'],$_SERVER["PHP_SELF"],"s.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.tms']['checked'])) {
+    print_liste_field_titre($arrayfields['s.tms']['label'],$_SERVER["PHP_SELF"],"s.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.status']['checked'])) {
+    print_liste_field_titre($arrayfields['s.status']['label'],$_SERVER["PHP_SELF"],"s.status","",$param,'align="center"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.import_key']['checked'])) {
+    print_liste_field_titre($arrayfields['s.import_key']['label'],$_SERVER["PHP_SELF"],"s.import_key","",$param,'align="center"',$sortfield,$sortorder);
+}
 print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 print "</tr>\n";
 
@@ -1011,77 +1321,103 @@ 
 		print '<td class="tdoverflowmax50">';
 		print $obj->rowid;
 		print "</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	if (! empty($arrayfields['s.nom']['checked']))
 	{
 		$savalias = $obj->name_alias;
-		if (! empty($arrayfields['s.name_alias']['checked'])) $companystatic->name_alias='';
+		if (! empty($arrayfields['s.name_alias']['checked'])) {
+		    $companystatic->name_alias='';
+		}
 		print '<td class="tdoverflowmax200">';
 		print $obj->name;
 		print "</td>\n";
-        if (! $i) $totalarray['nbfield']++;
+        if (! $i) {
+            $totalarray['nbfield']++;
+        }
 	}
 	if (! empty($arrayfields['s.name_alias']['checked']))
 	{
 		print '<td class="tdoverflowmax200">';
 		print $companystatic->name_alias;
 		print "</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// Barcode
 	if (! empty($arrayfields['s.barcode']['checked']))
 	{
 		print '<td>'.$obj->barcode.'</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// Customer code
 	if (! empty($arrayfields['s.code_client']['checked']))
 	{
 		print '<td>'.$obj->code_client.'</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// Supplier code
 	if (! empty($arrayfields['s.code_fournisseur']['checked']))
 	{
 		print '<td>'.$obj->code_fournisseur.'</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// Account customer code
 	if (! empty($arrayfields['s.code_compta']['checked']))
 	{
 		print '<td>'.$obj->code_compta.'</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// Account supplier code
 	if (! empty($arrayfields['s.code_compta_fournisseur']['checked']))
 	{
 		print '<td>'.$obj->code_compta_fournisseur.'</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// Town
 	if (! empty($arrayfields['s.town']['checked']))
 	{
 		print "<td>".$obj->town."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// Zip
 	if (! empty($arrayfields['s.zip']['checked']))
 	{
 		print "<td>".$obj->zip."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// State
 	if (! empty($arrayfields['state.nom']['checked']))
 	{
 		print "<td>".$obj->state_name."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// Region
 	if (! empty($arrayfields['region.nom']['checked']))
 	{
 		print "<td>".$obj->region_name."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// Country
 	if (! empty($arrayfields['country.code_iso']['checked']))
@@ -1090,66 +1426,92 @@ 
 		$tmparray=getCountry($obj->fk_pays,'all');
 		print $tmparray['label'];
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// Type ent
 	if (! empty($arrayfields['typent.code']['checked']))
 	{
 		print '<td align="center">';
-		if (! is_array($typenArray) || count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
+		if (! is_array($typenArray) || count($typenArray)==0) {
+		    $typenArray = $formcompany->typent_array(1);
+		}
 		print $typenArray[$obj->typent_code];
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	if (! empty($arrayfields['s.email']['checked']))
 	{
 		print "<td>".$obj->email."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	if (! empty($arrayfields['s.phone']['checked']))
 	{
 		print "<td>".$obj->phone."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	if (! empty($arrayfields['s.url']['checked']))
 	{
 		print "<td>".$obj->url."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	if (! empty($arrayfields['s.siren']['checked']))
 	{
 		print "<td>".$obj->idprof1."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	if (! empty($arrayfields['s.siret']['checked']))
 	{
 		print "<td>".$obj->idprof2."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	if (! empty($arrayfields['s.ape']['checked']))
 	{
 		print "<td>".$obj->idprof3."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	if (! empty($arrayfields['s.idprof4']['checked']))
 	{
 		print "<td>".$obj->idprof4."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	if (! empty($arrayfields['s.idprof5']['checked']))
 	{
 		print "<td>".$obj->idprof5."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	if (! empty($arrayfields['s.idprof6']['checked']))
 	{
 		print "<td>".$obj->idprof6."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	if (! empty($arrayfields['s.tva_intra']['checked']))
 	{
 		print "<td>".$obj->tva_intra."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// Type
 	if (! empty($arrayfields['customerorsupplier']['checked']))
@@ -1164,21 +1526,27 @@ 
 		}
 		if (($obj->client==2 || $obj->client==3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
 		{
-			if ($s) $s.=" / ";
+			if ($s) {
+			    $s.=" / ";
+			}
 			$companystatic->name=$langs->trans("Prospect");
 	  		$companystatic->name_alias='';
 			$s.=$companystatic->getNomUrl(0,'prospect',0,1);
 		}
 		if (! empty($conf->fournisseur->enabled) && $obj->fournisseur)
 		{
-			if ($s) $s.=" / ";
+			if ($s) {
+			    $s.=" / ";
+			}
 			$companystatic->name=$langs->trans("Supplier");
 	  		$companystatic->name_alias='';
 			$s.=$companystatic->getNomUrl(0,'supplier',0,1);
 		}
 		print $s;
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 
 	if (! empty($arrayfields['s.fk_prospectlevel']['checked']))
@@ -1187,7 +1555,9 @@ 
 		print '<td align="center">';
 		print $companystatic->getLibProspLevel();
 		print "</td>";
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 
 	if (! empty($arrayfields['s.fk_stcomm']['checked']))
@@ -1199,11 +1569,17 @@ 
 		foreach($prospectstatic->cacheprospectstatus as $key => $val)
 		{
 			$titlealt='default';
-			if (! empty($val['code']) && ! in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt=$val['label'];
-			if ($obj->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommsocid='.$obj->rowid.'&stcomm='.$val['code'].'&action=setstcomm'.$param.($page?'&page='.urlencode($page):'').'">'.img_action($titlealt,$val['code']).'</a>';
+			if (! empty($val['code']) && ! in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) {
+			    $titlealt=$val['label'];
+			}
+			if ($obj->stcomm_id != $val['id']) {
+			    print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommsocid='.$obj->rowid.'&stcomm='.$val['code'].'&action=setstcomm'.$param.($page?'&page='.urlencode($page):'').'">'.img_action($titlealt,$val['code']).'</a>';
+			}
 		}
 		print '</div></div></td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
@@ -1217,7 +1593,9 @@ 
 		print '<td align="center" class="nowrap">';
 		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// Date modification
 	if (! empty($arrayfields['s.tms']['checked']))
@@ -1225,32 +1603,44 @@ 
 		print '<td align="center" class="nowrap">';
 		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// Status
 	if (! empty($arrayfields['s.status']['checked']))
 	{
 		print '<td align="center" class="nowrap">'.$companystatic->getLibStatut(3).'</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	if (! empty($arrayfields['s.import_key']['checked']))
 	{
 		print '<td class="tdoverflowmax100">';
 		print $obj->import_key;
 		print "</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 
 	// Action column
 	print '<td class="nowrap" align="center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+	if ($massactionbutton || $massaction) {
+	    // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 	{
 		$selected=0;
-		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+	}
+		if (in_array($obj->rowid, $arrayofselected)) {
+		    $selected=1;
+		}
 		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
 	}
 	print '</td>';
-	if (! $i) $totalarray['nbfield']++;
+	if (! $i) {
+	    $totalarray['nbfield']++;
+	}
 
 	print '</tr>'."\n";
 	$i++;

Indentation +601 added lines, -601 removed lines

@@ -34,7 +34,7 @@ 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
 require DOL_BASE_PATH . '/main.inc.php';
-	// Load $user and permissions
+    // Load $user and permissions
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -152,18 +152,18 @@ 
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	's.nom'=>"ThirdPartyName",
-	's.name_alias'=>"AliasNameShort",
-	's.code_client'=>"CustomerCode",
-	's.code_fournisseur'=>"SupplierCode",
-	's.code_compta'=>"CustomerAccountancyCodeShort",
-	's.code_compta_fournisseur'=>"SupplierAccountancyCodeShort",
-	's.email'=>"EMail",
-	's.url'=>"URL",
-	's.tva_intra'=>"VATIntra",
-	's.siren'=>"ProfId1",
-	's.siret'=>"ProfId2",
-	's.ape'=>"ProfId3",
+    's.nom'=>"ThirdPartyName",
+    's.name_alias'=>"AliasNameShort",
+    's.code_client'=>"CustomerCode",
+    's.code_fournisseur'=>"SupplierCode",
+    's.code_compta'=>"CustomerAccountancyCodeShort",
+    's.code_compta_fournisseur'=>"SupplierAccountancyCodeShort",
+    's.email'=>"EMail",
+    's.url'=>"URL",
+    's.tva_intra'=>"VATIntra",
+    's.siren'=>"ProfId1",
+    's.siret'=>"ProfId2",
+    's.ape'=>"ProfId3",
 );
 if (($tmp = $langs->transnoentities("ProfId4".$mysoc->country_code)) && $tmp != "ProfId4".$mysoc->country_code && $tmp != '-') $fieldstosearchall['s.idprof4']='ProfId4';
 if (($tmp = $langs->transnoentities("ProfId5".$mysoc->country_code)) && $tmp != "ProfId5".$mysoc->country_code && $tmp != '-') $fieldstosearchall['s.idprof5']='ProfId5';
@@ -188,45 +188,45 @@ 
 $checkprospectlevel=(in_array($contextpage, array('prospectlist')) ? 1 : 0);
 $checkstcomm=(in_array($contextpage, array('prospectlist')) ? 1 : 0);
 $arrayfields=array(
-	's.rowid'=>array('label'=>"TechnicalID", 'checked'=>($conf->global->MAIN_SHOW_TECHNICAL_ID?1:0), 'enabled'=>($conf->global->MAIN_SHOW_TECHNICAL_ID?1:0)),
-	's.nom'=>array('label'=>"ThirdPartyName", 'checked'=>1),
-	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>1),
-	's.barcode'=>array('label'=>"Gencod", 'checked'=>1, 'enabled'=>(! empty($conf->barcode->enabled))),
-	's.code_client'=>array('label'=>"CustomerCodeShort", 'checked'=>$checkedcustomercode),
-	's.code_fournisseur'=>array('label'=>"SupplierCodeShort", 'checked'=>$checkedsuppliercode, 'enabled'=>(! empty($conf->fournisseur->enabled))),
-	's.code_compta'=>array('label'=>"CustomerAccountancyCodeShort", 'checked'=>$checkedcustomeraccountcode),
-	's.code_compta_fournisseur'=>array('label'=>"SupplierAccountancyCodeShort", 'checked'=>$checkedsupplieraccountcode, 'enabled'=>(! empty($conf->fournisseur->enabled))),
-	's.town'=>array('label'=>"Town", 'checked'=>1),
-	's.zip'=>array('label'=>"Zip", 'checked'=>1),
-	'state.nom'=>array('label'=>"State", 'checked'=>0),
-	'region.nom'=>array('label'=>"Region", 'checked'=>0),
-	'country.code_iso'=>array('label'=>"Country", 'checked'=>0),
-	's.email'=>array('label'=>"Email", 'checked'=>0),
-	's.url'=>array('label'=>"Url", 'checked'=>0),
-	's.phone'=>array('label'=>"Phone", 'checked'=>1),
-	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers),
-	's.siren'=>array('label'=>"ProfId1Short", 'checked'=>$checkedprofid1),
-	's.siret'=>array('label'=>"ProfId2Short", 'checked'=>$checkedprofid2),
-	's.ape'=>array('label'=>"ProfId3Short", 'checked'=>$checkedprofid3),
-	's.idprof4'=>array('label'=>"ProfId4Short", 'checked'=>$checkedprofid4),
-	's.idprof5'=>array('label'=>"ProfId5Short", 'checked'=>$checkedprofid5),
-	's.idprof6'=>array('label'=>"ProfId6Short", 'checked'=>$checkedprofid6),
-	's.tva_intra'=>array('label'=>"VATIntra", 'checked'=>0),
-	'customerorsupplier'=>array('label'=>'Nature', 'checked'=>1),
-	's.fk_prospectlevel'=>array('label'=>"ProspectLevelShort", 'checked'=>$checkprospectlevel),
-	's.fk_stcomm'=>array('label'=>"StatusProsp", 'checked'=>$checkstcomm),
-	's.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
-	's.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
-	's.status'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
-	's.import_key'=>array('label'=>"ImportId", 'checked'=>0, 'position'=>1100),
+    's.rowid'=>array('label'=>"TechnicalID", 'checked'=>($conf->global->MAIN_SHOW_TECHNICAL_ID?1:0), 'enabled'=>($conf->global->MAIN_SHOW_TECHNICAL_ID?1:0)),
+    's.nom'=>array('label'=>"ThirdPartyName", 'checked'=>1),
+    's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>1),
+    's.barcode'=>array('label'=>"Gencod", 'checked'=>1, 'enabled'=>(! empty($conf->barcode->enabled))),
+    's.code_client'=>array('label'=>"CustomerCodeShort", 'checked'=>$checkedcustomercode),
+    's.code_fournisseur'=>array('label'=>"SupplierCodeShort", 'checked'=>$checkedsuppliercode, 'enabled'=>(! empty($conf->fournisseur->enabled))),
+    's.code_compta'=>array('label'=>"CustomerAccountancyCodeShort", 'checked'=>$checkedcustomeraccountcode),
+    's.code_compta_fournisseur'=>array('label'=>"SupplierAccountancyCodeShort", 'checked'=>$checkedsupplieraccountcode, 'enabled'=>(! empty($conf->fournisseur->enabled))),
+    's.town'=>array('label'=>"Town", 'checked'=>1),
+    's.zip'=>array('label'=>"Zip", 'checked'=>1),
+    'state.nom'=>array('label'=>"State", 'checked'=>0),
+    'region.nom'=>array('label'=>"Region", 'checked'=>0),
+    'country.code_iso'=>array('label'=>"Country", 'checked'=>0),
+    's.email'=>array('label'=>"Email", 'checked'=>0),
+    's.url'=>array('label'=>"Url", 'checked'=>0),
+    's.phone'=>array('label'=>"Phone", 'checked'=>1),
+    'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers),
+    's.siren'=>array('label'=>"ProfId1Short", 'checked'=>$checkedprofid1),
+    's.siret'=>array('label'=>"ProfId2Short", 'checked'=>$checkedprofid2),
+    's.ape'=>array('label'=>"ProfId3Short", 'checked'=>$checkedprofid3),
+    's.idprof4'=>array('label'=>"ProfId4Short", 'checked'=>$checkedprofid4),
+    's.idprof5'=>array('label'=>"ProfId5Short", 'checked'=>$checkedprofid5),
+    's.idprof6'=>array('label'=>"ProfId6Short", 'checked'=>$checkedprofid6),
+    's.tva_intra'=>array('label'=>"VATIntra", 'checked'=>0),
+    'customerorsupplier'=>array('label'=>'Nature', 'checked'=>1),
+    's.fk_prospectlevel'=>array('label'=>"ProspectLevelShort", 'checked'=>$checkprospectlevel),
+    's.fk_stcomm'=>array('label'=>"StatusProsp", 'checked'=>$checkstcomm),
+    's.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
+    's.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
+    's.status'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
+    's.import_key'=>array('label'=>"ImportId", 'checked'=>0, 'position'=>1100),
 );
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-   foreach($extrafields->attribute_label as $key => $val)
-   {
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
-   }
+    foreach($extrafields->attribute_label as $key => $val)
+    {
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+    }
 }
 
 $object = new Societe($db);
@@ -245,66 +245,66 @@ 
 
 if (empty($reshook))
 {
-	// Selection of new fields
-	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
-	// Did we click on purge search criteria ?
-	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
-	{
-		$search_id='';
-		$search_nom='';
-		$search_alias='';
-		$search_categ_cus=0;
-		$search_categ_sup=0;
-		$search_sale='';
-		$search_barcode="";
-		$search_customer_code='';
-		$search_supplier_code='';
-		$search_account_customer_code='';
-		$search_account_supplier_code='';
-		$search_town="";
-		$search_zip="";
-		$search_state="";
-		$search_country='';
-		$search_email='';
-		$search_phone='';
-		$search_url='';
-		$search_idprof1='';
-		$search_idprof2='';
-		$search_idprof3='';
-		$search_idprof4='';
-		$search_idprof5='';
-		$search_idprof6='';
-		$search_vat='';
-		$search_type='';
-		$search_type_thirdparty='';
-		$search_status=-1;
-		$search_stcomm='';
-	 	$search_level_from='';
-	 	$search_level_to='';
-	 	$search_import_key='';
-	 	$toselect='';
-		$search_array_options=array();
-	}
-
-	// Mass actions
-	$objectclass='Societe';
-	$objectlabel='ThirdParty';
-	$permtoread = $user->rights->societe->lire;
-	$permtodelete = $user->rights->societe->supprimer;
-	$uploaddir = $conf->societe->dir_output;
-	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-
-	if ($action == 'setstcomm')
-	{
-		$object = new Client($db);
-		$result=$object->fetch(GETPOST('stcommsocid'));
-		$object->stcomm_id=dol_getIdFromCode($db, GETPOST('stcomm','alpha'), 'c_stcomm');
-		$result=$object->update($object->id, $user);
-		if ($result < 0) setEventMessages($object->error,$object->errors,'errors');
-
-		$action='';
-	}
+    // Selection of new fields
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+    // Did we click on purge search criteria ?
+    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+    {
+        $search_id='';
+        $search_nom='';
+        $search_alias='';
+        $search_categ_cus=0;
+        $search_categ_sup=0;
+        $search_sale='';
+        $search_barcode="";
+        $search_customer_code='';
+        $search_supplier_code='';
+        $search_account_customer_code='';
+        $search_account_supplier_code='';
+        $search_town="";
+        $search_zip="";
+        $search_state="";
+        $search_country='';
+        $search_email='';
+        $search_phone='';
+        $search_url='';
+        $search_idprof1='';
+        $search_idprof2='';
+        $search_idprof3='';
+        $search_idprof4='';
+        $search_idprof5='';
+        $search_idprof6='';
+        $search_vat='';
+        $search_type='';
+        $search_type_thirdparty='';
+        $search_status=-1;
+        $search_stcomm='';
+            $search_level_from='';
+            $search_level_to='';
+            $search_import_key='';
+            $toselect='';
+        $search_array_options=array();
+    }
+
+    // Mass actions
+    $objectclass='Societe';
+    $objectlabel='ThirdParty';
+    $permtoread = $user->rights->societe->lire;
+    $permtodelete = $user->rights->societe->supprimer;
+    $uploaddir = $conf->societe->dir_output;
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+
+    if ($action == 'setstcomm')
+    {
+        $object = new Client($db);
+        $result=$object->fetch(GETPOST('stcommsocid'));
+        $object->stcomm_id=dol_getIdFromCode($db, GETPOST('stcomm','alpha'), 'c_stcomm');
+        $result=$object->update($object->id, $user);
+        if ($result < 0) setEventMessages($object->error,$object->errors,'errors');
+
+        $action='';
+    }
 }
 
 if ($search_status=='') $search_status=1; // always display active thirdparty first
@@ -341,43 +341,43 @@ 
 // If both parameters are set, search for everything BETWEEN them
 if ($search_level_from != '' && $search_level_to != '')
 {
-	// Ensure that these parameters are numbers
-	$search_level_from = (int) $search_level_from;
-	$search_level_to = (int) $search_level_to;
-
-	// If from is greater than to, reverse orders
-	if ($search_level_from > $search_level_to)
-	{
-		$tmp = $search_level_to;
-		$search_level_to = $search_level_from;
-		$search_level_from = $tmp;
-	}
-
-	// Generate the SQL request
-	$sortwhere = '(sortorder BETWEEN '.$search_level_from.' AND '.$search_level_to.') AS is_in_range';
+    // Ensure that these parameters are numbers
+    $search_level_from = (int) $search_level_from;
+    $search_level_to = (int) $search_level_to;
+
+    // If from is greater than to, reverse orders
+    if ($search_level_from > $search_level_to)
+    {
+        $tmp = $search_level_to;
+        $search_level_to = $search_level_from;
+        $search_level_from = $tmp;
+    }
+
+    // Generate the SQL request
+    $sortwhere = '(sortorder BETWEEN '.$search_level_from.' AND '.$search_level_to.') AS is_in_range';
 }
 // If only "from" parameter is set, search for everything GREATER THAN it
 else if ($search_level_from != '')
 {
-	// Ensure that this parameter is a number
-	$search_level_from = (int) $search_level_from;
+    // Ensure that this parameter is a number
+    $search_level_from = (int) $search_level_from;
 
-	// Generate the SQL request
-	$sortwhere = '(sortorder >= '.$search_level_from.') AS is_in_range';
+    // Generate the SQL request
+    $sortwhere = '(sortorder >= '.$search_level_from.') AS is_in_range';
 }
 // If only "to" parameter is set, search for everything LOWER THAN it
 else if ($search_level_to != '')
 {
-	// Ensure that this parameter is a number
-	$search_level_to = (int) $search_level_to;
+    // Ensure that this parameter is a number
+    $search_level_to = (int) $search_level_to;
 
-	// Generate the SQL request
-	$sortwhere = '(sortorder <= '.$search_level_to.') AS is_in_range';
+    // Generate the SQL request
+    $sortwhere = '(sortorder <= '.$search_level_to.') AS is_in_range';
 }
 // If no parameters are set, dont search for anything
 else
 {
-	$sortwhere = '0 as is_in_range';
+    $sortwhere = '0 as is_in_range';
 }
 
 // Select every potentiels, and note each potentiels which fit in search parameters
@@ -390,28 +390,28 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$tab_level = array();
-	$search_levels = array();
-
-	while ($obj = $db->fetch_object($resql))
-	{
-		// Compute level text
-		$level=$langs->trans($obj->code);
-		if ($level == $obj->code) $level=$langs->trans($obj->label);
-
-		// Put it in the array sorted by sortorder
-		$tab_level[$obj->sortorder] = $level;
-
-		// If this potentiel fit in parameters, add its code to the $search_levels array
-		if ($obj->is_in_range == 1)
-		{
-			$search_levels[] = '"'.preg_replace('[^A-Za-z0-9_-]', '', $obj->code).'"';
-		}
-	}
-
-	// Implode the $search_levels array so that it can be use in a "IN (...)" where clause.
-	// If no paramters was set, $search_levels will be empty
-	$search_levels = implode(',', $search_levels);
+    $tab_level = array();
+    $search_levels = array();
+
+    while ($obj = $db->fetch_object($resql))
+    {
+        // Compute level text
+        $level=$langs->trans($obj->code);
+        if ($level == $obj->code) $level=$langs->trans($obj->label);
+
+        // Put it in the array sorted by sortorder
+        $tab_level[$obj->sortorder] = $level;
+
+        // If this potentiel fit in parameters, add its code to the $search_levels array
+        if ($obj->is_in_range == 1)
+        {
+            $search_levels[] = '"'.preg_replace('[^A-Za-z0-9_-]', '', $obj->code).'"';
+        }
+    }
+
+    // Implode the $search_levels array so that it can be use in a "IN (...)" where clause.
+    // If no paramters was set, $search_levels will be empty
+    $search_levels = implode(',', $search_levels);
 }
 else dol_print_error($db);
 
@@ -508,8 +508,8 @@ 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
+    $result = $db->query($sql);
+    $nbtotalofrecords = $db->num_rows($result);
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -517,8 +517,8 @@ 
 $resql = $db->query($sql);
 if (! $resql)
 {
-	dol_print_error($db);
-	exit;
+    dol_print_error($db);
+    exit;
 }
 
 $num = $db->num_rows($resql);
@@ -527,10 +527,10 @@ 
 
 if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && ($search_all != '' || $search_cti != '') && $action != 'list')
 {
-	$obj = $db->fetch_object($resql);
-	$id = $obj->rowid;
-	header("Location: ".DOL_URL_ROOT.'/societe/card.php?socid='.$id);
-	exit;
+    $obj = $db->fetch_object($resql);
+    $id = $obj->rowid;
+    header("Location: ".DOL_URL_ROOT.'/societe/card.php?socid='.$id);
+    exit;
 }
 
 $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
@@ -581,12 +581,12 @@ 
 // Show delete result message
 if (GETPOST('delsoc'))
 {
-	setEventMessages($langs->trans("CompanyDeleted",GETPOST('delsoc')), null, 'mesgs');
+    setEventMessages($langs->trans("CompanyDeleted",GETPOST('delsoc')), null, 'mesgs');
 }
 
 // List of mass actions available
 $arrayofmassactions =  array(
-	'presend'=>$langs->trans("SendByMail"),
+    'presend'=>$langs->trans("SendByMail"),
 //    'builddoc'=>$langs->trans("PDFMerge"),
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
@@ -608,13 +608,13 @@ 
 $textprofid=array();
 foreach(array(1,2,3,4,5,6) as $key)
 {
-	$label=$langs->transnoentities("ProfId".$key.$mysoc->country_code);
-	$textprofid[$key]='';
-	if ($label != "ProfId".$key.$mysoc->country_code)
-	{	// Get only text between ()
-		if (preg_match('/\((.*)\)/i',$label,$reg)) $label=$reg[1];
-		$textprofid[$key]=$langs->trans("ProfIdShortDesc",$key,$mysoc->country_code,$label);
-	}
+    $label=$langs->transnoentities("ProfId".$key.$mysoc->country_code);
+    $textprofid[$key]='';
+    if ($label != "ProfId".$key.$mysoc->country_code)
+    {	// Get only text between ()
+        if (preg_match('/\((.*)\)/i',$label,$reg)) $label=$reg[1];
+        $textprofid[$key]=$langs->trans("ProfIdShortDesc",$key,$mysoc->country_code,$label);
+    }
 }
 
 $topicmail="Information";
@@ -625,51 +625,51 @@ 
 
 if ($search_all)
 {
-	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-	print $langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall);
+    foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+    print $langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall);
 }
 
 // Filter on categories
 $moreforfilter='';
 if (empty($type) || $type == 'c' || $type == 'p')
 {
-	if (! empty($conf->categorie->enabled))
-	{
-		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-		$moreforfilter.='<div class="divsearchfield">';
-	 	$moreforfilter.=$langs->trans('CustomersProspectsCategoriesShort').': ';
-		$moreforfilter.=$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $langs->trans('CustomersProspectsCategoriesShort'));
-	 	$moreforfilter.='</div>';
-	}
+    if (! empty($conf->categorie->enabled))
+    {
+        require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+        $moreforfilter.='<div class="divsearchfield">';
+            $moreforfilter.=$langs->trans('CustomersProspectsCategoriesShort').': ';
+        $moreforfilter.=$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $langs->trans('CustomersProspectsCategoriesShort'));
+            $moreforfilter.='</div>';
+    }
 }
 if (empty($type) || $type == 'f')
 {
-	if (! empty($conf->categorie->enabled))
-	{
-		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-		$moreforfilter.='<div class="divsearchfield">';
-		$moreforfilter.=$langs->trans('SuppliersCategoriesShort').': ';
-		$moreforfilter.=$formother->select_categories('supplier',$search_categ_sup,'search_categ_sup',1);
-		$moreforfilter.='</div>';
-	}
+    if (! empty($conf->categorie->enabled))
+    {
+        require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+        $moreforfilter.='<div class="divsearchfield">';
+        $moreforfilter.=$langs->trans('SuppliersCategoriesShort').': ';
+        $moreforfilter.=$formother->select_categories('supplier',$search_categ_sup,'search_categ_sup',1);
+        $moreforfilter.='</div>';
+    }
 }
 
 // If the user can view prospects other than his'
 if ($user->rights->societe->client->voir || $socid)
 {
- 	$moreforfilter.='<div class="divsearchfield">';
- 	$moreforfilter.=$langs->trans('SalesRepresentatives'). ': ';
-	$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user, 0, 1, 'maxwidth300');
-	$moreforfilter.='</div>';
+        $moreforfilter.='<div class="divsearchfield">';
+        $moreforfilter.=$langs->trans('SalesRepresentatives'). ': ';
+    $moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user, 0, 1, 'maxwidth300');
+    $moreforfilter.='</div>';
 }
 if ($moreforfilter)
 {
-	print '<div class="liste_titre liste_titre_bydiv centpercent">';
-	print $moreforfilter;
-	$parameters=array('type'=>$type);
-	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	print '</div>';
+    print '<div class="liste_titre liste_titre_bydiv centpercent">';
+    print $moreforfilter;
+    $parameters=array('type'=>$type);
+    $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+    print '</div>';
 }
 
 $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
@@ -685,224 +685,224 @@ 
 print '<tr class="liste_titre_filter">';
 if (! empty($arrayfields['s.rowid']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" type="text" name="search_id" size="1" value="'.dol_escape_htmltag($search_id).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" type="text" name="search_id" size="1" value="'.dol_escape_htmltag($search_id).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.nom']['checked']))
 {
-	print '<td class="liste_titre">';
-	if (! empty($search_nom_only) && empty($search_nom)) $search_nom=$search_nom_only;
-	print '<input class="flat searchstring" type="text" name="search_nom" size="8" value="'.dol_escape_htmltag($search_nom).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    if (! empty($search_nom_only) && empty($search_nom)) $search_nom=$search_nom_only;
+    print '<input class="flat searchstring" type="text" name="search_nom" size="8" value="'.dol_escape_htmltag($search_nom).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.name_alias']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" type="text" name="search_alias" size="8" value="'.dol_escape_htmltag($search_alias).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" type="text" name="search_alias" size="8" value="'.dol_escape_htmltag($search_alias).'">';
+    print '</td>';
 }
 // Barcode
 if (! empty($arrayfields['s.barcode']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" type="text" name="search_barcode" size="6" value="'.dol_escape_htmltag($search_barcode).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" type="text" name="search_barcode" size="6" value="'.dol_escape_htmltag($search_barcode).'">';
+    print '</td>';
 }
 // Customer code
 if (! empty($arrayfields['s.code_client']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" size="8" type="text" name="search_customer_code" value="'.dol_escape_htmltag($search_customer_code).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" size="8" type="text" name="search_customer_code" value="'.dol_escape_htmltag($search_customer_code).'">';
+    print '</td>';
 }
 // Supplier code
 if (! empty($arrayfields['s.code_fournisseur']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" size="8" type="text" name="search_supplier_code" value="'.dol_escape_htmltag($search_supplier_code).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" size="8" type="text" name="search_supplier_code" value="'.dol_escape_htmltag($search_supplier_code).'">';
+    print '</td>';
 }
 // Account Customer code
 if (! empty($arrayfields['s.code_compta']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" size="8" type="text" name="search_account_customer_code" value="'.dol_escape_htmltag($search_account_customer_code).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" size="8" type="text" name="search_account_customer_code" value="'.dol_escape_htmltag($search_account_customer_code).'">';
+    print '</td>';
 }
 // Account Supplier code
 if (! empty($arrayfields['s.code_compta_fournisseur']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat" size="8" type="text" name="search_account_supplier_code" value="'.dol_escape_htmltag($search_account_supplier_code).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat" size="8" type="text" name="search_account_supplier_code" value="'.dol_escape_htmltag($search_account_supplier_code).'">';
+    print '</td>';
 }
 // Town
 if (! empty($arrayfields['s.town']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" size="6" type="text" name="search_town" value="'.dol_escape_htmltag($search_town).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" size="6" type="text" name="search_town" value="'.dol_escape_htmltag($search_town).'">';
+    print '</td>';
 }
 // Zip
 if (! empty($arrayfields['s.zip']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" size="4" type="text" name="search_zip" value="'.dol_escape_htmltag($search_zip).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" size="4" type="text" name="search_zip" value="'.dol_escape_htmltag($search_zip).'">';
+    print '</td>';
 }
 // State
 if (! empty($arrayfields['state.nom']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
+    print '</td>';
 }
 // Region
 if (! empty($arrayfields['region.nom']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" size="4" type="text" name="search_region" value="'.dol_escape_htmltag($search_region).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" size="4" type="text" name="search_region" value="'.dol_escape_htmltag($search_region).'">';
+    print '</td>';
 }
 // Country
 if (! empty($arrayfields['country.code_iso']['checked']))
 {
-	print '<td class="liste_titre" align="center">';
-	print $form->select_country($search_country,'search_country','',0,'maxwidth100');
-	print '</td>';
+    print '<td class="liste_titre" align="center">';
+    print $form->select_country($search_country,'search_country','',0,'maxwidth100');
+    print '</td>';
 }
 // Company type
 if (! empty($arrayfields['typent.code']['checked']))
 {
-	print '<td class="liste_titre maxwidthonsmartphone" align="center">';
-	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
-	print '</td>';
+    print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+    print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
+    print '</td>';
 }
 if (! empty($arrayfields['s.email']['checked']))
 {
-	// Email
-	print '<td class="liste_titre">';
-	print '<input class="flat searchemail" size="4" type="text" name="search_email" value="'.dol_escape_htmltag($search_email).'">';
-	print '</td>';
+    // Email
+    print '<td class="liste_titre">';
+    print '<input class="flat searchemail" size="4" type="text" name="search_email" value="'.dol_escape_htmltag($search_email).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.phone']['checked']))
 {
-	// Phone
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" size="4" type="text" name="search_phone" value="'.dol_escape_htmltag($search_phone).'">';
-	print '</td>';
+    // Phone
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" size="4" type="text" name="search_phone" value="'.dol_escape_htmltag($search_phone).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.url']['checked']))
 {
-	// Url
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" size="4" type="text" name="search_url" value="'.dol_escape_htmltag($search_url).'">';
-	print '</td>';
+    // Url
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" size="4" type="text" name="search_url" value="'.dol_escape_htmltag($search_url).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.siren']['checked']))
 {
-	// IdProf1
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" size="4" type="text" name="search_idprof1" value="'.dol_escape_htmltag($search_idprof1).'">';
-	print '</td>';
+    // IdProf1
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" size="4" type="text" name="search_idprof1" value="'.dol_escape_htmltag($search_idprof1).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.siret']['checked']))
 {
-	// IdProf2
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" size="4" type="text" name="search_idprof2" value="'.dol_escape_htmltag($search_idprof2).'">';
-	print '</td>';
+    // IdProf2
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" size="4" type="text" name="search_idprof2" value="'.dol_escape_htmltag($search_idprof2).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.ape']['checked']))
 {
-	// IdProf3
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" size="4" type="text" name="search_idprof3" value="'.dol_escape_htmltag($search_idprof3).'">';
-	print '</td>';
+    // IdProf3
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" size="4" type="text" name="search_idprof3" value="'.dol_escape_htmltag($search_idprof3).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.idprof4']['checked']))
 {
-	// IdProf4
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" size="4" type="text" name="search_idprof4" value="'.dol_escape_htmltag($search_idprof4).'">';
-	print '</td>';
+    // IdProf4
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" size="4" type="text" name="search_idprof4" value="'.dol_escape_htmltag($search_idprof4).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.idprof5']['checked']))
 {
-	// IdProf5
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" size="4" type="text" name="search_idprof5" value="'.dol_escape_htmltag($search_idprof5).'">';
-	print '</td>';
+    // IdProf5
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" size="4" type="text" name="search_idprof5" value="'.dol_escape_htmltag($search_idprof5).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.idprof6']['checked']))
 {
-	// IdProf6
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" size="4" type="text" name="search_idprof6" value="'.dol_escape_htmltag($search_idprof6).'">';
-	print '</td>';
+    // IdProf6
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" size="4" type="text" name="search_idprof6" value="'.dol_escape_htmltag($search_idprof6).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.tva_intra']['checked']))
 {
-	// Vat number
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring" size="4" type="text" name="search_vat" value="'.dol_escape_htmltag($search_vat).'">';
-	print '</td>';
+    // Vat number
+    print '<td class="liste_titre">';
+    print '<input class="flat searchstring" size="4" type="text" name="search_vat" value="'.dol_escape_htmltag($search_vat).'">';
+    print '</td>';
 }
 
 // Type (customer/prospect/supplier)
 if (! empty($arrayfields['customerorsupplier']['checked']))
 {
-	print '<td class="liste_titre maxwidthonsmartphone" align="middle">';
-	if ($type != '') print '<input type="hidden" name="type" value="'.$type.'">';
-	print '<select class="flat" name="search_type">';
-	print '<option value="-1"'.($search_type==''?' selected':'').'>&nbsp;</option>';
-	if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1,3"'.($search_type=='1,3'?' selected':'').'>'.$langs->trans('Customer').'</option>';
-	if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2,3"'.($search_type=='2,3'?' selected':'').'>'.$langs->trans('Prospect').'</option>';
-	//if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="3"'.($search_type=='3'?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
-	print '<option value="4"'.($search_type=='4'?' selected':'').'>'.$langs->trans('Supplier').'</option>';
-	print '<option value="0"'.($search_type=='0'?' selected':'').'>'.$langs->trans('Others').'</option>';
-	print '</select></td>';
+    print '<td class="liste_titre maxwidthonsmartphone" align="middle">';
+    if ($type != '') print '<input type="hidden" name="type" value="'.$type.'">';
+    print '<select class="flat" name="search_type">';
+    print '<option value="-1"'.($search_type==''?' selected':'').'>&nbsp;</option>';
+    if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1,3"'.($search_type=='1,3'?' selected':'').'>'.$langs->trans('Customer').'</option>';
+    if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2,3"'.($search_type=='2,3'?' selected':'').'>'.$langs->trans('Prospect').'</option>';
+    //if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="3"'.($search_type=='3'?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
+    print '<option value="4"'.($search_type=='4'?' selected':'').'>'.$langs->trans('Supplier').'</option>';
+    print '<option value="0"'.($search_type=='0'?' selected':'').'>'.$langs->trans('Others').'</option>';
+    print '</select></td>';
 }
 if (! empty($arrayfields['s.fk_prospectlevel']['checked']))
 {
-	// Prospect level
- 	print '<td class="liste_titre" align="center">';
- 	$options_from = '<option value="">&nbsp;</option>';	 	// Generate in $options_from the list of each option sorted
- 	foreach ($tab_level as $tab_level_sortorder => $tab_level_label)
- 	{
- 		$options_from .= '<option value="'.$tab_level_sortorder.'"'.($search_level_from == $tab_level_sortorder ? ' selected':'').'>';
- 		$options_from .= $langs->trans($tab_level_label);
- 		$options_from .= '</option>';
- 	}
- 	array_reverse($tab_level, true);	// Reverse the list
- 	$options_to = '<option value="">&nbsp;</option>';		// Generate in $options_to the list of each option sorted in the reversed order
- 	foreach ($tab_level as $tab_level_sortorder => $tab_level_label)
- 	{
- 		$options_to .= '<option value="'.$tab_level_sortorder.'"'.($search_level_to == $tab_level_sortorder ? ' selected':'').'>';
- 		$options_to .= $langs->trans($tab_level_label);
- 		$options_to .= '</option>';
- 	}
-
-	// Print these two select
- 	print $langs->trans("From").' <select class="flat" name="search_level_from">'.$options_from.'</select>';
- 	print ' ';
- 	print $langs->trans("to").' <select class="flat" name="search_level_to">'.$options_to.'</select>';
-
-	print '</td>';
+    // Prospect level
+        print '<td class="liste_titre" align="center">';
+        $options_from = '<option value="">&nbsp;</option>';	 	// Generate in $options_from the list of each option sorted
+        foreach ($tab_level as $tab_level_sortorder => $tab_level_label)
+        {
+            $options_from .= '<option value="'.$tab_level_sortorder.'"'.($search_level_from == $tab_level_sortorder ? ' selected':'').'>';
+            $options_from .= $langs->trans($tab_level_label);
+            $options_from .= '</option>';
+        }
+        array_reverse($tab_level, true);	// Reverse the list
+        $options_to = '<option value="">&nbsp;</option>';		// Generate in $options_to the list of each option sorted in the reversed order
+        foreach ($tab_level as $tab_level_sortorder => $tab_level_label)
+        {
+            $options_to .= '<option value="'.$tab_level_sortorder.'"'.($search_level_to == $tab_level_sortorder ? ' selected':'').'>';
+            $options_to .= $langs->trans($tab_level_label);
+            $options_to .= '</option>';
+        }
+
+    // Print these two select
+        print $langs->trans("From").' <select class="flat" name="search_level_from">'.$options_from.'</select>';
+        print ' ';
+        print $langs->trans("to").' <select class="flat" name="search_level_to">'.$options_to.'</select>';
+
+    print '</td>';
 }
 
 if (! empty($arrayfields['s.fk_stcomm']['checked']))
 {
-	// Prospect status
-	print '<td class="liste_titre maxwidthonsmartphone" align="center">';
-	$arraystcomm=array();
-	foreach($prospectstatic->cacheprospectstatus as $key => $val)
-	{
-		$arraystcomm[$val['id']]=($langs->trans("StatusProspect".$val['id']) != "StatusProspect".$val['id'] ? $langs->trans("StatusProspect".$val['id']) : $val['label']);
-	}
-	print $form->selectarray('search_stcomm', $arraystcomm, $search_stcomm, -2);
-	print '</td>';
+    // Prospect status
+    print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+    $arraystcomm=array();
+    foreach($prospectstatic->cacheprospectstatus as $key => $val)
+    {
+        $arraystcomm[$val['id']]=($langs->trans("StatusProspect".$val['id']) != "StatusProspect".$val['id'] ? $langs->trans("StatusProspect".$val['id']) : $val['label']);
+    }
+    print $form->selectarray('search_stcomm', $arraystcomm, $search_stcomm, -2);
+    print '</td>';
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -914,27 +914,27 @@ 
 // Date creation
 if (! empty($arrayfields['s.datec']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '</td>';
 }
 // Date modification
 if (! empty($arrayfields['s.tms']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '</td>';
 }
 // Status
 if (! empty($arrayfields['s.status']['checked']))
 {
-	print '<td class="liste_titre maxwidthonsmartphone center">';
-	print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')), $search_status, 1);
-	print '</td>';
+    print '<td class="liste_titre maxwidthonsmartphone center">';
+    print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')), $search_status, 1);
+    print '</td>';
 }
 if (! empty($arrayfields['s.import_key']['checked']))
 {
-	print '<td class="liste_titre center">';
-	print '<input class="flat searchstring" type="text" name="search_import_key" size="3" value="'.dol_escape_htmltag($search_import_key).'">';
-	print '</td>';
+    print '<td class="liste_titre center">';
+    print '<input class="flat searchstring" type="text" name="search_import_key" size="3" value="'.dol_escape_htmltag($search_import_key).'">';
+    print '</td>';
 }
 // Action column
 print '<td class="liste_titre" align="right">';
@@ -990,274 +990,274 @@ 
 $totalarray=array();
 while ($i < min($num, $limit))
 {
-	$obj = $db->fetch_object($resql);
-
-	$companystatic->id=$obj->rowid;
-	$companystatic->name=$obj->name;
-	$companystatic->name_alias=$obj->name_alias;
-	$companystatic->logo=$obj->logo;
-	$companystatic->canvas=$obj->canvas;
-	$companystatic->client=$obj->client;
-	$companystatic->status=$obj->status;
-	$companystatic->email=$obj->email;
-	$companystatic->fournisseur=$obj->fournisseur;
-	$companystatic->code_client=$obj->code_client;
-	$companystatic->code_fournisseur=$obj->code_fournisseur;
-
-	$companystatic->code_compta_client=$obj->code_compta;
-	$companystatic->code_compta_fournisseur=$obj->code_compta_fournisseur;
-
-   	$companystatic->fk_prospectlevel=$obj->fk_prospectlevel;
-
-	print '<tr class="oddeven" onclick="location.href=\'customers.php?action=change&idcustomer='.$obj->rowid.'&place='.$place.'\'">';
-	if (! empty($arrayfields['s.rowid']['checked']))
-	{
-		print '<td class="tdoverflowmax50">';
-		print $obj->rowid;
-		print "</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.nom']['checked']))
-	{
-		$savalias = $obj->name_alias;
-		if (! empty($arrayfields['s.name_alias']['checked'])) $companystatic->name_alias='';
-		print '<td class="tdoverflowmax200">';
-		print $obj->name;
-		print "</td>\n";
+    $obj = $db->fetch_object($resql);
+
+    $companystatic->id=$obj->rowid;
+    $companystatic->name=$obj->name;
+    $companystatic->name_alias=$obj->name_alias;
+    $companystatic->logo=$obj->logo;
+    $companystatic->canvas=$obj->canvas;
+    $companystatic->client=$obj->client;
+    $companystatic->status=$obj->status;
+    $companystatic->email=$obj->email;
+    $companystatic->fournisseur=$obj->fournisseur;
+    $companystatic->code_client=$obj->code_client;
+    $companystatic->code_fournisseur=$obj->code_fournisseur;
+
+    $companystatic->code_compta_client=$obj->code_compta;
+    $companystatic->code_compta_fournisseur=$obj->code_compta_fournisseur;
+
+        $companystatic->fk_prospectlevel=$obj->fk_prospectlevel;
+
+    print '<tr class="oddeven" onclick="location.href=\'customers.php?action=change&idcustomer='.$obj->rowid.'&place='.$place.'\'">';
+    if (! empty($arrayfields['s.rowid']['checked']))
+    {
+        print '<td class="tdoverflowmax50">';
+        print $obj->rowid;
+        print "</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.nom']['checked']))
+    {
+        $savalias = $obj->name_alias;
+        if (! empty($arrayfields['s.name_alias']['checked'])) $companystatic->name_alias='';
+        print '<td class="tdoverflowmax200">';
+        print $obj->name;
+        print "</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.name_alias']['checked']))
+    {
+        print '<td class="tdoverflowmax200">';
+        print $companystatic->name_alias;
+        print "</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Barcode
+    if (! empty($arrayfields['s.barcode']['checked']))
+    {
+        print '<td>'.$obj->barcode.'</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Customer code
+    if (! empty($arrayfields['s.code_client']['checked']))
+    {
+        print '<td>'.$obj->code_client.'</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Supplier code
+    if (! empty($arrayfields['s.code_fournisseur']['checked']))
+    {
+        print '<td>'.$obj->code_fournisseur.'</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Account customer code
+    if (! empty($arrayfields['s.code_compta']['checked']))
+    {
+        print '<td>'.$obj->code_compta.'</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Account supplier code
+    if (! empty($arrayfields['s.code_compta_fournisseur']['checked']))
+    {
+        print '<td>'.$obj->code_compta_fournisseur.'</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Town
+    if (! empty($arrayfields['s.town']['checked']))
+    {
+        print "<td>".$obj->town."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Zip
+    if (! empty($arrayfields['s.zip']['checked']))
+    {
+        print "<td>".$obj->zip."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // State
+    if (! empty($arrayfields['state.nom']['checked']))
+    {
+        print "<td>".$obj->state_name."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Region
+    if (! empty($arrayfields['region.nom']['checked']))
+    {
+        print "<td>".$obj->region_name."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Country
+    if (! empty($arrayfields['country.code_iso']['checked']))
+    {
+        print '<td align="center">';
+        $tmparray=getCountry($obj->fk_pays,'all');
+        print $tmparray['label'];
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Type ent
+    if (! empty($arrayfields['typent.code']['checked']))
+    {
+        print '<td align="center">';
+        if (! is_array($typenArray) || count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
+        print $typenArray[$obj->typent_code];
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.email']['checked']))
+    {
+        print "<td>".$obj->email."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.phone']['checked']))
+    {
+        print "<td>".$obj->phone."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.url']['checked']))
+    {
+        print "<td>".$obj->url."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.siren']['checked']))
+    {
+        print "<td>".$obj->idprof1."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.siret']['checked']))
+    {
+        print "<td>".$obj->idprof2."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.ape']['checked']))
+    {
+        print "<td>".$obj->idprof3."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.idprof4']['checked']))
+    {
+        print "<td>".$obj->idprof4."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.idprof5']['checked']))
+    {
+        print "<td>".$obj->idprof5."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.idprof6']['checked']))
+    {
+        print "<td>".$obj->idprof6."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.tva_intra']['checked']))
+    {
+        print "<td>".$obj->tva_intra."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Type
+    if (! empty($arrayfields['customerorsupplier']['checked']))
+    {
+        print '<td align="center">';
+        $s='';
+        if (($obj->client==1 || $obj->client==3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
+        {
+                $companystatic->name=$langs->trans("Customer");
+                $companystatic->name_alias='';
+            $s.=$companystatic->getNomUrl(0,'customer',0,1);
+        }
+        if (($obj->client==2 || $obj->client==3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
+        {
+            if ($s) $s.=" / ";
+            $companystatic->name=$langs->trans("Prospect");
+                $companystatic->name_alias='';
+            $s.=$companystatic->getNomUrl(0,'prospect',0,1);
+        }
+        if (! empty($conf->fournisseur->enabled) && $obj->fournisseur)
+        {
+            if ($s) $s.=" / ";
+            $companystatic->name=$langs->trans("Supplier");
+                $companystatic->name_alias='';
+            $s.=$companystatic->getNomUrl(0,'supplier',0,1);
+        }
+        print $s;
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+
+    if (! empty($arrayfields['s.fk_prospectlevel']['checked']))
+    {
+        // Prospect level
+        print '<td align="center">';
+        print $companystatic->getLibProspLevel();
+        print "</td>";
+        if (! $i) $totalarray['nbfield']++;
+    }
+
+    if (! empty($arrayfields['s.fk_stcomm']['checked']))
+    {
+        // Prospect status
+        print '<td align="center" class="nowrap"><div class="nowrap">';
+        print '<div class="inline-block">'.$companystatic->LibProspCommStatut($obj->stcomm_id,2,$prospectstatic->cacheprospectstatus[$obj->stcomm_id]['label']);
+        print '</div> - <div class="inline-block">';
+        foreach($prospectstatic->cacheprospectstatus as $key => $val)
+        {
+            $titlealt='default';
+            if (! empty($val['code']) && ! in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt=$val['label'];
+            if ($obj->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommsocid='.$obj->rowid.'&stcomm='.$val['code'].'&action=setstcomm'.$param.($page?'&page='.urlencode($page):'').'">'.img_action($titlealt,$val['code']).'</a>';
+        }
+        print '</div></div></td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Extra fields
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+    // Fields from hook
+    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+    $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+    // Date creation
+    if (! empty($arrayfields['s.datec']['checked']))
+    {
+        print '<td align="center" class="nowrap">';
+        print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Date modification
+    if (! empty($arrayfields['s.tms']['checked']))
+    {
+        print '<td align="center" class="nowrap">';
+        print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Status
+    if (! empty($arrayfields['s.status']['checked']))
+    {
+        print '<td align="center" class="nowrap">'.$companystatic->getLibStatut(3).'</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['s.import_key']['checked']))
+    {
+        print '<td class="tdoverflowmax100">';
+        print $obj->import_key;
+        print "</td>\n";
         if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.name_alias']['checked']))
-	{
-		print '<td class="tdoverflowmax200">';
-		print $companystatic->name_alias;
-		print "</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Barcode
-	if (! empty($arrayfields['s.barcode']['checked']))
-	{
-		print '<td>'.$obj->barcode.'</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Customer code
-	if (! empty($arrayfields['s.code_client']['checked']))
-	{
-		print '<td>'.$obj->code_client.'</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Supplier code
-	if (! empty($arrayfields['s.code_fournisseur']['checked']))
-	{
-		print '<td>'.$obj->code_fournisseur.'</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Account customer code
-	if (! empty($arrayfields['s.code_compta']['checked']))
-	{
-		print '<td>'.$obj->code_compta.'</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Account supplier code
-	if (! empty($arrayfields['s.code_compta_fournisseur']['checked']))
-	{
-		print '<td>'.$obj->code_compta_fournisseur.'</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Town
-	if (! empty($arrayfields['s.town']['checked']))
-	{
-		print "<td>".$obj->town."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Zip
-	if (! empty($arrayfields['s.zip']['checked']))
-	{
-		print "<td>".$obj->zip."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// State
-	if (! empty($arrayfields['state.nom']['checked']))
-	{
-		print "<td>".$obj->state_name."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Region
-	if (! empty($arrayfields['region.nom']['checked']))
-	{
-		print "<td>".$obj->region_name."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Country
-	if (! empty($arrayfields['country.code_iso']['checked']))
-	{
-		print '<td align="center">';
-		$tmparray=getCountry($obj->fk_pays,'all');
-		print $tmparray['label'];
-		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Type ent
-	if (! empty($arrayfields['typent.code']['checked']))
-	{
-		print '<td align="center">';
-		if (! is_array($typenArray) || count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
-		print $typenArray[$obj->typent_code];
-		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.email']['checked']))
-	{
-		print "<td>".$obj->email."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.phone']['checked']))
-	{
-		print "<td>".$obj->phone."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.url']['checked']))
-	{
-		print "<td>".$obj->url."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.siren']['checked']))
-	{
-		print "<td>".$obj->idprof1."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.siret']['checked']))
-	{
-		print "<td>".$obj->idprof2."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.ape']['checked']))
-	{
-		print "<td>".$obj->idprof3."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.idprof4']['checked']))
-	{
-		print "<td>".$obj->idprof4."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.idprof5']['checked']))
-	{
-		print "<td>".$obj->idprof5."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.idprof6']['checked']))
-	{
-		print "<td>".$obj->idprof6."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.tva_intra']['checked']))
-	{
-		print "<td>".$obj->tva_intra."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Type
-	if (! empty($arrayfields['customerorsupplier']['checked']))
-	{
-		print '<td align="center">';
-		$s='';
-		if (($obj->client==1 || $obj->client==3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
-		{
-	  		$companystatic->name=$langs->trans("Customer");
-	  		$companystatic->name_alias='';
-			$s.=$companystatic->getNomUrl(0,'customer',0,1);
-		}
-		if (($obj->client==2 || $obj->client==3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
-		{
-			if ($s) $s.=" / ";
-			$companystatic->name=$langs->trans("Prospect");
-	  		$companystatic->name_alias='';
-			$s.=$companystatic->getNomUrl(0,'prospect',0,1);
-		}
-		if (! empty($conf->fournisseur->enabled) && $obj->fournisseur)
-		{
-			if ($s) $s.=" / ";
-			$companystatic->name=$langs->trans("Supplier");
-	  		$companystatic->name_alias='';
-			$s.=$companystatic->getNomUrl(0,'supplier',0,1);
-		}
-		print $s;
-		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-
-	if (! empty($arrayfields['s.fk_prospectlevel']['checked']))
-	{
-		// Prospect level
-		print '<td align="center">';
-		print $companystatic->getLibProspLevel();
-		print "</td>";
-		if (! $i) $totalarray['nbfield']++;
-	}
-
-	if (! empty($arrayfields['s.fk_stcomm']['checked']))
-	{
-		// Prospect status
-		print '<td align="center" class="nowrap"><div class="nowrap">';
-		print '<div class="inline-block">'.$companystatic->LibProspCommStatut($obj->stcomm_id,2,$prospectstatic->cacheprospectstatus[$obj->stcomm_id]['label']);
-		print '</div> - <div class="inline-block">';
-		foreach($prospectstatic->cacheprospectstatus as $key => $val)
-		{
-			$titlealt='default';
-			if (! empty($val['code']) && ! in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt=$val['label'];
-			if ($obj->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommsocid='.$obj->rowid.'&stcomm='.$val['code'].'&action=setstcomm'.$param.($page?'&page='.urlencode($page):'').'">'.img_action($titlealt,$val['code']).'</a>';
-		}
-		print '</div></div></td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-	$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Date creation
-	if (! empty($arrayfields['s.datec']['checked']))
-	{
-		print '<td align="center" class="nowrap">';
-		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
-		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Date modification
-	if (! empty($arrayfields['s.tms']['checked']))
-	{
-		print '<td align="center" class="nowrap">';
-		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
-		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Status
-	if (! empty($arrayfields['s.status']['checked']))
-	{
-		print '<td align="center" class="nowrap">'.$companystatic->getLibStatut(3).'</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['s.import_key']['checked']))
-	{
-		print '<td class="tdoverflowmax100">';
-		print $obj->import_key;
-		print "</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-
-	// Action column
-	print '<td class="nowrap" align="center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-	{
-		$selected=0;
-		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
-	}
-	print '</td>';
-	if (! $i) $totalarray['nbfield']++;
-
-	print '</tr>'."\n";
-	$i++;
+    }
+
+    // Action column
+    print '<td class="nowrap" align="center">';
+    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+    {
+        $selected=0;
+        if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+        print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+    }
+    print '</td>';
+    if (! $i) $totalarray['nbfield']++;
+
+    print '</tr>'."\n";
+    $i++;
 }
 
 $db->free($resql);

Spacing +500 added lines, -500 removed lines

@@ -33,7 +33,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 	// Load $user and permissions
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
@@ -43,13 +43,13 @@ 
 
 $langs->loadLangs(array("companies", "commercial", "customers", "suppliers", "bills", "compta", "categories", "cashdesk"));
 
-$action=GETPOST('action','alpha');
-$massaction=GETPOST('massaction','alpha');
-$show_files=GETPOST('show_files','int');
-$confirm=GETPOST('confirm','alpha');
+$action = GETPOST('action', 'alpha');
+$massaction = GETPOST('massaction', 'alpha');
+$show_files = GETPOST('show_files', 'int');
+$confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
-$idcustomer = GETPOST('idcustomer','int');
-$place = GETPOST('place','int');
+$idcustomer = GETPOST('idcustomer', 'int');
+$place = GETPOST('place', 'int');
 
 $_GET['optioncss'] = 'print';
 
@@ -58,12 +58,12 @@ 
  * Actions
  */
 
-if ($action=="change") {
-    $sql="UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$idcustomer." where ref='(PROV-POS-".$place.")'";
+if ($action == "change") {
+    $sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$idcustomer." where ref='(PROV-POS-".$place.")'";
     $resql = $db->query($sql);
     ?>
     <script>
-    parent.$("#poslines").load("invoice.php?place="+<?php print $place;?>, function() {
+    parent.$("#poslines").load("invoice.php?place="+<?php print $place; ?>, function() {
         parent.$("#poslines").scrollTop(parent.$("#poslines")[0].scrollHeight);
         parent.$.colorbox.close();
     });
@@ -73,74 +73,74 @@ 
 }
 
 // Security check
-$socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user,'societe',$socid,'');
-
-$search_all=trim(GETPOST('search_all', 'alphanohtml')?GETPOST('search_all', 'alphanohtml'):GETPOST('sall', 'alphanohtml'));
-$search_cti=preg_replace('/^0+/', '', preg_replace('/[^0-9]/', '', GETPOST('search_cti', 'alphanohtml')));	// Phone number without any special chars
-
-$search_id=trim(GETPOST("search_id","int"));
-$search_nom=trim(GETPOST("search_nom"));
-$search_alias=trim(GETPOST("search_alias"));
-$search_nom_only=trim(GETPOST("search_nom_only"));
-$search_barcode=trim(GETPOST("search_barcode"));
-$search_customer_code=trim(GETPOST('search_customer_code'));
-$search_supplier_code=trim(GETPOST('search_supplier_code'));
-$search_account_customer_code=trim(GETPOST('search_account_customer_code'));
-$search_account_supplier_code=trim(GETPOST('search_account_supplier_code'));
-$search_town=trim(GETPOST("search_town"));
-$search_zip=trim(GETPOST("search_zip"));
-$search_state=trim(GETPOST("search_state"));
-$search_region=trim(GETPOST("search_region"));
-$search_email=trim(GETPOST('search_email'));
-$search_phone=trim(GETPOST('search_phone'));
-$search_url=trim(GETPOST('search_url'));
-$search_idprof1=trim(GETPOST('search_idprof1'));
-$search_idprof2=trim(GETPOST('search_idprof2'));
-$search_idprof3=trim(GETPOST('search_idprof3'));
-$search_idprof4=trim(GETPOST('search_idprof4'));
-$search_idprof5=trim(GETPOST('search_idprof5'));
-$search_idprof6=trim(GETPOST('search_idprof6'));
-$search_vat=trim(GETPOST('search_vat'));
-$search_sale=trim(GETPOST("search_sale",'int'));
-$search_categ_cus=trim(GETPOST("search_categ_cus",'int'));
-$search_categ_sup=trim(GETPOST("search_categ_sup",'int'));
-$search_country=GETPOST("search_country",'intcomma');
-$search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
-$search_status=GETPOST("search_status",'int');
-$search_type=GETPOST('search_type','alpha');
-$search_level_from = GETPOST("search_level_from","alpha");
-$search_level_to   = GETPOST("search_level_to","alpha");
-$search_stcomm=GETPOST('search_stcomm','int');
-$search_import_key  = GETPOST("search_import_key","alpha");
-
-$type=GETPOST('type');
-$optioncss=GETPOST('optioncss','alpha');
-$mode=GETPOST("mode");
-
-$diroutputmassaction=$conf->societe->dir_output . '/temp/massgeneration/'.$user->id;
-
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield=GETPOST("sortfield",'alpha');
-$sortorder=GETPOST("sortorder",'alpha');
-$page=GETPOST("page",'int');
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="s.nom";
+$socid = GETPOST('socid', 'int');
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'societe', $socid, '');
+
+$search_all = trim(GETPOST('search_all', 'alphanohtml') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_cti = preg_replace('/^0+/', '', preg_replace('/[^0-9]/', '', GETPOST('search_cti', 'alphanohtml'))); // Phone number without any special chars
+
+$search_id = trim(GETPOST("search_id", "int"));
+$search_nom = trim(GETPOST("search_nom"));
+$search_alias = trim(GETPOST("search_alias"));
+$search_nom_only = trim(GETPOST("search_nom_only"));
+$search_barcode = trim(GETPOST("search_barcode"));
+$search_customer_code = trim(GETPOST('search_customer_code'));
+$search_supplier_code = trim(GETPOST('search_supplier_code'));
+$search_account_customer_code = trim(GETPOST('search_account_customer_code'));
+$search_account_supplier_code = trim(GETPOST('search_account_supplier_code'));
+$search_town = trim(GETPOST("search_town"));
+$search_zip = trim(GETPOST("search_zip"));
+$search_state = trim(GETPOST("search_state"));
+$search_region = trim(GETPOST("search_region"));
+$search_email = trim(GETPOST('search_email'));
+$search_phone = trim(GETPOST('search_phone'));
+$search_url = trim(GETPOST('search_url'));
+$search_idprof1 = trim(GETPOST('search_idprof1'));
+$search_idprof2 = trim(GETPOST('search_idprof2'));
+$search_idprof3 = trim(GETPOST('search_idprof3'));
+$search_idprof4 = trim(GETPOST('search_idprof4'));
+$search_idprof5 = trim(GETPOST('search_idprof5'));
+$search_idprof6 = trim(GETPOST('search_idprof6'));
+$search_vat = trim(GETPOST('search_vat'));
+$search_sale = trim(GETPOST("search_sale", 'int'));
+$search_categ_cus = trim(GETPOST("search_categ_cus", 'int'));
+$search_categ_sup = trim(GETPOST("search_categ_sup", 'int'));
+$search_country = GETPOST("search_country", 'intcomma');
+$search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
+$search_status = GETPOST("search_status", 'int');
+$search_type = GETPOST('search_type', 'alpha');
+$search_level_from = GETPOST("search_level_from", "alpha");
+$search_level_to   = GETPOST("search_level_to", "alpha");
+$search_stcomm = GETPOST('search_stcomm', 'int');
+$search_import_key = GETPOST("search_import_key", "alpha");
+
+$type = GETPOST('type');
+$optioncss = GETPOST('optioncss', 'alpha');
+$mode = GETPOST("mode");
+
+$diroutputmassaction = $conf->societe->dir_output.'/temp/massgeneration/'.$user->id;
+
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "s.nom";
 if (empty($page) || $page == -1) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$contextpage='thirdpartylist';
+$contextpage = 'thirdpartylist';
 /*if ($search_type == '1,3') { $contextpage='customerlist'; $type='c'; }
 if ($search_type == '2,3') { $contextpage='prospectlist'; $type='p'; }
 if ($search_type == '4') { $contextpage='supplierlist'; $type='f'; }
 */
-if ($type == 'c') { $contextpage='customerlist'; if ($search_type=='') $search_type='1,3'; }
-if ($type == 'p') { $contextpage='prospectlist'; if ($search_type=='') $search_type='2,3'; }
-if ($type == 'f') { $contextpage='supplierlist'; if ($search_type=='') $search_type='4'; }
+if ($type == 'c') { $contextpage = 'customerlist'; if ($search_type == '') $search_type = '1,3'; }
+if ($type == 'p') { $contextpage = 'prospectlist'; if ($search_type == '') $search_type = '2,3'; }
+if ($type == 'f') { $contextpage = 'supplierlist'; if ($search_type == '') $search_type = '4'; }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array($contextpage));
@@ -148,7 +148,7 @@ 
 
 // fetch optionals attributes and labels
 $extralabels = $extrafields->fetch_name_optionals_label('societe');
-$search_array_options=$extrafields->getOptionalsFromPost('societe','','search_');
+$search_array_options = $extrafields->getOptionalsFromPost('societe', '', 'search_');
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
@@ -165,37 +165,37 @@ 
 	's.siret'=>"ProfId2",
 	's.ape'=>"ProfId3",
 );
-if (($tmp = $langs->transnoentities("ProfId4".$mysoc->country_code)) && $tmp != "ProfId4".$mysoc->country_code && $tmp != '-') $fieldstosearchall['s.idprof4']='ProfId4';
-if (($tmp = $langs->transnoentities("ProfId5".$mysoc->country_code)) && $tmp != "ProfId5".$mysoc->country_code && $tmp != '-') $fieldstosearchall['s.idprof5']='ProfId5';
-if (($tmp = $langs->transnoentities("ProfId6".$mysoc->country_code)) && $tmp != "ProfId6".$mysoc->country_code && $tmp != '-') $fieldstosearchall['s.idprof6']='ProfId6';
-if (!empty($conf->barcode->enabled)) $fieldstosearchall['s.barcode']='Gencod';
+if (($tmp = $langs->transnoentities("ProfId4".$mysoc->country_code)) && $tmp != "ProfId4".$mysoc->country_code && $tmp != '-') $fieldstosearchall['s.idprof4'] = 'ProfId4';
+if (($tmp = $langs->transnoentities("ProfId5".$mysoc->country_code)) && $tmp != "ProfId5".$mysoc->country_code && $tmp != '-') $fieldstosearchall['s.idprof5'] = 'ProfId5';
+if (($tmp = $langs->transnoentities("ProfId6".$mysoc->country_code)) && $tmp != "ProfId6".$mysoc->country_code && $tmp != '-') $fieldstosearchall['s.idprof6'] = 'ProfId6';
+if (!empty($conf->barcode->enabled)) $fieldstosearchall['s.barcode'] = 'Gencod';
 
 // Define list of fields to show into list
-$checkedcustomercode=(in_array($contextpage, array('thirdpartylist', 'customerlist', 'prospectlist')) ? 1 : 0);
-$checkedsuppliercode=(in_array($contextpage, array('supplierlist')) ? 1 : 0);
-$checkedcustomeraccountcode=(in_array($contextpage, array('customerlist')) ? 1 : 0);
-$checkedsupplieraccountcode=(in_array($contextpage, array('supplierlist')) ? 1 : 0);
-$checkedtypetiers=1;
-$checkedprofid1=0;
-$checkedprofid2=0;
-$checkedprofid3=0;
-$checkedprofid4=0;
-$checkedprofid5=0;
-$checkedprofid6=0;
+$checkedcustomercode = (in_array($contextpage, array('thirdpartylist', 'customerlist', 'prospectlist')) ? 1 : 0);
+$checkedsuppliercode = (in_array($contextpage, array('supplierlist')) ? 1 : 0);
+$checkedcustomeraccountcode = (in_array($contextpage, array('customerlist')) ? 1 : 0);
+$checkedsupplieraccountcode = (in_array($contextpage, array('supplierlist')) ? 1 : 0);
+$checkedtypetiers = 1;
+$checkedprofid1 = 0;
+$checkedprofid2 = 0;
+$checkedprofid3 = 0;
+$checkedprofid4 = 0;
+$checkedprofid5 = 0;
+$checkedprofid6 = 0;
 //$checkedprofid4=((($tmp = $langs->transnoentities("ProfId4".$mysoc->country_code)) && $tmp != "ProfId4".$mysoc->country_code && $tmp != '-') ? 1 : 0);
 //$checkedprofid5=((($tmp = $langs->transnoentities("ProfId5".$mysoc->country_code)) && $tmp != "ProfId5".$mysoc->country_code && $tmp != '-') ? 1 : 0);
 //$checkedprofid6=((($tmp = $langs->transnoentities("ProfId6".$mysoc->country_code)) && $tmp != "ProfId6".$mysoc->country_code && $tmp != '-') ? 1 : 0);
-$checkprospectlevel=(in_array($contextpage, array('prospectlist')) ? 1 : 0);
-$checkstcomm=(in_array($contextpage, array('prospectlist')) ? 1 : 0);
-$arrayfields=array(
-	's.rowid'=>array('label'=>"TechnicalID", 'checked'=>($conf->global->MAIN_SHOW_TECHNICAL_ID?1:0), 'enabled'=>($conf->global->MAIN_SHOW_TECHNICAL_ID?1:0)),
+$checkprospectlevel = (in_array($contextpage, array('prospectlist')) ? 1 : 0);
+$checkstcomm = (in_array($contextpage, array('prospectlist')) ? 1 : 0);
+$arrayfields = array(
+	's.rowid'=>array('label'=>"TechnicalID", 'checked'=>($conf->global->MAIN_SHOW_TECHNICAL_ID ? 1 : 0), 'enabled'=>($conf->global->MAIN_SHOW_TECHNICAL_ID ? 1 : 0)),
 	's.nom'=>array('label'=>"ThirdPartyName", 'checked'=>1),
 	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>1),
-	's.barcode'=>array('label'=>"Gencod", 'checked'=>1, 'enabled'=>(! empty($conf->barcode->enabled))),
+	's.barcode'=>array('label'=>"Gencod", 'checked'=>1, 'enabled'=>(!empty($conf->barcode->enabled))),
 	's.code_client'=>array('label'=>"CustomerCodeShort", 'checked'=>$checkedcustomercode),
-	's.code_fournisseur'=>array('label'=>"SupplierCodeShort", 'checked'=>$checkedsuppliercode, 'enabled'=>(! empty($conf->fournisseur->enabled))),
+	's.code_fournisseur'=>array('label'=>"SupplierCodeShort", 'checked'=>$checkedsuppliercode, 'enabled'=>(!empty($conf->fournisseur->enabled))),
 	's.code_compta'=>array('label'=>"CustomerAccountancyCodeShort", 'checked'=>$checkedcustomeraccountcode),
-	's.code_compta_fournisseur'=>array('label'=>"SupplierAccountancyCodeShort", 'checked'=>$checkedsupplieraccountcode, 'enabled'=>(! empty($conf->fournisseur->enabled))),
+	's.code_compta_fournisseur'=>array('label'=>"SupplierAccountancyCodeShort", 'checked'=>$checkedsupplieraccountcode, 'enabled'=>(!empty($conf->fournisseur->enabled))),
 	's.town'=>array('label'=>"Town", 'checked'=>1),
 	's.zip'=>array('label'=>"Zip", 'checked'=>1),
 	'state.nom'=>array('label'=>"State", 'checked'=>0),
@@ -223,9 +223,9 @@ 
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-   foreach($extrafields->attribute_label as $key => $val)
+   foreach ($extrafields->attribute_label as $key => $val)
    {
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+		if (!empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key] = array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key] < 0) ? 0 : 1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key]) != 3 && $extrafields->attribute_perms[$key]));
    }
 }
 
@@ -236,11 +236,11 @@ 
  * Actions
  */
 
-if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction','alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array();
+$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 (empty($reshook))
@@ -249,47 +249,47 @@ 
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Did we click on purge search criteria ?
-	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 	{
-		$search_id='';
-		$search_nom='';
-		$search_alias='';
-		$search_categ_cus=0;
-		$search_categ_sup=0;
-		$search_sale='';
-		$search_barcode="";
-		$search_customer_code='';
-		$search_supplier_code='';
-		$search_account_customer_code='';
-		$search_account_supplier_code='';
-		$search_town="";
-		$search_zip="";
-		$search_state="";
-		$search_country='';
-		$search_email='';
-		$search_phone='';
-		$search_url='';
-		$search_idprof1='';
-		$search_idprof2='';
-		$search_idprof3='';
-		$search_idprof4='';
-		$search_idprof5='';
-		$search_idprof6='';
-		$search_vat='';
-		$search_type='';
-		$search_type_thirdparty='';
-		$search_status=-1;
-		$search_stcomm='';
-	 	$search_level_from='';
-	 	$search_level_to='';
-	 	$search_import_key='';
-	 	$toselect='';
-		$search_array_options=array();
+		$search_id = '';
+		$search_nom = '';
+		$search_alias = '';
+		$search_categ_cus = 0;
+		$search_categ_sup = 0;
+		$search_sale = '';
+		$search_barcode = "";
+		$search_customer_code = '';
+		$search_supplier_code = '';
+		$search_account_customer_code = '';
+		$search_account_supplier_code = '';
+		$search_town = "";
+		$search_zip = "";
+		$search_state = "";
+		$search_country = '';
+		$search_email = '';
+		$search_phone = '';
+		$search_url = '';
+		$search_idprof1 = '';
+		$search_idprof2 = '';
+		$search_idprof3 = '';
+		$search_idprof4 = '';
+		$search_idprof5 = '';
+		$search_idprof6 = '';
+		$search_vat = '';
+		$search_type = '';
+		$search_type_thirdparty = '';
+		$search_status = -1;
+		$search_stcomm = '';
+	 	$search_level_from = '';
+	 	$search_level_to = '';
+	 	$search_import_key = '';
+	 	$toselect = '';
+		$search_array_options = array();
 	}
 
 	// Mass actions
-	$objectclass='Societe';
-	$objectlabel='ThirdParty';
+	$objectclass = 'Societe';
+	$objectlabel = 'ThirdParty';
 	$permtoread = $user->rights->societe->lire;
 	$permtodelete = $user->rights->societe->supprimer;
 	$uploaddir = $conf->societe->dir_output;
@@ -298,16 +298,16 @@ 
 	if ($action == 'setstcomm')
 	{
 		$object = new Client($db);
-		$result=$object->fetch(GETPOST('stcommsocid'));
-		$object->stcomm_id=dol_getIdFromCode($db, GETPOST('stcomm','alpha'), 'c_stcomm');
-		$result=$object->update($object->id, $user);
-		if ($result < 0) setEventMessages($object->error,$object->errors,'errors');
+		$result = $object->fetch(GETPOST('stcommsocid'));
+		$object->stcomm_id = dol_getIdFromCode($db, GETPOST('stcomm', 'alpha'), 'c_stcomm');
+		$result = $object->update($object->id, $user);
+		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 
-		$action='';
+		$action = '';
 	}
 }
 
-if ($search_status=='') $search_status=1; // always display active thirdparty first
+if ($search_status == '') $search_status = 1; // always display active thirdparty first
 
 
 
@@ -324,19 +324,19 @@ 
  External user socid=x + No permission to see ALL customers => Can see only himself
  */
 
-$form=new Form($db);
-$formother=new FormOther($db);
-$companystatic=new Societe($db);
-$formcompany=new FormCompany($db);
-$prospectstatic=new Client($db);
-$prospectstatic->client=2;
+$form = new Form($db);
+$formother = new FormOther($db);
+$companystatic = new Societe($db);
+$formcompany = new FormCompany($db);
+$prospectstatic = new Client($db);
+$prospectstatic->client = 2;
 $prospectstatic->loadCacheOfProspStatus();
 
 
-$title=$langs->trans("ListOfThirdParties");
-if ($type == 'c' && (empty($search_type) || ($search_type == '1,3'))) $title=$langs->trans("ListOfCustomers");
-if ($type == 'p' && (empty($search_type) || ($search_type == '2,3'))) $title=$langs->trans("ListOfProspects");
-if ($type == 'f' && (empty($search_type) || ($search_type == '4'))) $title=$langs->trans("ListOfSuppliers");
+$title = $langs->trans("ListOfThirdParties");
+if ($type == 'c' && (empty($search_type) || ($search_type == '1,3'))) $title = $langs->trans("ListOfCustomers");
+if ($type == 'p' && (empty($search_type) || ($search_type == '2,3'))) $title = $langs->trans("ListOfProspects");
+if ($type == 'f' && (empty($search_type) || ($search_type == '4'))) $title = $langs->trans("ListOfSuppliers");
 
 // If both parameters are set, search for everything BETWEEN them
 if ($search_level_from != '' && $search_level_to != '')
@@ -381,11 +381,11 @@ 
 }
 
 // Select every potentiels, and note each potentiels which fit in search parameters
-dol_syslog('societe/list.php',LOG_DEBUG);
+dol_syslog('societe/list.php', LOG_DEBUG);
 $sql = "SELECT code, label, sortorder, ".$sortwhere;
-$sql.= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
-$sql.= " WHERE active > 0";
-$sql.= " ORDER BY sortorder";
+$sql .= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
+$sql .= " WHERE active > 0";
+$sql .= " ORDER BY sortorder";
 
 $resql = $db->query($sql);
 if ($resql)
@@ -396,8 +396,8 @@ 
 	while ($obj = $db->fetch_object($resql))
 	{
 		// Compute level text
-		$level=$langs->trans($obj->code);
-		if ($level == $obj->code) $level=$langs->trans($obj->label);
+		$level = $langs->trans($obj->code);
+		if ($level == $obj->code) $level = $langs->trans($obj->label);
 
 		// Put it in the array sorted by sortorder
 		$tab_level[$obj->sortorder] = $level;
@@ -416,93 +416,93 @@ 
 else dol_print_error($db);
 
 $sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.barcode, s.town, s.zip, s.datec, s.code_client, s.code_fournisseur, s.logo,";
-$sql.= " st.libelle as stcomm, s.fk_stcomm as stcomm_id, s.fk_prospectlevel, s.prefix_comm, s.client, s.fournisseur, s.canvas, s.status as status,";
-$sql.= " s.email, s.phone, s.url, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4 as idprof4, s.idprof5 as idprof5, s.idprof6 as idprof6, s.tva_intra, s.fk_pays,";
-$sql.= " s.tms as date_update, s.datec as date_creation,";
-$sql.= " s.code_compta,s.code_compta_fournisseur,";
-$sql.= " typent.code as typent_code,";
-$sql.= " state.code_departement as state_code, state.nom as state_name,";
-$sql.= " region.code_region as region_code, region.nom as region_name";
+$sql .= " st.libelle as stcomm, s.fk_stcomm as stcomm_id, s.fk_prospectlevel, s.prefix_comm, s.client, s.fournisseur, s.canvas, s.status as status,";
+$sql .= " s.email, s.phone, s.url, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4 as idprof4, s.idprof5 as idprof5, s.idprof6 as idprof6, s.tva_intra, s.fk_pays,";
+$sql .= " s.tms as date_update, s.datec as date_creation,";
+$sql .= " s.code_compta,s.code_compta_fournisseur,";
+$sql .= " typent.code as typent_code,";
+$sql .= " state.code_departement as state_code, state.nom as state_name,";
+$sql .= " region.code_region as region_code, region.nom as region_name";
 // We'll need these fields in order to filter by sale (including the case where the user can only see his prospects)
 if ($search_sale) $sql .= ", sc.fk_soc, sc.fk_user";
 // We'll need these fields in order to filter by categ
 if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
 if ($search_categ_sup) $sql .= ", cs.fk_categorie, cs.fk_soc";
 // Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+foreach ($extrafields->attribute_label as $key => $val) $sql .= ($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as ef on (s.rowid = ef.fk_object)";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as region on (region.	code_region = state.fk_region)";
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as ef on (s.rowid = ef.fk_object)";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as region on (region.	code_region = state.fk_region)";
 // We'll need this table joined to the select in order to filter by categ
-if (! empty($search_categ_cus)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
-if (! empty($search_categ_sup)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cs ON s.rowid = cs.fk_soc"; // We'll need this table joined to the select in order to filter by categ
-$sql.= " ,".MAIN_DB_PREFIX."c_stcomm as st";
+if (!empty($search_categ_cus)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+if (!empty($search_categ_sup)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cs ON s.rowid = cs.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+$sql .= " ,".MAIN_DB_PREFIX."c_stcomm as st";
 // We'll need this table joined to the select in order to filter by sale
-if ($search_sale || (!$user->rights->societe->client->voir && !$socid)) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= " WHERE s.fk_stcomm = st.id";
-$sql.= " AND s.entity IN (".getEntity('societe').")";
-if (! $user->rights->societe->client->voir && ! $socid)	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid)                $sql.= " AND s.rowid = ".$socid;
-if ($search_sale)          $sql.= " AND s.rowid = sc.fk_soc";        // Join for the needed table to filter by sale
-if (! $user->rights->fournisseur->lire) $sql.=" AND (s.fournisseur <> 1 OR s.client <> 0)";    // client=0, fournisseur=0 must be visible
-if ($search_sale)          $sql.= " AND sc.fk_user = ".$db->escape($search_sale);
-if ($search_categ_cus > 0) $sql.= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
-if ($search_categ_sup > 0) $sql.= " AND cs.fk_categorie = ".$db->escape($search_categ_sup);
-if ($search_categ_cus == -2)   $sql.= " AND cc.fk_categorie IS NULL";
-if ($search_categ_sup == -2)   $sql.= " AND cs.fk_categorie IS NULL";
-
-if ($search_all)           $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
-if (strlen($search_cti))   $sql.= natural_search('s.phone', $search_cti);
-
-if ($search_id > 0)        $sql.= natural_search("s.rowid",$search_id,1);
-if ($search_nom)           $sql.= natural_search("s.nom",$search_nom);
-if ($search_alias)         $sql.= natural_search("s.name_alias",$search_alias);
-if ($search_nom_only)      $sql.= natural_search("s.nom",$search_nom_only);
-if ($search_customer_code) $sql.= natural_search("s.code_client",$search_customer_code);
-if ($search_supplier_code) $sql.= natural_search("s.code_fournisseur",$search_supplier_code);
-if ($search_account_customer_code) $sql.= natural_search("s.code_compta",$search_account_customer_code);
-if ($search_account_supplier_code) $sql.= natural_search("s.code_compta_fournisseur",$search_account_supplier_code);
-if ($search_town)          $sql.= natural_search("s.town",$search_town);
-if (strlen($search_zip))   $sql.= natural_search("s.zip",$search_zip);
-if ($search_state)         $sql.= natural_search("state.nom",$search_state);
-if ($search_region)         $sql.= natural_search("region.nom",$search_region);
+if ($search_sale || (!$user->rights->societe->client->voir && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql .= " WHERE s.fk_stcomm = st.id";
+$sql .= " AND s.entity IN (".getEntity('societe').")";
+if (!$user->rights->societe->client->voir && !$socid)	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+if ($socid)                $sql .= " AND s.rowid = ".$socid;
+if ($search_sale)          $sql .= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+if (!$user->rights->fournisseur->lire) $sql .= " AND (s.fournisseur <> 1 OR s.client <> 0)"; // client=0, fournisseur=0 must be visible
+if ($search_sale)          $sql .= " AND sc.fk_user = ".$db->escape($search_sale);
+if ($search_categ_cus > 0) $sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
+if ($search_categ_sup > 0) $sql .= " AND cs.fk_categorie = ".$db->escape($search_categ_sup);
+if ($search_categ_cus == -2)   $sql .= " AND cc.fk_categorie IS NULL";
+if ($search_categ_sup == -2)   $sql .= " AND cs.fk_categorie IS NULL";
+
+if ($search_all)           $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+if (strlen($search_cti))   $sql .= natural_search('s.phone', $search_cti);
+
+if ($search_id > 0)        $sql .= natural_search("s.rowid", $search_id, 1);
+if ($search_nom)           $sql .= natural_search("s.nom", $search_nom);
+if ($search_alias)         $sql .= natural_search("s.name_alias", $search_alias);
+if ($search_nom_only)      $sql .= natural_search("s.nom", $search_nom_only);
+if ($search_customer_code) $sql .= natural_search("s.code_client", $search_customer_code);
+if ($search_supplier_code) $sql .= natural_search("s.code_fournisseur", $search_supplier_code);
+if ($search_account_customer_code) $sql .= natural_search("s.code_compta", $search_account_customer_code);
+if ($search_account_supplier_code) $sql .= natural_search("s.code_compta_fournisseur", $search_account_supplier_code);
+if ($search_town)          $sql .= natural_search("s.town", $search_town);
+if (strlen($search_zip))   $sql .= natural_search("s.zip", $search_zip);
+if ($search_state)         $sql .= natural_search("state.nom", $search_state);
+if ($search_region)         $sql .= natural_search("region.nom", $search_region);
 if ($search_country)       $sql .= " AND s.fk_pays IN (".$search_country.')';
-if ($search_email)         $sql.= natural_search("s.email",$search_email);
-if (strlen($search_phone)) $sql.= natural_search("s.phone", $search_phone);
-if ($search_url)           $sql.= natural_search("s.url",$search_url);
-if (strlen($search_idprof1)) $sql.= natural_search("s.siren",$search_idprof1);
-if (strlen($search_idprof2)) $sql.= natural_search("s.siret",$search_idprof2);
-if (strlen($search_idprof3)) $sql.= natural_search("s.ape",$search_idprof3);
-if (strlen($search_idprof4)) $sql.= natural_search("s.idprof4",$search_idprof4);
-if (strlen($search_idprof5)) $sql.= natural_search("s.idprof5",$search_idprof5);
-if (strlen($search_idprof6)) $sql.= natural_search("s.idprof6",$search_idprof6);
-if (strlen($search_vat))     $sql.= natural_search("s.tva_intra",$search_vat);
+if ($search_email)         $sql .= natural_search("s.email", $search_email);
+if (strlen($search_phone)) $sql .= natural_search("s.phone", $search_phone);
+if ($search_url)           $sql .= natural_search("s.url", $search_url);
+if (strlen($search_idprof1)) $sql .= natural_search("s.siren", $search_idprof1);
+if (strlen($search_idprof2)) $sql .= natural_search("s.siret", $search_idprof2);
+if (strlen($search_idprof3)) $sql .= natural_search("s.ape", $search_idprof3);
+if (strlen($search_idprof4)) $sql .= natural_search("s.idprof4", $search_idprof4);
+if (strlen($search_idprof5)) $sql .= natural_search("s.idprof5", $search_idprof5);
+if (strlen($search_idprof6)) $sql .= natural_search("s.idprof6", $search_idprof6);
+if (strlen($search_vat))     $sql .= natural_search("s.tva_intra", $search_vat);
 // Filter on type of thirdparty
-if ($search_type > 0 && in_array($search_type,array('1,3','2,3'))) $sql .= " AND s.client IN (".$db->escape($search_type).")";
-if ($search_type > 0 && in_array($search_type,array('4')))         $sql .= " AND s.fournisseur = 1";
+if ($search_type > 0 && in_array($search_type, array('1,3', '2,3'))) $sql .= " AND s.client IN (".$db->escape($search_type).")";
+if ($search_type > 0 && in_array($search_type, array('4')))         $sql .= " AND s.fournisseur = 1";
 if ($search_type == '0') $sql .= " AND s.client = 0 AND s.fournisseur = 0";
-if ($search_status!='' && $search_status >= 0) $sql .= " AND s.status = ".$db->escape($search_status);
-if (!empty($conf->barcode->enabled) && $search_barcode) $sql.= natural_search("s.barcode", $search_barcode);
+if ($search_status != '' && $search_status >= 0) $sql .= " AND s.status = ".$db->escape($search_status);
+if (!empty($conf->barcode->enabled) && $search_barcode) $sql .= natural_search("s.barcode", $search_barcode);
 if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
 if ($search_levels)  $sql .= " AND s.fk_prospectlevel IN (".$search_levels.')';
-if ($search_stcomm != '' && $search_stcomm != -2) $sql.= natural_search("s.fk_stcomm",$search_stcomm,2);
-if ($search_import_key)    $sql.= natural_search("s.import_key",$search_import_key);
+if ($search_stcomm != '' && $search_stcomm != -2) $sql .= natural_search("s.fk_stcomm", $search_stcomm, 2);
+if ($search_import_key)    $sql .= natural_search("s.import_key", $search_import_key);
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 
 // Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 
-$sql.= $db->order($sortfield,$sortorder);
+$sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
@@ -512,10 +512,10 @@ 
 	$nbtotalofrecords = $db->num_rows($result);
 }
 
-$sql.= $db->plimit($limit+1, $offset);
+$sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
-if (! $resql)
+if (!$resql)
 {
 	dol_print_error($db);
 	exit;
@@ -523,9 +523,9 @@ 
 
 $num = $db->num_rows($resql);
 
-$arrayofselected=is_array($toselect)?$toselect:array();
+$arrayofselected = is_array($toselect) ? $toselect : array();
 
-if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && ($search_all != '' || $search_cti != '') && $action != 'list')
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && ($search_all != '' || $search_cti != '') && $action != 'list')
 {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
@@ -533,66 +533,66 @@ 
 	exit;
 }
 
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$langs->trans("ThirdParty"),$help_url);
+$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $langs->trans("ThirdParty"), $help_url);
 
-$param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 if ($search_all != '')     $param = "&sall=".urlencode($search_all);
 if ($sall != '')           $param .= "&sall=".urlencode($sall);
-if ($search_categ_cus > 0) $param.='&search_categ_cus='.urlencode($search_categ_cus);
-if ($search_categ_sup > 0) $param.='&search_categ_sup='.urlencode($search_categ_sup);
-if ($search_sale > 0)	   $param.='&search_sale='.urlencode($search_sale);
-if ($search_id > 0)        $param.= "&search_id=".urlencode($search_id);
-if ($search_nom != '')     $param.= "&search_nom=".urlencode($search_nom);
-if ($search_alias != '')   $param.= "&search_alias=".urlencode($search_alias);
-if ($search_town != '')    $param.= "&search_town=".urlencode($search_town);
-if ($search_zip != '')     $param.= "&search_zip=".urlencode($search_zip);
-if ($search_phone != '')   $param.= "&search_phone=".urlencode($search_phone);
-if ($search_email != '')   $param.= "&search_email=".urlencode($search_email);
-if ($search_url != '')     $param.= "&search_url=".urlencode($search_url);
-if ($search_state != '')   $param.= "&search_state=".urlencode($search_state);
-if ($search_country != '') $param.= "&search_country=".urlencode($search_country);
-if ($search_customer_code != '') $param.= "&search_customer_code=".urlencode($search_customer_code);
-if ($search_supplier_code != '') $param.= "&search_supplier_code=".urlencode($search_supplier_code);
-if ($search_account_customer_code != '') $param.= "&search_account_customer_code=".urlencode($search_account_customer_code);
-if ($search_account_supplier_code != '') $param.= "&search_account_supplier_code=".urlencode($search_account_supplier_code);
-if ($search_barcode != '') $param.= "&search_barcode=".urlencode($search_barcode);
-if ($search_idprof1 != '') $param.= '&search_idprof1='.urlencode($search_idprof1);
-if ($search_idprof2 != '') $param.= '&search_idprof2='.urlencode($search_idprof2);
-if ($search_idprof3 != '') $param.= '&search_idprof3='.urlencode($search_idprof3);
-if ($search_idprof4 != '') $param.= '&search_idprof4='.urlencode($search_idprof4);
-if ($search_idprof5 != '') $param.= '&search_idprof5='.urlencode($search_idprof5);
-if ($search_idprof6 != '') $param.= '&search_idprof6='.urlencode($search_idprof6);
-if ($search_vat != '')     $param.= '&search_vat='.urlencode($search_vat);
-if ($search_type_thirdparty != '')    $param.='&search_type_thirdparty='.urlencode($search_type_thirdparty);
-if ($search_type != '')    $param.='&search_type='.urlencode($search_type);
-if ($optioncss != '')      $param.='&optioncss='.urlencode($optioncss);
-if ($search_status != '')  $param.='&search_status='.urlencode($search_status);
-if ($search_stcomm != '')  $param.='&search_stcomm='.urlencode($search_stcomm);
-if ($search_level_from != '') $param.='&search_level_from='.urlencode($search_level_from);
-if ($search_level_to != '')   $param.='&search_level_to='.urlencode($search_level_to);
-if ($search_import_key != '') $param.='&search_import_key='.urlencode($search_import_key);
-if ($type != '') $param.='&type='.urlencode($type);
+if ($search_categ_cus > 0) $param .= '&search_categ_cus='.urlencode($search_categ_cus);
+if ($search_categ_sup > 0) $param .= '&search_categ_sup='.urlencode($search_categ_sup);
+if ($search_sale > 0)	   $param .= '&search_sale='.urlencode($search_sale);
+if ($search_id > 0)        $param .= "&search_id=".urlencode($search_id);
+if ($search_nom != '')     $param .= "&search_nom=".urlencode($search_nom);
+if ($search_alias != '')   $param .= "&search_alias=".urlencode($search_alias);
+if ($search_town != '')    $param .= "&search_town=".urlencode($search_town);
+if ($search_zip != '')     $param .= "&search_zip=".urlencode($search_zip);
+if ($search_phone != '')   $param .= "&search_phone=".urlencode($search_phone);
+if ($search_email != '')   $param .= "&search_email=".urlencode($search_email);
+if ($search_url != '')     $param .= "&search_url=".urlencode($search_url);
+if ($search_state != '')   $param .= "&search_state=".urlencode($search_state);
+if ($search_country != '') $param .= "&search_country=".urlencode($search_country);
+if ($search_customer_code != '') $param .= "&search_customer_code=".urlencode($search_customer_code);
+if ($search_supplier_code != '') $param .= "&search_supplier_code=".urlencode($search_supplier_code);
+if ($search_account_customer_code != '') $param .= "&search_account_customer_code=".urlencode($search_account_customer_code);
+if ($search_account_supplier_code != '') $param .= "&search_account_supplier_code=".urlencode($search_account_supplier_code);
+if ($search_barcode != '') $param .= "&search_barcode=".urlencode($search_barcode);
+if ($search_idprof1 != '') $param .= '&search_idprof1='.urlencode($search_idprof1);
+if ($search_idprof2 != '') $param .= '&search_idprof2='.urlencode($search_idprof2);
+if ($search_idprof3 != '') $param .= '&search_idprof3='.urlencode($search_idprof3);
+if ($search_idprof4 != '') $param .= '&search_idprof4='.urlencode($search_idprof4);
+if ($search_idprof5 != '') $param .= '&search_idprof5='.urlencode($search_idprof5);
+if ($search_idprof6 != '') $param .= '&search_idprof6='.urlencode($search_idprof6);
+if ($search_vat != '')     $param .= '&search_vat='.urlencode($search_vat);
+if ($search_type_thirdparty != '')    $param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+if ($search_type != '')    $param .= '&search_type='.urlencode($search_type);
+if ($optioncss != '')      $param .= '&optioncss='.urlencode($optioncss);
+if ($search_status != '')  $param .= '&search_status='.urlencode($search_status);
+if ($search_stcomm != '')  $param .= '&search_stcomm='.urlencode($search_stcomm);
+if ($search_level_from != '') $param .= '&search_level_from='.urlencode($search_level_from);
+if ($search_level_to != '')   $param .= '&search_level_to='.urlencode($search_level_to);
+if ($search_import_key != '') $param .= '&search_import_key='.urlencode($search_import_key);
+if ($type != '') $param .= '&type='.urlencode($type);
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 // Show delete result message
 if (GETPOST('delsoc'))
 {
-	setEventMessages($langs->trans("CompanyDeleted",GETPOST('delsoc')), null, 'mesgs');
+	setEventMessages($langs->trans("CompanyDeleted", GETPOST('delsoc')), null, 'mesgs');
 }
 
 // List of mass actions available
-$arrayofmassactions =  array(
+$arrayofmassactions = array(
 	'presend'=>$langs->trans("SendByMail"),
 //    'builddoc'=>$langs->trans("PDFMerge"),
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
-if ($user->rights->societe->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
-if (GETPOST('nomassaction','int') || in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
-$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+if ($user->rights->societe->supprimer) $arrayofmassactions['predelete'] = $langs->trans("Delete");
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -605,244 +605,244 @@ 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
 
 $langs->load("other");
-$textprofid=array();
-foreach(array(1,2,3,4,5,6) as $key)
+$textprofid = array();
+foreach (array(1, 2, 3, 4, 5, 6) as $key)
 {
-	$label=$langs->transnoentities("ProfId".$key.$mysoc->country_code);
-	$textprofid[$key]='';
+	$label = $langs->transnoentities("ProfId".$key.$mysoc->country_code);
+	$textprofid[$key] = '';
 	if ($label != "ProfId".$key.$mysoc->country_code)
 	{	// Get only text between ()
-		if (preg_match('/\((.*)\)/i',$label,$reg)) $label=$reg[1];
-		$textprofid[$key]=$langs->trans("ProfIdShortDesc",$key,$mysoc->country_code,$label);
+		if (preg_match('/\((.*)\)/i', $label, $reg)) $label = $reg[1];
+		$textprofid[$key] = $langs->trans("ProfIdShortDesc", $key, $mysoc->country_code, $label);
 	}
 }
 
-$topicmail="Information";
-$modelmail="thirdparty";
-$objecttmp=new Societe($db);
-$trackid='thi'.$object->id;
+$topicmail = "Information";
+$modelmail = "thirdparty";
+$objecttmp = new Societe($db);
+$trackid = 'thi'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($search_all)
 {
-	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-	print $langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall);
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print $langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall);
 }
 
 // Filter on categories
-$moreforfilter='';
+$moreforfilter = '';
 if (empty($type) || $type == 'c' || $type == 'p')
 {
-	if (! empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled))
 	{
-		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-		$moreforfilter.='<div class="divsearchfield">';
-	 	$moreforfilter.=$langs->trans('CustomersProspectsCategoriesShort').': ';
-		$moreforfilter.=$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $langs->trans('CustomersProspectsCategoriesShort'));
-	 	$moreforfilter.='</div>';
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		$moreforfilter .= '<div class="divsearchfield">';
+	 	$moreforfilter .= $langs->trans('CustomersProspectsCategoriesShort').': ';
+		$moreforfilter .= $formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $langs->trans('CustomersProspectsCategoriesShort'));
+	 	$moreforfilter .= '</div>';
 	}
 }
 if (empty($type) || $type == 'f')
 {
-	if (! empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled))
 	{
-		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-		$moreforfilter.='<div class="divsearchfield">';
-		$moreforfilter.=$langs->trans('SuppliersCategoriesShort').': ';
-		$moreforfilter.=$formother->select_categories('supplier',$search_categ_sup,'search_categ_sup',1);
-		$moreforfilter.='</div>';
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		$moreforfilter .= '<div class="divsearchfield">';
+		$moreforfilter .= $langs->trans('SuppliersCategoriesShort').': ';
+		$moreforfilter .= $formother->select_categories('supplier', $search_categ_sup, 'search_categ_sup', 1);
+		$moreforfilter .= '</div>';
 	}
 }
 
 // If the user can view prospects other than his'
 if ($user->rights->societe->client->voir || $socid)
 {
- 	$moreforfilter.='<div class="divsearchfield">';
- 	$moreforfilter.=$langs->trans('SalesRepresentatives'). ': ';
-	$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user, 0, 1, 'maxwidth300');
-	$moreforfilter.='</div>';
+ 	$moreforfilter .= '<div class="divsearchfield">';
+ 	$moreforfilter .= $langs->trans('SalesRepresentatives').': ';
+	$moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300');
+	$moreforfilter .= '</div>';
 }
 if ($moreforfilter)
 {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
-	$parameters=array('type'=>$type);
-	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	$parameters = array('type'=>$type);
+	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	print '</div>';
 }
 
-$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
 if (empty($arrayfields['customerorsupplier']['checked'])) print '<input type="hidden" name="type" value="'.$type.'">';
 
 print '<div class="div-table-responsive">';
-print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 // Fields title search
 print '<tr class="liste_titre_filter">';
-if (! empty($arrayfields['s.rowid']['checked']))
+if (!empty($arrayfields['s.rowid']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring" type="text" name="search_id" size="1" value="'.dol_escape_htmltag($search_id).'">';
 	print '</td>';
 }
-if (! empty($arrayfields['s.nom']['checked']))
+if (!empty($arrayfields['s.nom']['checked']))
 {
 	print '<td class="liste_titre">';
-	if (! empty($search_nom_only) && empty($search_nom)) $search_nom=$search_nom_only;
+	if (!empty($search_nom_only) && empty($search_nom)) $search_nom = $search_nom_only;
 	print '<input class="flat searchstring" type="text" name="search_nom" size="8" value="'.dol_escape_htmltag($search_nom).'">';
 	print '</td>';
 }
-if (! empty($arrayfields['s.name_alias']['checked']))
+if (!empty($arrayfields['s.name_alias']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring" type="text" name="search_alias" size="8" value="'.dol_escape_htmltag($search_alias).'">';
 	print '</td>';
 }
 // Barcode
-if (! empty($arrayfields['s.barcode']['checked']))
+if (!empty($arrayfields['s.barcode']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring" type="text" name="search_barcode" size="6" value="'.dol_escape_htmltag($search_barcode).'">';
 	print '</td>';
 }
 // Customer code
-if (! empty($arrayfields['s.code_client']['checked']))
+if (!empty($arrayfields['s.code_client']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring" size="8" type="text" name="search_customer_code" value="'.dol_escape_htmltag($search_customer_code).'">';
 	print '</td>';
 }
 // Supplier code
-if (! empty($arrayfields['s.code_fournisseur']['checked']))
+if (!empty($arrayfields['s.code_fournisseur']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring" size="8" type="text" name="search_supplier_code" value="'.dol_escape_htmltag($search_supplier_code).'">';
 	print '</td>';
 }
 // Account Customer code
-if (! empty($arrayfields['s.code_compta']['checked']))
+if (!empty($arrayfields['s.code_compta']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring" size="8" type="text" name="search_account_customer_code" value="'.dol_escape_htmltag($search_account_customer_code).'">';
 	print '</td>';
 }
 // Account Supplier code
-if (! empty($arrayfields['s.code_compta_fournisseur']['checked']))
+if (!empty($arrayfields['s.code_compta_fournisseur']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input class="flat" size="8" type="text" name="search_account_supplier_code" value="'.dol_escape_htmltag($search_account_supplier_code).'">';
 	print '</td>';
 }
 // Town
-if (! empty($arrayfields['s.town']['checked']))
+if (!empty($arrayfields['s.town']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring" size="6" type="text" name="search_town" value="'.dol_escape_htmltag($search_town).'">';
 	print '</td>';
 }
 // Zip
-if (! empty($arrayfields['s.zip']['checked']))
+if (!empty($arrayfields['s.zip']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring" size="4" type="text" name="search_zip" value="'.dol_escape_htmltag($search_zip).'">';
 	print '</td>';
 }
 // State
-if (! empty($arrayfields['state.nom']['checked']))
+if (!empty($arrayfields['state.nom']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
 	print '</td>';
 }
 // Region
-if (! empty($arrayfields['region.nom']['checked']))
+if (!empty($arrayfields['region.nom']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring" size="4" type="text" name="search_region" value="'.dol_escape_htmltag($search_region).'">';
 	print '</td>';
 }
 // Country
-if (! empty($arrayfields['country.code_iso']['checked']))
+if (!empty($arrayfields['country.code_iso']['checked']))
 {
 	print '<td class="liste_titre" align="center">';
-	print $form->select_country($search_country,'search_country','',0,'maxwidth100');
+	print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth100');
 	print '</td>';
 }
 // Company type
-if (! empty($arrayfields['typent.code']['checked']))
+if (!empty($arrayfields['typent.code']['checked']))
 {
 	print '<td class="liste_titre maxwidthonsmartphone" align="center">';
-	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
+	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
 	print '</td>';
 }
-if (! empty($arrayfields['s.email']['checked']))
+if (!empty($arrayfields['s.email']['checked']))
 {
 	// Email
 	print '<td class="liste_titre">';
 	print '<input class="flat searchemail" size="4" type="text" name="search_email" value="'.dol_escape_htmltag($search_email).'">';
 	print '</td>';
 }
-if (! empty($arrayfields['s.phone']['checked']))
+if (!empty($arrayfields['s.phone']['checked']))
 {
 	// Phone
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring" size="4" type="text" name="search_phone" value="'.dol_escape_htmltag($search_phone).'">';
 	print '</td>';
 }
-if (! empty($arrayfields['s.url']['checked']))
+if (!empty($arrayfields['s.url']['checked']))
 {
 	// Url
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring" size="4" type="text" name="search_url" value="'.dol_escape_htmltag($search_url).'">';
 	print '</td>';
 }
-if (! empty($arrayfields['s.siren']['checked']))
+if (!empty($arrayfields['s.siren']['checked']))
 {
 	// IdProf1
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring" size="4" type="text" name="search_idprof1" value="'.dol_escape_htmltag($search_idprof1).'">';
 	print '</td>';
 }
-if (! empty($arrayfields['s.siret']['checked']))
+if (!empty($arrayfields['s.siret']['checked']))
 {
 	// IdProf2
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring" size="4" type="text" name="search_idprof2" value="'.dol_escape_htmltag($search_idprof2).'">';
 	print '</td>';
 }
-if (! empty($arrayfields['s.ape']['checked']))
+if (!empty($arrayfields['s.ape']['checked']))
 {
 	// IdProf3
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring" size="4" type="text" name="search_idprof3" value="'.dol_escape_htmltag($search_idprof3).'">';
 	print '</td>';
 }
-if (! empty($arrayfields['s.idprof4']['checked']))
+if (!empty($arrayfields['s.idprof4']['checked']))
 {
 	// IdProf4
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring" size="4" type="text" name="search_idprof4" value="'.dol_escape_htmltag($search_idprof4).'">';
 	print '</td>';
 }
-if (! empty($arrayfields['s.idprof5']['checked']))
+if (!empty($arrayfields['s.idprof5']['checked']))
 {
 	// IdProf5
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring" size="4" type="text" name="search_idprof5" value="'.dol_escape_htmltag($search_idprof5).'">';
 	print '</td>';
 }
-if (! empty($arrayfields['s.idprof6']['checked']))
+if (!empty($arrayfields['s.idprof6']['checked']))
 {
 	// IdProf6
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring" size="4" type="text" name="search_idprof6" value="'.dol_escape_htmltag($search_idprof6).'">';
 	print '</td>';
 }
-if (! empty($arrayfields['s.tva_intra']['checked']))
+if (!empty($arrayfields['s.tva_intra']['checked']))
 {
 	// Vat number
 	print '<td class="liste_titre">';
@@ -851,35 +851,35 @@ 
 }
 
 // Type (customer/prospect/supplier)
-if (! empty($arrayfields['customerorsupplier']['checked']))
+if (!empty($arrayfields['customerorsupplier']['checked']))
 {
 	print '<td class="liste_titre maxwidthonsmartphone" align="middle">';
 	if ($type != '') print '<input type="hidden" name="type" value="'.$type.'">';
 	print '<select class="flat" name="search_type">';
-	print '<option value="-1"'.($search_type==''?' selected':'').'>&nbsp;</option>';
-	if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1,3"'.($search_type=='1,3'?' selected':'').'>'.$langs->trans('Customer').'</option>';
-	if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2,3"'.($search_type=='2,3'?' selected':'').'>'.$langs->trans('Prospect').'</option>';
+	print '<option value="-1"'.($search_type == '' ? ' selected' : '').'>&nbsp;</option>';
+	if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1,3"'.($search_type == '1,3' ? ' selected' : '').'>'.$langs->trans('Customer').'</option>';
+	if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2,3"'.($search_type == '2,3' ? ' selected' : '').'>'.$langs->trans('Prospect').'</option>';
 	//if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="3"'.($search_type=='3'?' selected':'').'>'.$langs->trans('ProspectCustomer').'</option>';
-	print '<option value="4"'.($search_type=='4'?' selected':'').'>'.$langs->trans('Supplier').'</option>';
-	print '<option value="0"'.($search_type=='0'?' selected':'').'>'.$langs->trans('Others').'</option>';
+	print '<option value="4"'.($search_type == '4' ? ' selected' : '').'>'.$langs->trans('Supplier').'</option>';
+	print '<option value="0"'.($search_type == '0' ? ' selected' : '').'>'.$langs->trans('Others').'</option>';
 	print '</select></td>';
 }
-if (! empty($arrayfields['s.fk_prospectlevel']['checked']))
+if (!empty($arrayfields['s.fk_prospectlevel']['checked']))
 {
 	// Prospect level
  	print '<td class="liste_titre" align="center">';
- 	$options_from = '<option value="">&nbsp;</option>';	 	// Generate in $options_from the list of each option sorted
+ 	$options_from = '<option value="">&nbsp;</option>'; // Generate in $options_from the list of each option sorted
  	foreach ($tab_level as $tab_level_sortorder => $tab_level_label)
  	{
- 		$options_from .= '<option value="'.$tab_level_sortorder.'"'.($search_level_from == $tab_level_sortorder ? ' selected':'').'>';
+ 		$options_from .= '<option value="'.$tab_level_sortorder.'"'.($search_level_from == $tab_level_sortorder ? ' selected' : '').'>';
  		$options_from .= $langs->trans($tab_level_label);
  		$options_from .= '</option>';
  	}
- 	array_reverse($tab_level, true);	// Reverse the list
- 	$options_to = '<option value="">&nbsp;</option>';		// Generate in $options_to the list of each option sorted in the reversed order
+ 	array_reverse($tab_level, true); // Reverse the list
+ 	$options_to = '<option value="">&nbsp;</option>'; // Generate in $options_to the list of each option sorted in the reversed order
  	foreach ($tab_level as $tab_level_sortorder => $tab_level_label)
  	{
- 		$options_to .= '<option value="'.$tab_level_sortorder.'"'.($search_level_to == $tab_level_sortorder ? ' selected':'').'>';
+ 		$options_to .= '<option value="'.$tab_level_sortorder.'"'.($search_level_to == $tab_level_sortorder ? ' selected' : '').'>';
  		$options_to .= $langs->trans($tab_level_label);
  		$options_to .= '</option>';
  	}
@@ -892,14 +892,14 @@ 
 	print '</td>';
 }
 
-if (! empty($arrayfields['s.fk_stcomm']['checked']))
+if (!empty($arrayfields['s.fk_stcomm']['checked']))
 {
 	// Prospect status
 	print '<td class="liste_titre maxwidthonsmartphone" align="center">';
-	$arraystcomm=array();
-	foreach($prospectstatic->cacheprospectstatus as $key => $val)
+	$arraystcomm = array();
+	foreach ($prospectstatic->cacheprospectstatus as $key => $val)
 	{
-		$arraystcomm[$val['id']]=($langs->trans("StatusProspect".$val['id']) != "StatusProspect".$val['id'] ? $langs->trans("StatusProspect".$val['id']) : $val['label']);
+		$arraystcomm[$val['id']] = ($langs->trans("StatusProspect".$val['id']) != "StatusProspect".$val['id'] ? $langs->trans("StatusProspect".$val['id']) : $val['label']);
 	}
 	print $form->selectarray('search_stcomm', $arraystcomm, $search_stcomm, -2);
 	print '</td>';
@@ -908,29 +908,29 @@ 
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
-if (! empty($arrayfields['s.datec']['checked']))
+if (!empty($arrayfields['s.datec']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Date modification
-if (! empty($arrayfields['s.tms']['checked']))
+if (!empty($arrayfields['s.tms']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Status
-if (! empty($arrayfields['s.status']['checked']))
+if (!empty($arrayfields['s.status']['checked']))
 {
 	print '<td class="liste_titre maxwidthonsmartphone center">';
-	print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')), $search_status, 1);
+	print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $search_status, 1);
 	print '</td>';
 }
-if (! empty($arrayfields['s.import_key']['checked']))
+if (!empty($arrayfields['s.import_key']['checked']))
 {
 	print '<td class="liste_titre center">';
 	print '<input class="flat searchstring" type="text" name="search_import_key" size="3" value="'.dol_escape_htmltag($search_import_key).'">';
@@ -938,323 +938,323 @@ 
 }
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpicto=$form->showFilterButtons();
+$searchpicto = $form->showFilterButtons();
 print $searchpicto;
 print '</td>';
 
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-if (! empty($arrayfields['s.rowid']['checked']))                   print_liste_field_titre($arrayfields['s.rowid']['label'], $_SERVER["PHP_SELF"],"s.rowid","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['s.nom']['checked']))                     print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['s.name_alias']['checked']))              print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"],"s.name_alias","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['s.barcode']['checked']))                 print_liste_field_titre($arrayfields['s.barcode']['label'], $_SERVER["PHP_SELF"], "s.barcode",$param,'','',$sortfield,$sortorder);
-if (! empty($arrayfields['s.code_client']['checked']))             print_liste_field_titre($arrayfields['s.code_client']['label'],$_SERVER["PHP_SELF"],"s.code_client","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.code_fournisseur']['checked']))        print_liste_field_titre($arrayfields['s.code_fournisseur']['label'],$_SERVER["PHP_SELF"],"s.code_fournisseur","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.code_compta']['checked']))             print_liste_field_titre($arrayfields['s.code_compta']['label'],$_SERVER["PHP_SELF"],"s.code_compta","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.code_compta_fournisseur']['checked'])) print_liste_field_titre($arrayfields['s.code_compta_fournisseur']['label'],$_SERVER["PHP_SELF"],"s.code_compta_fournisseur","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],"s.town","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],"s.zip","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['region.nom']['checked']))       print_liste_field_titre($arrayfields['region.nom']['label'],$_SERVER["PHP_SELF"],"region.nom","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.email']['checked']))          print_liste_field_titre($arrayfields['s.email']['label'],$_SERVER["PHP_SELF"],"s.email","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.phone']['checked']))          print_liste_field_titre($arrayfields['s.phone']['label'],$_SERVER["PHP_SELF"],"s.phone","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.url']['checked']))            print_liste_field_titre($arrayfields['s.url']['label'],$_SERVER["PHP_SELF"],"s.url","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.siren']['checked']))          print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"),$textprofid[1],1,0),$_SERVER["PHP_SELF"],"s.siren","",$param,'class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.siret']['checked']))          print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"),$textprofid[2],1,0),$_SERVER["PHP_SELF"],"s.siret","",$param,'class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.ape']['checked']))            print_liste_field_titre($form->textwithpicto($langs->trans("ProfId3Short"),$textprofid[3],1,0),$_SERVER["PHP_SELF"],"s.ape","",$param,'class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.idprof4']['checked']))        print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof4","",$param,'class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.idprof5']['checked']))        print_liste_field_titre($form->textwithpicto($langs->trans("ProfId5Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof5","",$param,'class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.idprof6']['checked']))        print_liste_field_titre($form->textwithpicto($langs->trans("ProfId6Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof6","",$param,'class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.tva_intra']['checked']))      print_liste_field_titre($arrayfields['s.tva_intra']['label'],$_SERVER["PHP_SELF"],"s.tva_intra","",$param,'class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['customerorsupplier']['checked']))        print_liste_field_titre('');   // type of customer
-if (! empty($arrayfields['s.fk_prospectlevel']['checked']))        print_liste_field_titre($arrayfields['s.fk_prospectlevel']['label'],$_SERVER["PHP_SELF"],"s.fk_prospectlevel","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.fk_stcomm']['checked']))               print_liste_field_titre($arrayfields['s.fk_stcomm']['label'],$_SERVER["PHP_SELF"],"s.fk_stcomm","",$param,'align="center"',$sortfield,$sortorder);
+if (!empty($arrayfields['s.rowid']['checked']))                   print_liste_field_titre($arrayfields['s.rowid']['label'], $_SERVER["PHP_SELF"], "s.rowid", "", $param, "", $sortfield, $sortorder);
+if (!empty($arrayfields['s.nom']['checked']))                     print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder);
+if (!empty($arrayfields['s.name_alias']['checked']))              print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"], "s.name_alias", "", $param, "", $sortfield, $sortorder);
+if (!empty($arrayfields['s.barcode']['checked']))                 print_liste_field_titre($arrayfields['s.barcode']['label'], $_SERVER["PHP_SELF"], "s.barcode", $param, '', '', $sortfield, $sortorder);
+if (!empty($arrayfields['s.code_client']['checked']))             print_liste_field_titre($arrayfields['s.code_client']['label'], $_SERVER["PHP_SELF"], "s.code_client", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['s.code_fournisseur']['checked']))        print_liste_field_titre($arrayfields['s.code_fournisseur']['label'], $_SERVER["PHP_SELF"], "s.code_fournisseur", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['s.code_compta']['checked']))             print_liste_field_titre($arrayfields['s.code_compta']['label'], $_SERVER["PHP_SELF"], "s.code_compta", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['s.code_compta_fournisseur']['checked'])) print_liste_field_titre($arrayfields['s.code_compta_fournisseur']['label'], $_SERVER["PHP_SELF"], "s.code_compta_fournisseur", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], "s.town", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], "s.zip", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['region.nom']['checked']))       print_liste_field_titre($arrayfields['region.nom']['label'], $_SERVER["PHP_SELF"], "region.nom", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['s.email']['checked']))          print_liste_field_titre($arrayfields['s.email']['label'], $_SERVER["PHP_SELF"], "s.email", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['s.phone']['checked']))          print_liste_field_titre($arrayfields['s.phone']['label'], $_SERVER["PHP_SELF"], "s.phone", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['s.url']['checked']))            print_liste_field_titre($arrayfields['s.url']['label'], $_SERVER["PHP_SELF"], "s.url", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['s.siren']['checked']))          print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"), $textprofid[1], 1, 0), $_SERVER["PHP_SELF"], "s.siren", "", $param, 'class="nowrap"', $sortfield, $sortorder);
+if (!empty($arrayfields['s.siret']['checked']))          print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"), $textprofid[2], 1, 0), $_SERVER["PHP_SELF"], "s.siret", "", $param, 'class="nowrap"', $sortfield, $sortorder);
+if (!empty($arrayfields['s.ape']['checked']))            print_liste_field_titre($form->textwithpicto($langs->trans("ProfId3Short"), $textprofid[3], 1, 0), $_SERVER["PHP_SELF"], "s.ape", "", $param, 'class="nowrap"', $sortfield, $sortorder);
+if (!empty($arrayfields['s.idprof4']['checked']))        print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof4", "", $param, 'class="nowrap"', $sortfield, $sortorder);
+if (!empty($arrayfields['s.idprof5']['checked']))        print_liste_field_titre($form->textwithpicto($langs->trans("ProfId5Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof5", "", $param, 'class="nowrap"', $sortfield, $sortorder);
+if (!empty($arrayfields['s.idprof6']['checked']))        print_liste_field_titre($form->textwithpicto($langs->trans("ProfId6Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof6", "", $param, 'class="nowrap"', $sortfield, $sortorder);
+if (!empty($arrayfields['s.tva_intra']['checked']))      print_liste_field_titre($arrayfields['s.tva_intra']['label'], $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, 'class="nowrap"', $sortfield, $sortorder);
+if (!empty($arrayfields['customerorsupplier']['checked']))        print_liste_field_titre(''); // type of customer
+if (!empty($arrayfields['s.fk_prospectlevel']['checked']))        print_liste_field_titre($arrayfields['s.fk_prospectlevel']['label'], $_SERVER["PHP_SELF"], "s.fk_prospectlevel", "", $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['s.fk_stcomm']['checked']))               print_liste_field_titre($arrayfields['s.fk_stcomm']['label'], $_SERVER["PHP_SELF"], "s.fk_stcomm", "", $param, 'align="center"', $sortfield, $sortorder);
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
-$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-if (! empty($arrayfields['s.datec']['checked']))      print_liste_field_titre($arrayfields['s.datec']['label'],$_SERVER["PHP_SELF"],"s.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.tms']['checked']))        print_liste_field_titre($arrayfields['s.tms']['label'],$_SERVER["PHP_SELF"],"s.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.status']['checked']))     print_liste_field_titre($arrayfields['s.status']['label'],$_SERVER["PHP_SELF"],"s.status","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['s.import_key']['checked'])) print_liste_field_titre($arrayfields['s.import_key']['label'],$_SERVER["PHP_SELF"],"s.import_key","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
+if (!empty($arrayfields['s.datec']['checked']))      print_liste_field_titre($arrayfields['s.datec']['label'], $_SERVER["PHP_SELF"], "s.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+if (!empty($arrayfields['s.tms']['checked']))        print_liste_field_titre($arrayfields['s.tms']['label'], $_SERVER["PHP_SELF"], "s.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+if (!empty($arrayfields['s.status']['checked']))     print_liste_field_titre($arrayfields['s.status']['label'], $_SERVER["PHP_SELF"], "s.status", "", $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['s.import_key']['checked'])) print_liste_field_titre($arrayfields['s.import_key']['label'], $_SERVER["PHP_SELF"], "s.import_key", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 print "</tr>\n";
 
 
 $i = 0;
-$totalarray=array();
+$totalarray = array();
 while ($i < min($num, $limit))
 {
 	$obj = $db->fetch_object($resql);
 
-	$companystatic->id=$obj->rowid;
-	$companystatic->name=$obj->name;
-	$companystatic->name_alias=$obj->name_alias;
-	$companystatic->logo=$obj->logo;
-	$companystatic->canvas=$obj->canvas;
-	$companystatic->client=$obj->client;
-	$companystatic->status=$obj->status;
-	$companystatic->email=$obj->email;
-	$companystatic->fournisseur=$obj->fournisseur;
-	$companystatic->code_client=$obj->code_client;
-	$companystatic->code_fournisseur=$obj->code_fournisseur;
+	$companystatic->id = $obj->rowid;
+	$companystatic->name = $obj->name;
+	$companystatic->name_alias = $obj->name_alias;
+	$companystatic->logo = $obj->logo;
+	$companystatic->canvas = $obj->canvas;
+	$companystatic->client = $obj->client;
+	$companystatic->status = $obj->status;
+	$companystatic->email = $obj->email;
+	$companystatic->fournisseur = $obj->fournisseur;
+	$companystatic->code_client = $obj->code_client;
+	$companystatic->code_fournisseur = $obj->code_fournisseur;
 
-	$companystatic->code_compta_client=$obj->code_compta;
-	$companystatic->code_compta_fournisseur=$obj->code_compta_fournisseur;
+	$companystatic->code_compta_client = $obj->code_compta;
+	$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
-   	$companystatic->fk_prospectlevel=$obj->fk_prospectlevel;
+   	$companystatic->fk_prospectlevel = $obj->fk_prospectlevel;
 
 	print '<tr class="oddeven" onclick="location.href=\'customers.php?action=change&idcustomer='.$obj->rowid.'&place='.$place.'\'">';
-	if (! empty($arrayfields['s.rowid']['checked']))
+	if (!empty($arrayfields['s.rowid']['checked']))
 	{
 		print '<td class="tdoverflowmax50">';
 		print $obj->rowid;
 		print "</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
-	if (! empty($arrayfields['s.nom']['checked']))
+	if (!empty($arrayfields['s.nom']['checked']))
 	{
 		$savalias = $obj->name_alias;
-		if (! empty($arrayfields['s.name_alias']['checked'])) $companystatic->name_alias='';
+		if (!empty($arrayfields['s.name_alias']['checked'])) $companystatic->name_alias = '';
 		print '<td class="tdoverflowmax200">';
 		print $obj->name;
 		print "</td>\n";
-        if (! $i) $totalarray['nbfield']++;
+        if (!$i) $totalarray['nbfield']++;
 	}
-	if (! empty($arrayfields['s.name_alias']['checked']))
+	if (!empty($arrayfields['s.name_alias']['checked']))
 	{
 		print '<td class="tdoverflowmax200">';
 		print $companystatic->name_alias;
 		print "</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Barcode
-	if (! empty($arrayfields['s.barcode']['checked']))
+	if (!empty($arrayfields['s.barcode']['checked']))
 	{
 		print '<td>'.$obj->barcode.'</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Customer code
-	if (! empty($arrayfields['s.code_client']['checked']))
+	if (!empty($arrayfields['s.code_client']['checked']))
 	{
 		print '<td>'.$obj->code_client.'</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Supplier code
-	if (! empty($arrayfields['s.code_fournisseur']['checked']))
+	if (!empty($arrayfields['s.code_fournisseur']['checked']))
 	{
 		print '<td>'.$obj->code_fournisseur.'</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Account customer code
-	if (! empty($arrayfields['s.code_compta']['checked']))
+	if (!empty($arrayfields['s.code_compta']['checked']))
 	{
 		print '<td>'.$obj->code_compta.'</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Account supplier code
-	if (! empty($arrayfields['s.code_compta_fournisseur']['checked']))
+	if (!empty($arrayfields['s.code_compta_fournisseur']['checked']))
 	{
 		print '<td>'.$obj->code_compta_fournisseur.'</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Town
-	if (! empty($arrayfields['s.town']['checked']))
+	if (!empty($arrayfields['s.town']['checked']))
 	{
 		print "<td>".$obj->town."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Zip
-	if (! empty($arrayfields['s.zip']['checked']))
+	if (!empty($arrayfields['s.zip']['checked']))
 	{
 		print "<td>".$obj->zip."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// State
-	if (! empty($arrayfields['state.nom']['checked']))
+	if (!empty($arrayfields['state.nom']['checked']))
 	{
 		print "<td>".$obj->state_name."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Region
-	if (! empty($arrayfields['region.nom']['checked']))
+	if (!empty($arrayfields['region.nom']['checked']))
 	{
 		print "<td>".$obj->region_name."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Country
-	if (! empty($arrayfields['country.code_iso']['checked']))
+	if (!empty($arrayfields['country.code_iso']['checked']))
 	{
 		print '<td align="center">';
-		$tmparray=getCountry($obj->fk_pays,'all');
+		$tmparray = getCountry($obj->fk_pays, 'all');
 		print $tmparray['label'];
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Type ent
-	if (! empty($arrayfields['typent.code']['checked']))
+	if (!empty($arrayfields['typent.code']['checked']))
 	{
 		print '<td align="center">';
-		if (! is_array($typenArray) || count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
+		if (!is_array($typenArray) || count($typenArray) == 0) $typenArray = $formcompany->typent_array(1);
 		print $typenArray[$obj->typent_code];
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
-	if (! empty($arrayfields['s.email']['checked']))
+	if (!empty($arrayfields['s.email']['checked']))
 	{
 		print "<td>".$obj->email."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
-	if (! empty($arrayfields['s.phone']['checked']))
+	if (!empty($arrayfields['s.phone']['checked']))
 	{
 		print "<td>".$obj->phone."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
-	if (! empty($arrayfields['s.url']['checked']))
+	if (!empty($arrayfields['s.url']['checked']))
 	{
 		print "<td>".$obj->url."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
-	if (! empty($arrayfields['s.siren']['checked']))
+	if (!empty($arrayfields['s.siren']['checked']))
 	{
 		print "<td>".$obj->idprof1."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
-	if (! empty($arrayfields['s.siret']['checked']))
+	if (!empty($arrayfields['s.siret']['checked']))
 	{
 		print "<td>".$obj->idprof2."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
-	if (! empty($arrayfields['s.ape']['checked']))
+	if (!empty($arrayfields['s.ape']['checked']))
 	{
 		print "<td>".$obj->idprof3."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
-	if (! empty($arrayfields['s.idprof4']['checked']))
+	if (!empty($arrayfields['s.idprof4']['checked']))
 	{
 		print "<td>".$obj->idprof4."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
-	if (! empty($arrayfields['s.idprof5']['checked']))
+	if (!empty($arrayfields['s.idprof5']['checked']))
 	{
 		print "<td>".$obj->idprof5."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
-	if (! empty($arrayfields['s.idprof6']['checked']))
+	if (!empty($arrayfields['s.idprof6']['checked']))
 	{
 		print "<td>".$obj->idprof6."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
-	if (! empty($arrayfields['s.tva_intra']['checked']))
+	if (!empty($arrayfields['s.tva_intra']['checked']))
 	{
 		print "<td>".$obj->tva_intra."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Type
-	if (! empty($arrayfields['customerorsupplier']['checked']))
+	if (!empty($arrayfields['customerorsupplier']['checked']))
 	{
 		print '<td align="center">';
-		$s='';
-		if (($obj->client==1 || $obj->client==3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
+		$s = '';
+		if (($obj->client == 1 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
 		{
-	  		$companystatic->name=$langs->trans("Customer");
-	  		$companystatic->name_alias='';
-			$s.=$companystatic->getNomUrl(0,'customer',0,1);
+	  		$companystatic->name = $langs->trans("Customer");
+	  		$companystatic->name_alias = '';
+			$s .= $companystatic->getNomUrl(0, 'customer', 0, 1);
 		}
-		if (($obj->client==2 || $obj->client==3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
+		if (($obj->client == 2 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
 		{
-			if ($s) $s.=" / ";
-			$companystatic->name=$langs->trans("Prospect");
-	  		$companystatic->name_alias='';
-			$s.=$companystatic->getNomUrl(0,'prospect',0,1);
+			if ($s) $s .= " / ";
+			$companystatic->name = $langs->trans("Prospect");
+	  		$companystatic->name_alias = '';
+			$s .= $companystatic->getNomUrl(0, 'prospect', 0, 1);
 		}
-		if (! empty($conf->fournisseur->enabled) && $obj->fournisseur)
+		if (!empty($conf->fournisseur->enabled) && $obj->fournisseur)
 		{
-			if ($s) $s.=" / ";
-			$companystatic->name=$langs->trans("Supplier");
-	  		$companystatic->name_alias='';
-			$s.=$companystatic->getNomUrl(0,'supplier',0,1);
+			if ($s) $s .= " / ";
+			$companystatic->name = $langs->trans("Supplier");
+	  		$companystatic->name_alias = '';
+			$s .= $companystatic->getNomUrl(0, 'supplier', 0, 1);
 		}
 		print $s;
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 
-	if (! empty($arrayfields['s.fk_prospectlevel']['checked']))
+	if (!empty($arrayfields['s.fk_prospectlevel']['checked']))
 	{
 		// Prospect level
 		print '<td align="center">';
 		print $companystatic->getLibProspLevel();
 		print "</td>";
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 
-	if (! empty($arrayfields['s.fk_stcomm']['checked']))
+	if (!empty($arrayfields['s.fk_stcomm']['checked']))
 	{
 		// Prospect status
 		print '<td align="center" class="nowrap"><div class="nowrap">';
-		print '<div class="inline-block">'.$companystatic->LibProspCommStatut($obj->stcomm_id,2,$prospectstatic->cacheprospectstatus[$obj->stcomm_id]['label']);
+		print '<div class="inline-block">'.$companystatic->LibProspCommStatut($obj->stcomm_id, 2, $prospectstatic->cacheprospectstatus[$obj->stcomm_id]['label']);
 		print '</div> - <div class="inline-block">';
-		foreach($prospectstatic->cacheprospectstatus as $key => $val)
+		foreach ($prospectstatic->cacheprospectstatus as $key => $val)
 		{
-			$titlealt='default';
-			if (! empty($val['code']) && ! in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt=$val['label'];
-			if ($obj->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommsocid='.$obj->rowid.'&stcomm='.$val['code'].'&action=setstcomm'.$param.($page?'&page='.urlencode($page):'').'">'.img_action($titlealt,$val['code']).'</a>';
+			$titlealt = 'default';
+			if (!empty($val['code']) && !in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt = $val['label'];
+			if ($obj->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommsocid='.$obj->rowid.'&stcomm='.$val['code'].'&action=setstcomm'.$param.($page ? '&page='.urlencode($page) : '').'">'.img_action($titlealt, $val['code']).'</a>';
 		}
 		print '</div></div></td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-	$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (! empty($arrayfields['s.datec']['checked']))
+	if (!empty($arrayfields['s.datec']['checked']))
 	{
 		print '<td align="center" class="nowrap">';
 		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Date modification
-	if (! empty($arrayfields['s.tms']['checked']))
+	if (!empty($arrayfields['s.tms']['checked']))
 	{
 		print '<td align="center" class="nowrap">';
 		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Status
-	if (! empty($arrayfields['s.status']['checked']))
+	if (!empty($arrayfields['s.status']['checked']))
 	{
 		print '<td align="center" class="nowrap">'.$companystatic->getLibStatut(3).'</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
-	if (! empty($arrayfields['s.import_key']['checked']))
+	if (!empty($arrayfields['s.import_key']['checked']))
 	{
 		print '<td class="tdoverflowmax100">';
 		print $obj->import_key;
 		print "</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Action column
 	print '<td class="nowrap" align="center">';
 	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 	{
-		$selected=0;
-		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+		$selected = 0;
+		if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
-	if (! $i) $totalarray['nbfield']++;
+	if (!$i) $totalarray['nbfield']++;
 
 	print '</tr>'."\n";
 	$i++;
@@ -1262,8 +1262,8 @@ 
 
 $db->free($resql);
 
-$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
 print "</table>";

dolibarr/htdocs/takepos/receipt.php

Braces +3 added lines, -1 removed lines

@@ -58,7 +58,9 @@
 <p align="right">
 <?php
 print $langs->trans('Date')." ".dol_print_date($object->date, 'day').'<br>';
-if ($mysoc->country_code == 'ES') print "Factura simplificada ";
+if ($mysoc->country_code == 'ES') {
+    print "Factura simplificada ";
+}
 print $object->ref;
 ?>
 </p>

Indentation +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
 require DOL_BASE_PATH . '/main.inc.php';
-	// Load $user and permissions
+    // Load $user and permissions
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 $langs->loadLangs(array("main", "cashdesk"));
@@ -56,7 +56,7 @@ 
 <br>
 <p align="left">
 <?php print dol_nl2br(dol_format_address($mysoc)).'<br>'.$langs->trans("Phone").': '.$mysoc->phone;
- ?>
+    ?>
 
 </p>
 <p align="right">

Spacing +17 added lines, -17 removed lines

@@ -21,7 +21,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 	// Load $user and permissions
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
@@ -33,15 +33,15 @@ 
 
 top_httphead('text/html');
 
-$facid=GETPOST('facid','int');
-$place=GETPOST('place','int');
-if ($place>0){
-    $sql="SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS-".$place.")'";
+$facid = GETPOST('facid', 'int');
+$place = GETPOST('place', 'int');
+if ($place > 0) {
+    $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS-".$place.")'";
     $resql = $db->query($sql);
-    $row = $db->fetch_array ($resql);
-    $facid=$row[0];
+    $row = $db->fetch_array($resql);
+    $facid = $row[0];
 }
-$object=new Facture($db);
+$object = new Facture($db);
 $object->fetch($facid);
 
 // IMPORTANT: This file is sended to 'Takepos Printing' application. Keep basic file. No external files as css, js... If you need images use absolut path.
@@ -50,7 +50,7 @@ 
 <body>
 <center>
 <font size="4">
-<?php echo '<b>'.$mysoc->name.'</b>';?>
+<?php echo '<b>'.$mysoc->name.'</b>'; ?>
 </font>
 </center>
 <br>
@@ -83,10 +83,10 @@ 
     {
     ?>
     <tr>
-        <td><?php echo $line->product_label;?></td>
-        <td align="right"><?php echo $line->qty;?></td>
-        <td align="right"><?php echo $line->total_ttc/$line->qty;?></td>
-        <td align="right"><?php echo price($line->total_ttc);?></td>
+        <td><?php echo $line->product_label; ?></td>
+        <td align="right"><?php echo $line->qty; ?></td>
+        <td align="right"><?php echo $line->total_ttc / $line->qty; ?></td>
+        <td align="right"><?php echo price($line->total_ttc); ?></td>
     </tr>
     <?php
     }
@@ -96,14 +96,14 @@ 
 <br>
 <table align="right">
 <tr>
-    <th align="right"><?php echo $langs->trans("TotalHT");?></th>
-    <td align="right"><?php echo price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency)."\n";?></td>
+    <th align="right"><?php echo $langs->trans("TotalHT"); ?></th>
+    <td align="right"><?php echo price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
 </tr>
 <tr>
-    <th align="right"><?php echo $langs->trans("TotalVAT").'</th><td align="right">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency)."\n";?></td>
+    <th align="right"><?php echo $langs->trans("TotalVAT").'</th><td align="right">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
 </tr>
 <tr>
-    <th align="right"><?php echo ''.$langs->trans("TotalTTC").'</th><td align="right">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency)."\n";?></td>
+    <th align="right"><?php echo ''.$langs->trans("TotalTTC").'</th><td align="right">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
 </tr>
 </table>
 <div style="border-top-style: double;">

dolibarr/htdocs/takepos/genimg/index.php

Indentation +87 added lines, -87 removed lines

@@ -44,100 +44,100 @@
 
 if ($query=="cat")
 {
-	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/categories.lib.php';
-
-	$object = new Categorie($db);
-	$result = $object->fetch($id);
-	$upload_dir = $conf->categorie->multidir_output[$object->entity];
-	$pdir = get_exdir($object->id,2,0,0,$object,'category') . $object->id ."/photos/";
-	$dir = $upload_dir.'/'.$pdir;
-	foreach ($object->liste_photos($dir) as $key => $obj)
-	{
-		$filename=$obj['photo'];
-	}
-
-	// The file
-	$filename = $dir.$filename;
-	if (!file_exists($filename)) $filename="empty.jpg";
-
-	// Dimensions
-	list($width, $height) = getimagesize($filename);
-	$new_width = $w;
-	$new_height = $h;
-
-	// Resample
-	$image_p = imagecreatetruecolor($new_width, $new_height);
-	$image = imagecreatefromjpeg($filename);
-	imagecopyresampled($image_p, $image, 0, 0, 0, 0, $new_width, $new_height, $width, $height);
-
-	// Add icon
-	$icon = imagecreatefromjpeg('add.jpg');
-	list($width, $height) = getimagesize('add.jpg');
-	$new_width = $w*0.3;
-	$new_height = $h*0.3;
-	$icon_p = imagecreatetruecolor($new_width, $new_height);
-	imagecopyresampled($icon_p, $icon, 0, 0, 0, 0, $new_width, $new_height, $width, $height);
-	imagecopymerge($image_p, $icon_p,  0, 0, 0, 0, $new_width, $new_height, 100);
-
-	// Output
-	imagejpeg($image_p, null, 100);
+    require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/categories.lib.php';
+
+    $object = new Categorie($db);
+    $result = $object->fetch($id);
+    $upload_dir = $conf->categorie->multidir_output[$object->entity];
+    $pdir = get_exdir($object->id,2,0,0,$object,'category') . $object->id ."/photos/";
+    $dir = $upload_dir.'/'.$pdir;
+    foreach ($object->liste_photos($dir) as $key => $obj)
+    {
+        $filename=$obj['photo'];
+    }
+
+    // The file
+    $filename = $dir.$filename;
+    if (!file_exists($filename)) $filename="empty.jpg";
+
+    // Dimensions
+    list($width, $height) = getimagesize($filename);
+    $new_width = $w;
+    $new_height = $h;
+
+    // Resample
+    $image_p = imagecreatetruecolor($new_width, $new_height);
+    $image = imagecreatefromjpeg($filename);
+    imagecopyresampled($image_p, $image, 0, 0, 0, 0, $new_width, $new_height, $width, $height);
+
+    // Add icon
+    $icon = imagecreatefromjpeg('add.jpg');
+    list($width, $height) = getimagesize('add.jpg');
+    $new_width = $w*0.3;
+    $new_height = $h*0.3;
+    $icon_p = imagecreatetruecolor($new_width, $new_height);
+    imagecopyresampled($icon_p, $icon, 0, 0, 0, 0, $new_width, $new_height, $width, $height);
+    imagecopymerge($image_p, $icon_p,  0, 0, 0, 0, $new_width, $new_height, 100);
+
+    // Output
+    imagejpeg($image_p, null, 100);
 }
 else if ($query=="pro")
 {
-	require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
-
-	$objProd = new Product($db);
-	$objProd->fetch($id);
-
-	$dir .= get_exdir(0,0,0,0,$objProd,'product').$objProd->ref.'/';
-	$pdir .= get_exdir(0,0,0,0,$objProd,'product').$objProd->ref.'/';
-
-	foreach ($objProd->liste_photos($dir) as $key => $obj)
-	{
-		$filename=$obj['photo'];
-	}
-	$filename = $dir.$filename;
-
-	if (!file_exists($filename)){
-		$dir = $conf->product->multidir_output[$objProd->entity].'/'.$pdir;
-		foreach ($objProd->liste_photos($dir) as $key => $obj)
-		{
-		$filename=$obj['photo'];
-		}
-		$filename = $dir.$filename;
-	}
-
-	if (!file_exists($filename)) $filename="empty.jpg";
-
-	// Dimensions
-	list($width, $height) = getimagesize($filename);
-	$new_width = $w;
-	$new_height = $h;
-
-	// Resample
-	$image_p = imagecreatetruecolor($new_width, $new_height);
-	$image = imagecreatefromjpeg($filename);
-	imagecopyresampled($image_p, $image, 0, 0, 0, 0, $new_width, $new_height, $width, $height);
-
-	// Output
-	imagejpeg($image_p, null, 100);
+    require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
+
+    $objProd = new Product($db);
+    $objProd->fetch($id);
+
+    $dir .= get_exdir(0,0,0,0,$objProd,'product').$objProd->ref.'/';
+    $pdir .= get_exdir(0,0,0,0,$objProd,'product').$objProd->ref.'/';
+
+    foreach ($objProd->liste_photos($dir) as $key => $obj)
+    {
+        $filename=$obj['photo'];
+    }
+    $filename = $dir.$filename;
+
+    if (!file_exists($filename)){
+        $dir = $conf->product->multidir_output[$objProd->entity].'/'.$pdir;
+        foreach ($objProd->liste_photos($dir) as $key => $obj)
+        {
+        $filename=$obj['photo'];
+        }
+        $filename = $dir.$filename;
+    }
+
+    if (!file_exists($filename)) $filename="empty.jpg";
+
+    // Dimensions
+    list($width, $height) = getimagesize($filename);
+    $new_width = $w;
+    $new_height = $h;
+
+    // Resample
+    $image_p = imagecreatetruecolor($new_width, $new_height);
+    $image = imagecreatefromjpeg($filename);
+    imagecopyresampled($image_p, $image, 0, 0, 0, 0, $new_width, $new_height, $width, $height);
+
+    // Output
+    imagejpeg($image_p, null, 100);
 }
 else
 {
-	// The file
-	$filename = $query.".jpg";
+    // The file
+    $filename = $query.".jpg";
 
-	// Dimensions
-	list($width, $height) = getimagesize($filename);
-	$new_width = $w;
-	$new_height = $h;
+    // Dimensions
+    list($width, $height) = getimagesize($filename);
+    $new_width = $w;
+    $new_height = $h;
 
-	// Resample
-	$image_p = imagecreatetruecolor($new_width, $new_height);
-	$image = imagecreatefromjpeg($filename);
-	imagecopyresampled($image_p, $image, 0, 0, 0, 0, $new_width, $new_height, $width, $height);
+    // Resample
+    $image_p = imagecreatetruecolor($new_width, $new_height);
+    $image = imagecreatefromjpeg($filename);
+    imagecopyresampled($image_p, $image, 0, 0, 0, 0, $new_width, $new_height, $width, $height);
 
-	// Output
-	imagejpeg($image_p, null, 100);
+    // Output
+    imagejpeg($image_p, null, 100);
 }

Braces +26 added lines, -12 removed lines

@@ -17,13 +17,25 @@ 
 
 //if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
-if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC','1');
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
 //if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))		define('NOCSRFCHECK','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('NOCSRFCHECK')) {
+    define('NOCSRFCHECK','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');
+}
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
@@ -62,7 +74,9 @@ 
 
 	// The file
 	$filename = $dir.$filename;
-	if (!file_exists($filename)) $filename="empty.jpg";
+	if (!file_exists($filename)) {
+	    $filename="empty.jpg";
+	}
 
 	// Dimensions
 	list($width, $height) = getimagesize($filename);
@@ -85,8 +99,7 @@ 
 
 	// Output
 	imagejpeg($image_p, null, 100);
-}
-else if ($query=="pro")
+} else if ($query=="pro")
 {
 	require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
 
@@ -111,7 +124,9 @@ 
 		$filename = $dir.$filename;
 	}
 
-	if (!file_exists($filename)) $filename="empty.jpg";
+	if (!file_exists($filename)) {
+	    $filename="empty.jpg";
+	}
 
 	// Dimensions
 	list($width, $height) = getimagesize($filename);
@@ -125,8 +140,7 @@ 
 
 	// Output
 	imagejpeg($image_p, null, 100);
-}
-else
+} else
 {
 	// The file
 	$filename = $query.".jpg";

Spacing +25 added lines, -25 removed lines

@@ -17,23 +17,23 @@ 
 
 //if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
-if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC','1');
+if (!defined('NOREQUIRESOC'))		define('NOREQUIRESOC', '1');
 //if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))		define('NOCSRFCHECK','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('NOCSRFCHECK'))		define('NOCSRFCHECK', '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');
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';	// Load $user and permissions
+require DOL_BASE_PATH.'/main.inc.php'; // Load $user and permissions
 
-$id= GETPOST('id');
-$w= GETPOST('w');
-$h= GETPOST('h');
-$query= GETPOST('query');
+$id = GETPOST('id');
+$w = GETPOST('w');
+$h = GETPOST('h');
+$query = GETPOST('query');
 
 
 
@@ -45,7 +45,7 @@ 
 header('Cache-Control: max-age=604800, public, must-revalidate');
 header('Pragma: cache');
 
-if ($query=="cat")
+if ($query == "cat")
 {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/categories.lib.php';
@@ -53,16 +53,16 @@ 
 	$object = new Categorie($db);
 	$result = $object->fetch($id);
 	$upload_dir = $conf->categorie->multidir_output[$object->entity];
-	$pdir = get_exdir($object->id,2,0,0,$object,'category') . $object->id ."/photos/";
+	$pdir = get_exdir($object->id, 2, 0, 0, $object, 'category').$object->id."/photos/";
 	$dir = $upload_dir.'/'.$pdir;
 	foreach ($object->liste_photos($dir) as $key => $obj)
 	{
-		$filename=$obj['photo'];
+		$filename = $obj['photo'];
 	}
 
 	// The file
 	$filename = $dir.$filename;
-	if (!file_exists($filename)) $filename="empty.jpg";
+	if (!file_exists($filename)) $filename = "empty.jpg";
 
 	// Dimensions
 	list($width, $height) = getimagesize($filename);
@@ -77,41 +77,41 @@ 
 	// Add icon
 	$icon = imagecreatefromjpeg('add.jpg');
 	list($width, $height) = getimagesize('add.jpg');
-	$new_width = $w*0.3;
-	$new_height = $h*0.3;
+	$new_width = $w * 0.3;
+	$new_height = $h * 0.3;
 	$icon_p = imagecreatetruecolor($new_width, $new_height);
 	imagecopyresampled($icon_p, $icon, 0, 0, 0, 0, $new_width, $new_height, $width, $height);
-	imagecopymerge($image_p, $icon_p,  0, 0, 0, 0, $new_width, $new_height, 100);
+	imagecopymerge($image_p, $icon_p, 0, 0, 0, 0, $new_width, $new_height, 100);
 
 	// Output
 	imagejpeg($image_p, null, 100);
 }
-else if ($query=="pro")
+else if ($query == "pro")
 {
 	require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
 
 	$objProd = new Product($db);
 	$objProd->fetch($id);
 
-	$dir .= get_exdir(0,0,0,0,$objProd,'product').$objProd->ref.'/';
-	$pdir .= get_exdir(0,0,0,0,$objProd,'product').$objProd->ref.'/';
+	$dir .= get_exdir(0, 0, 0, 0, $objProd, 'product').$objProd->ref.'/';
+	$pdir .= get_exdir(0, 0, 0, 0, $objProd, 'product').$objProd->ref.'/';
 
 	foreach ($objProd->liste_photos($dir) as $key => $obj)
 	{
-		$filename=$obj['photo'];
+		$filename = $obj['photo'];
 	}
 	$filename = $dir.$filename;
 
-	if (!file_exists($filename)){
+	if (!file_exists($filename)) {
 		$dir = $conf->product->multidir_output[$objProd->entity].'/'.$pdir;
 		foreach ($objProd->liste_photos($dir) as $key => $obj)
 		{
-		$filename=$obj['photo'];
+		$filename = $obj['photo'];
 		}
 		$filename = $dir.$filename;
 	}
 
-	if (!file_exists($filename)) $filename="empty.jpg";
+	if (!file_exists($filename)) $filename = "empty.jpg";
 
 	// Dimensions
 	list($width, $height) = getimagesize($filename);

dolibarr/htdocs/takepos/takepos.php

Braces +47 added lines, -11 removed lines

@@ -19,11 +19,21 @@ 
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))		define('NOCSRFCHECK','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('NOCSRFCHECK')) {
+    define('NOCSRFCHECK','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');
+}
 
 $_GET['theme']="md"; // Force theme. MD theme provides better look and feel to TakePOS
 
@@ -33,7 +43,9 @@ 
 require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 
 $place = GETPOST('place','int');
-if ($place=="") $place="0";
+if ($place=="") {
+    $place="0";
+}
 $action = GETPOST('action','alpha');
 
 $langs->loadLangs(array("bills","orders","commercial","cashdesk","receiptprinter"));
@@ -45,7 +57,9 @@ 
 
 // Title
 $title='TakePOS - Dolibarr '.DOL_VERSION;
-if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title='TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+if (! empty($conf->global->MAIN_APPLICATION_TITLE)) {
+    $title='TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+}
 $head='<meta name="apple-mobile-web-app-title" content="TakePOS"/>
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="mobile-web-app-capable" content="yes">
@@ -392,8 +406,21 @@ 
 	while ($count<16)
 	{
 	?>
-	<div class='wrapper' <?php if ($count==14) echo 'onclick="MoreCategories(\'less\');"'; else if ($count==15) echo 'onclick="MoreCategories(\'more\');"'; else echo 'onclick="LoadProducts('.$count.');"';?> id='catdiv<?php echo $count;?>'>
-		<img class='imgwrapper' <?php if ($count==14) echo 'src="img/arrow-prev-top.png"'; if ($count==15) echo 'src="img/arrow-next-top.png"';?> width="98%" id='catimg<?php echo $count;?>'/>
+	<div class='wrapper' <?php if ($count==14) {
+    echo 'onclick="MoreCategories(\'less\');"';
+} else if ($count==15) {
+    echo 'onclick="MoreCategories(\'more\');"';
+} else {
+    echo 'onclick="LoadProducts('.$count.');"';
+}
+?> id='catdiv<?php echo $count;?>'>
+		<img class='imgwrapper' <?php if ($count==14) {
+    echo 'src="img/arrow-prev-top.png"';
+}
+if ($count==15) {
+    echo 'src="img/arrow-next-top.png"';
+}
+?> width="98%" id='catimg<?php echo $count;?>'/>
 		<div class='description'>
 			<div class='description_content' id='catdesc<?php echo $count;?>'></div>
 		</div>
@@ -410,8 +437,17 @@ 
 while ($count<32)
 	{
 	?>
-	<div class='wrapper2' id='prodiv<?php echo $count;?>' <?php if ($count==30) {?> onclick="MoreProducts('less');" <?php } if ($count==31) {?> onclick="MoreProducts('more');" <?php } else echo 'onclick="ClickProduct('.$count.');"';?>>
-		<img class='imgwrapper' <?php if ($count==30) echo 'src="img/arrow-prev-top.png"'; if ($count==31) echo 'src="img/arrow-next-top.png"';?> width="95%" id='proimg<?php echo $count;?>'/>
+	<div class='wrapper2' id='prodiv<?php echo $count;?>' <?php if ($count==30) {?> onclick="MoreProducts('less');" <?php } if ($count==31) {?> onclick="MoreProducts('more');" <?php } else {
+    echo 'onclick="ClickProduct('.$count.');"';
+}
+?>>
+		<img class='imgwrapper' <?php if ($count==30) {
+    echo 'src="img/arrow-prev-top.png"';
+}
+if ($count==31) {
+    echo 'src="img/arrow-next-top.png"';
+}
+?> width="95%" id='proimg<?php echo $count;?>'/>
 		<div class='description'>
 			<div class='description_content' id='prodesc<?php echo $count;?>'></div>
 		</div>

Indentation +30 added lines, -30 removed lines

@@ -31,7 +31,7 @@ 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
 require DOL_BASE_PATH . '/main.inc.php';
-	// Load $user and permissions
+    // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
@@ -350,36 +350,36 @@ 
 $menus = array();
 $r=0;
 $menus[$r++]=array('title'=>$langs->trans("SearchProduct"),
-					'action'=>'Search();');
+                    'action'=>'Search();');
 $menus[$r++]=array('title'=>$langs->trans("FreeZone"),
-                   'action'=>'FreeZone();');
+                    'action'=>'FreeZone();');
 $menus[$r++]=array('title'=>$langs->trans("Customer"),
-					'action'=>'Customer();');
+                    'action'=>'Customer();');
 $menus[$r++]=array('title'=>$langs->trans("BackOffice"),
-                   'action'=>'window.open(\''.DOL_URL_ROOT.'\', \'backoffice\');');
+                    'action'=>'window.open(\''.DOL_URL_ROOT.'\', \'backoffice\');');
 $menus[$r++]=array('title'=>$langs->trans("ValidateBill"),
-					'action'=>'CloseBill();');
+                    'action'=>'CloseBill();');
 $menus[$r++]=array('title'=>$langs->trans("Logout"),
-                   'action'=>'window.location.href=\''.DOL_URL_ROOT.'/user/logout.php\';');
+                    'action'=>'window.location.href=\''.DOL_URL_ROOT.'/user/logout.php\';');
 
 //BAR RESTAURANT specified menu
 if($conf->global->TAKEPOS_BAR_RESTAURANT){
-	$menus[$r++]=array('title'=>$langs->trans("Floors"),
-					'action'=>'Floors();');
-	if ($conf->global->TAKEPOS_ORDER_PRINTERS){
-		$menus[$r++]=array('title'=>$langs->trans("Order"),
-		'action'=>'TakeposPrintingOrder();');
-	}
-	//add temp ticket button
-	if ($conf->global->TAKEPOS_ORDER_PRINTERS){
-		$menus[$r++]=array('title'=>$langs->trans("Temporary ticket"),
-		'action'=>'TakeposPrintingTemp();');
-	}
+    $menus[$r++]=array('title'=>$langs->trans("Floors"),
+                    'action'=>'Floors();');
+    if ($conf->global->TAKEPOS_ORDER_PRINTERS){
+        $menus[$r++]=array('title'=>$langs->trans("Order"),
+        'action'=>'TakeposPrintingOrder();');
+    }
+    //add temp ticket button
+    if ($conf->global->TAKEPOS_ORDER_PRINTERS){
+        $menus[$r++]=array('title'=>$langs->trans("Temporary ticket"),
+        'action'=>'TakeposPrintingTemp();');
+    }
 }
 
 if ($conf->global->TAKEPOSCONNECTOR){
-	$menus[$r++]=array('title'=>$langs->trans("DOL_OPEN_DRAWER"),
-					'action'=>'OpenDrawer();');
+    $menus[$r++]=array('title'=>$langs->trans("DOL_OPEN_DRAWER"),
+                    'action'=>'OpenDrawer();');
 }
 ?>
 <div style="position:absolute; top:1%; left:65.5%; height:37%; width:32.5%;">
@@ -392,10 +392,10 @@ 
 
 <div style="position:absolute; top:39%; left:0.3%; height:59%; width:32%;">
 	<?php
-	$count=0;
-	while ($count<16)
-	{
-	?>
+    $count=0;
+    while ($count<16)
+    {
+    ?>
 	<div class='wrapper' <?php if ($count==14) echo 'onclick="MoreCategories(\'less\');"'; else if ($count==15) echo 'onclick="MoreCategories(\'more\');"'; else echo 'onclick="LoadProducts('.$count.');"';?> id='catdiv<?php echo $count;?>'>
 		<img class='imgwrapper' <?php if ($count==14) echo 'src="img/arrow-prev-top.png"'; if ($count==15) echo 'src="img/arrow-next-top.png"';?> width="98%" id='catimg<?php echo $count;?>'/>
 		<div class='description'>
@@ -404,16 +404,16 @@ 
 	</div>
 	<?php
     $count++;
-	}
-	?>
+    }
+    ?>
 </div>
 
 <div style="position:absolute; top:39%; left:32%; height:58%; width:72%;">
 <?php
 $count=0;
 while ($count<32)
-	{
-	?>
+    {
+    ?>
 	<div class='wrapper2' id='prodiv<?php echo $count;?>' <?php if ($count==30) {?> onclick="MoreProducts('less');" <?php } if ($count==31) {?> onclick="MoreProducts('more');" <?php } else echo 'onclick="ClickProduct('.$count.');"';?>>
 		<img class='imgwrapper' <?php if ($count==30) echo 'src="img/arrow-prev-top.png"'; if ($count==31) echo 'src="img/arrow-next-top.png"';?> width="95%" id='proimg<?php echo $count;?>'/>
 		<div class='description'>
@@ -421,8 +421,8 @@ 
 		</div>
 	</div>
 	<?php
-	$count++;
-	}
+    $count++;
+    }
 ?>
 </div>
 

Spacing +48 added lines, -48 removed lines

@@ -19,28 +19,28 @@ 
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))		define('NOCSRFCHECK','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('NOCSRFCHECK'))		define('NOCSRFCHECK', '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');
 
-$_GET['theme']="md"; // Force theme. MD theme provides better look and feel to TakePOS
+$_GET['theme'] = "md"; // Force theme. MD theme provides better look and feel to TakePOS
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 	// Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
-$place = GETPOST('place','int');
-if ($place=="") $place="0";
-$action = GETPOST('action','alpha');
+$place = GETPOST('place', 'int');
+if ($place == "") $place = "0";
+$action = GETPOST('action', 'alpha');
 
-$langs->loadLangs(array("bills","orders","commercial","cashdesk","receiptprinter"));
+$langs->loadLangs(array("bills", "orders", "commercial", "cashdesk", "receiptprinter"));
 
 
 /*
@@ -48,9 +48,9 @@ 
  */
 
 // Title
-$title='TakePOS - Dolibarr '.DOL_VERSION;
-if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title='TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
-$head='<meta name="apple-mobile-web-app-title" content="TakePOS"/>
+$title = 'TakePOS - Dolibarr '.DOL_VERSION;
+if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+$head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="mobile-web-app-capable" content="yes">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>';
@@ -66,11 +66,11 @@ 
 $categorie = new Categorie($db);
 $categories = $categorie->get_full_arbo('product');
 ?>
-var categories = JSON.parse( '<?php echo json_encode($categories);?>' );
+var categories = JSON.parse( '<?php echo json_encode($categories); ?>' );
 var currentcat;
 var pageproducts=0;
 var pagecategories=0;
-var place="<?php echo $place;?>";
+var place="<?php echo $place; ?>";
 var editaction="qty";
 var editnumber="";
 function PrintCategories(first){
@@ -180,19 +180,19 @@ 
 }
 
 function Customer(){
-	$.colorbox({href:"customers.php?nomassaction=1&place="+place, width:"90%", height:"80%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("Customer");?>"});
+	$.colorbox({href:"customers.php?nomassaction=1&place="+place, width:"90%", height:"80%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("Customer"); ?>"});
 }
 
 function CloseBill(){
-	$.colorbox({href:"pay.php?place="+place, width:"80%", height:"90%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("CloseBill");?>"});
+	$.colorbox({href:"pay.php?place="+place, width:"80%", height:"90%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("CloseBill"); ?>"});
 }
 
 function Floors(){
-	$.colorbox({href:"floors.php?place="+place, width:"90%", height:"90%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("Floors");?>"});
+	$.colorbox({href:"floors.php?place="+place, width:"90%", height:"90%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("Floors"); ?>"});
 }
 
 function FreeZone(){
-	$.colorbox({href:"freezone.php?place="+place, onClosed: function () { Refresh(); },width:"80%", height:"30%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("FreeZone");?>"});
+	$.colorbox({href:"freezone.php?place="+place, onClosed: function () { Refresh(); },width:"80%", height:"30%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("FreeZone"); ?>"});
 }
 
 function Refresh(){
@@ -309,7 +309,7 @@ 
 function OpenDrawer(){
 	$.ajax({
 			type: "POST",
-			url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER;?>:8111/print',
+			url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print',
 			data: "opendrawer"
 		});
 }
@@ -348,43 +348,43 @@ 
 <?php
 // User menu and external TakePOS modules
 $menus = array();
-$r=0;
-$menus[$r++]=array('title'=>$langs->trans("SearchProduct"),
+$r = 0;
+$menus[$r++] = array('title'=>$langs->trans("SearchProduct"),
 					'action'=>'Search();');
-$menus[$r++]=array('title'=>$langs->trans("FreeZone"),
+$menus[$r++] = array('title'=>$langs->trans("FreeZone"),
                    'action'=>'FreeZone();');
-$menus[$r++]=array('title'=>$langs->trans("Customer"),
+$menus[$r++] = array('title'=>$langs->trans("Customer"),
 					'action'=>'Customer();');
-$menus[$r++]=array('title'=>$langs->trans("BackOffice"),
+$menus[$r++] = array('title'=>$langs->trans("BackOffice"),
                    'action'=>'window.open(\''.DOL_URL_ROOT.'\', \'backoffice\');');
-$menus[$r++]=array('title'=>$langs->trans("ValidateBill"),
+$menus[$r++] = array('title'=>$langs->trans("ValidateBill"),
 					'action'=>'CloseBill();');
-$menus[$r++]=array('title'=>$langs->trans("Logout"),
+$menus[$r++] = array('title'=>$langs->trans("Logout"),
                    'action'=>'window.location.href=\''.DOL_URL_ROOT.'/user/logout.php\';');
 
 //BAR RESTAURANT specified menu
-if($conf->global->TAKEPOS_BAR_RESTAURANT){
-	$menus[$r++]=array('title'=>$langs->trans("Floors"),
+if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
+	$menus[$r++] = array('title'=>$langs->trans("Floors"),
 					'action'=>'Floors();');
-	if ($conf->global->TAKEPOS_ORDER_PRINTERS){
-		$menus[$r++]=array('title'=>$langs->trans("Order"),
+	if ($conf->global->TAKEPOS_ORDER_PRINTERS) {
+		$menus[$r++] = array('title'=>$langs->trans("Order"),
 		'action'=>'TakeposPrintingOrder();');
 	}
 	//add temp ticket button
-	if ($conf->global->TAKEPOS_ORDER_PRINTERS){
-		$menus[$r++]=array('title'=>$langs->trans("Temporary ticket"),
+	if ($conf->global->TAKEPOS_ORDER_PRINTERS) {
+		$menus[$r++] = array('title'=>$langs->trans("Temporary ticket"),
 		'action'=>'TakeposPrintingTemp();');
 	}
 }
 
-if ($conf->global->TAKEPOSCONNECTOR){
-	$menus[$r++]=array('title'=>$langs->trans("DOL_OPEN_DRAWER"),
+if ($conf->global->TAKEPOSCONNECTOR) {
+	$menus[$r++] = array('title'=>$langs->trans("DOL_OPEN_DRAWER"),
 					'action'=>'OpenDrawer();');
 }
 ?>
 <div style="position:absolute; top:1%; left:65.5%; height:37%; width:32.5%;">
 <?php
-foreach($menus as $menu) {
+foreach ($menus as $menu) {
     echo '<button type="button" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
 }
 ?>
@@ -392,14 +392,14 @@ 
 
 <div style="position:absolute; top:39%; left:0.3%; height:59%; width:32%;">
 	<?php
-	$count=0;
-	while ($count<16)
+	$count = 0;
+	while ($count < 16)
 	{
 	?>
-	<div class='wrapper' <?php if ($count==14) echo 'onclick="MoreCategories(\'less\');"'; else if ($count==15) echo 'onclick="MoreCategories(\'more\');"'; else echo 'onclick="LoadProducts('.$count.');"';?> id='catdiv<?php echo $count;?>'>
-		<img class='imgwrapper' <?php if ($count==14) echo 'src="img/arrow-prev-top.png"'; if ($count==15) echo 'src="img/arrow-next-top.png"';?> width="98%" id='catimg<?php echo $count;?>'/>
+	<div class='wrapper' <?php if ($count == 14) echo 'onclick="MoreCategories(\'less\');"'; else if ($count == 15) echo 'onclick="MoreCategories(\'more\');"'; else echo 'onclick="LoadProducts('.$count.');"'; ?> id='catdiv<?php echo $count; ?>'>
+		<img class='imgwrapper' <?php if ($count == 14) echo 'src="img/arrow-prev-top.png"'; if ($count == 15) echo 'src="img/arrow-next-top.png"'; ?> width="98%" id='catimg<?php echo $count; ?>'/>
 		<div class='description'>
-			<div class='description_content' id='catdesc<?php echo $count;?>'></div>
+			<div class='description_content' id='catdesc<?php echo $count; ?>'></div>
 		</div>
 	</div>
 	<?php
@@ -410,14 +410,14 @@ 
 
 <div style="position:absolute; top:39%; left:32%; height:58%; width:72%;">
 <?php
-$count=0;
-while ($count<32)
+$count = 0;
+while ($count < 32)
 	{
 	?>
-	<div class='wrapper2' id='prodiv<?php echo $count;?>' <?php if ($count==30) {?> onclick="MoreProducts('less');" <?php } if ($count==31) {?> onclick="MoreProducts('more');" <?php } else echo 'onclick="ClickProduct('.$count.');"';?>>
-		<img class='imgwrapper' <?php if ($count==30) echo 'src="img/arrow-prev-top.png"'; if ($count==31) echo 'src="img/arrow-next-top.png"';?> width="95%" id='proimg<?php echo $count;?>'/>
+	<div class='wrapper2' id='prodiv<?php echo $count; ?>' <?php if ($count == 30) {?> onclick="MoreProducts('less');" <?php } if ($count == 31) {?> onclick="MoreProducts('more');" <?php } else echo 'onclick="ClickProduct('.$count.');"'; ?>>
+		<img class='imgwrapper' <?php if ($count == 30) echo 'src="img/arrow-prev-top.png"'; if ($count == 31) echo 'src="img/arrow-next-top.png"'; ?> width="95%" id='proimg<?php echo $count; ?>'/>
 		<div class='description'>
-			<div class='description_content' id='prodesc<?php echo $count;?>'></div>
+			<div class='description_content' id='prodesc<?php echo $count; ?>'></div>
 		</div>
 	</div>
 	<?php

dolibarr/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php

Indentation +421 added lines, -421 removed lines

@@ -26,449 +26,449 @@
  */
 class FormAdvTargetEmailing extends Form
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDB $db handler
-	 */
+    /**
+     * Constructor
+     *
+     * @param DoliDB $db handler
+     */
     function __construct($db)
     {
-		global $langs;
-
-		$this->db = $db;
-	}
-
-	/**
-	 * Affiche un champs select contenant une liste
-	 *
-	 * @param array $selected_array à preselectionner
-	 * @param string $htmlname select field
-	 * @return string select field
-	 */
+        global $langs;
+
+        $this->db = $db;
+    }
+
+    /**
+     * Affiche un champs select contenant une liste
+     *
+     * @param array $selected_array à preselectionner
+     * @param string $htmlname select field
+     * @return string select field
+     */
     function multiselectProspectionStatus($selected_array = array(), $htmlname = 'cust_prospect_status')
     {
-		global $conf, $langs;
-		$options_array = array();
-
-		$sql = "SELECT code, label";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "c_prospectlevel";
-		$sql .= " WHERE active > 0";
-		$sql .= " ORDER BY sortorder";
-		dol_syslog ( get_class( $this ) . '::multiselectProspectionStatus sql=' . $sql, LOG_DEBUG );
-		$resql = $this->db->query( $sql );
-		if ($resql) {
-			$num = $this->db->num_rows( $resql );
-			$i = 0;
-			while ( $i < $num ) {
-				$obj = $this->db->fetch_object( $resql );
-
-				$level = $langs->trans( $obj->code );
-				if ($level == $obj->code)
-					$level = $langs->trans( $obj->label );
-				$options_array[$obj->code] = $level;
-
-				$i ++;
-			}
-		} else {
-			dol_print_error($this->db);
-		}
-		return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
-	}
-
-	/**
-	 * Return combo list of activated countries, into language of user
-	 *
-	 * @param string $htmlname of html select object
-	 * @param array $selected_array or Code or Label of preselected country
-	 * @return string HTML string with select
-	 */
+        global $conf, $langs;
+        $options_array = array();
+
+        $sql = "SELECT code, label";
+        $sql .= " FROM " . MAIN_DB_PREFIX . "c_prospectlevel";
+        $sql .= " WHERE active > 0";
+        $sql .= " ORDER BY sortorder";
+        dol_syslog ( get_class( $this ) . '::multiselectProspectionStatus sql=' . $sql, LOG_DEBUG );
+        $resql = $this->db->query( $sql );
+        if ($resql) {
+            $num = $this->db->num_rows( $resql );
+            $i = 0;
+            while ( $i < $num ) {
+                $obj = $this->db->fetch_object( $resql );
+
+                $level = $langs->trans( $obj->code );
+                if ($level == $obj->code)
+                    $level = $langs->trans( $obj->label );
+                $options_array[$obj->code] = $level;
+
+                $i ++;
+            }
+        } else {
+            dol_print_error($this->db);
+        }
+        return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
+    }
+
+    /**
+     * Return combo list of activated countries, into language of user
+     *
+     * @param string $htmlname of html select object
+     * @param array $selected_array or Code or Label of preselected country
+     * @return string HTML string with select
+     */
     function multiselectCountry($htmlname = 'country_id', $selected_array=array())
     {
-		global $conf, $langs;
-
-		$langs->load("dict");
-		$maxlength = 0;
-
-		$out = '';
-		$countryArray = array();
-		$label = array ();
-
-		$options_array = array();
-
-		$sql = "SELECT rowid, code as code_iso, label";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "c_country";
-		$sql .= " WHERE active = 1 AND code<>''";
-		$sql .= " ORDER BY code ASC";
-
-		dol_syslog(get_class($this) . "::select_country sql=" . $sql);
-		$resql = $this->db->query($sql);
-		if ($resql) {
-
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			if ($num) {
-				$foundselected = false;
-
-				while ($i < $num) {
-					$obj = $this->db->fetch_object ( $resql );
-					$countryArray [$i] ['rowid'] = $obj->rowid;
-					$countryArray [$i] ['code_iso'] = $obj->code_iso;
-					$countryArray [$i] ['label'] = ($obj->code_iso && $langs->transnoentitiesnoconv("Country" . $obj->code_iso ) != "Country" . $obj->code_iso ? $langs->transnoentitiesnoconv ( "Country" . $obj->code_iso ) : ($obj->label != '-' ? $obj->label : ''));
-					$label[$i] = $countryArray[$i]['label'];
-					$i ++;
-				}
-
-				array_multisort($label, SORT_ASC, $countryArray);
-
-				foreach ($countryArray as $row) {
-					$label = dol_trunc($row['label'], $maxlength, 'middle');
-					if ($row['code_iso'])
-						$label .= ' (' . $row['code_iso'] . ')';
-
-					$options_array[$row['rowid']] = $label;
-				}
-			}
-		} else {
-			dol_print_error($this->db);
-		}
-
-		return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
-	}
-
-	/**
-	 * Return select list for categories (to use in form search selectors)
-	 *
-	 * @param string $htmlname control name
-	 * @param array $selected_array array of data
-	 * @param User $user User action
-	 * @return string combo list code
-	 */
+        global $conf, $langs;
+
+        $langs->load("dict");
+        $maxlength = 0;
+
+        $out = '';
+        $countryArray = array();
+        $label = array ();
+
+        $options_array = array();
+
+        $sql = "SELECT rowid, code as code_iso, label";
+        $sql .= " FROM " . MAIN_DB_PREFIX . "c_country";
+        $sql .= " WHERE active = 1 AND code<>''";
+        $sql .= " ORDER BY code ASC";
+
+        dol_syslog(get_class($this) . "::select_country sql=" . $sql);
+        $resql = $this->db->query($sql);
+        if ($resql) {
+
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            if ($num) {
+                $foundselected = false;
+
+                while ($i < $num) {
+                    $obj = $this->db->fetch_object ( $resql );
+                    $countryArray [$i] ['rowid'] = $obj->rowid;
+                    $countryArray [$i] ['code_iso'] = $obj->code_iso;
+                    $countryArray [$i] ['label'] = ($obj->code_iso && $langs->transnoentitiesnoconv("Country" . $obj->code_iso ) != "Country" . $obj->code_iso ? $langs->transnoentitiesnoconv ( "Country" . $obj->code_iso ) : ($obj->label != '-' ? $obj->label : ''));
+                    $label[$i] = $countryArray[$i]['label'];
+                    $i ++;
+                }
+
+                array_multisort($label, SORT_ASC, $countryArray);
+
+                foreach ($countryArray as $row) {
+                    $label = dol_trunc($row['label'], $maxlength, 'middle');
+                    if ($row['code_iso'])
+                        $label .= ' (' . $row['code_iso'] . ')';
+
+                    $options_array[$row['rowid']] = $label;
+                }
+            }
+        } else {
+            dol_print_error($this->db);
+        }
+
+        return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
+    }
+
+    /**
+     * Return select list for categories (to use in form search selectors)
+     *
+     * @param string $htmlname control name
+     * @param array $selected_array array of data
+     * @param User $user User action
+     * @return string combo list code
+     */
     function multiselectselectSalesRepresentatives($htmlname, $selected_array, $user)
     {
 
-		global $conf;
+        global $conf;
 
-		$options_array = array ();
+        $options_array = array ();
 
         $sql_usr  = '';
-		$sql_usr .= "SELECT DISTINCT u2.rowid, u2.lastname as name, u2.firstname, u2.login";
-		$sql_usr .= " FROM " . MAIN_DB_PREFIX . "user as u2, " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
-		$sql_usr .= " WHERE u2.entity IN (0," . $conf->entity . ")";
-		$sql_usr .= " AND u2.rowid = sc.fk_user ";
-
-		if (! empty ( $conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX ))
-			$sql_usr .= " AND u2.statut<>0 ";
-		$sql_usr .= " ORDER BY name ASC";
-		// print $sql_usr;exit;
-
-		$resql_usr = $this->db->query ( $sql_usr );
-		if ($resql_usr) {
-			while ( $obj_usr = $this->db->fetch_object ( $resql_usr ) ) {
-
-				$label = $obj_usr->firstname . " " . $obj_usr->name . " (" . $obj_usr->login . ')';
-
-				$options_array [$obj_usr->rowid] = $label;
-			}
-			$this->db->free ( $resql_usr );
-		} else {
-			dol_print_error ( $this->db );
-		}
-
-		return $this->advMultiselectarray ( $htmlname, $options_array, $selected_array );
-	}
-
-	/**
-	 * Return select list for categories (to use in form search selectors)
-	 *
-	 * @param string $htmlname of combo list (example: 'search_sale')
-	 * @param array $selected_array selected array
-	 * @return string combo list code
-	 */
+        $sql_usr .= "SELECT DISTINCT u2.rowid, u2.lastname as name, u2.firstname, u2.login";
+        $sql_usr .= " FROM " . MAIN_DB_PREFIX . "user as u2, " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+        $sql_usr .= " WHERE u2.entity IN (0," . $conf->entity . ")";
+        $sql_usr .= " AND u2.rowid = sc.fk_user ";
+
+        if (! empty ( $conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX ))
+            $sql_usr .= " AND u2.statut<>0 ";
+        $sql_usr .= " ORDER BY name ASC";
+        // print $sql_usr;exit;
+
+        $resql_usr = $this->db->query ( $sql_usr );
+        if ($resql_usr) {
+            while ( $obj_usr = $this->db->fetch_object ( $resql_usr ) ) {
+
+                $label = $obj_usr->firstname . " " . $obj_usr->name . " (" . $obj_usr->login . ')';
+
+                $options_array [$obj_usr->rowid] = $label;
+            }
+            $this->db->free ( $resql_usr );
+        } else {
+            dol_print_error ( $this->db );
+        }
+
+        return $this->advMultiselectarray ( $htmlname, $options_array, $selected_array );
+    }
+
+    /**
+     * Return select list for categories (to use in form search selectors)
+     *
+     * @param string $htmlname of combo list (example: 'search_sale')
+     * @param array $selected_array selected array
+     * @return string combo list code
+     */
     function multiselectselectLanguage($htmlname='', $selected_array=array())
     {
 
-		global $conf,$langs;
-
-		$options_array = array ();
-
-		$langs_available=$langs->get_available_languages(DOL_DOCUMENT_ROOT,12);
-
-		foreach ($langs_available as $key => $value)
-		{
-			$label = $value;
-			$options_array[$key] = $label;
-		}
-		asort($options_array);
-		return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
-	}
-
-	/**
-	 * Return multiselect list of entities for extrafeild type sellist
-	 *
-	 * @param string $htmlname control name
-	 * @param array $sqlqueryparam array
-	 * @param array $selected_array array
-	 *
-	 *  @return	string HTML combo
-	 */
-	function advMultiselectarraySelllist($htmlname, $sqlqueryparam = array(), $selected_array = array())
-	{
-		$options_array=array();
-
-		if (is_array($sqlqueryparam))
-		{
-			$param_list = array_keys ( $sqlqueryparam );
-			$InfoFieldList = explode ( ":", $param_list [0] );
-
-			// 0 1 : tableName
-			// 1 2 : label field name Nom du champ contenant le libelle
-			// 2 3 : key fields name (if differ of rowid)
-			// 3 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-
-			$keyList = 'rowid';
-
-			if (count ( $InfoFieldList ) >= 3) {
-				if (strpos ( $InfoFieldList [3], 'extra.' ) !== false) {
-					$keyList = 'main.' . $InfoFieldList [2] . ' as rowid';
-				} else {
-					$keyList = $InfoFieldList [2] . ' as rowid';
-				}
-			}
-
-			$sql = 'SELECT ' . $keyList . ', ' . $InfoFieldList [1];
-			$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList [0];
-			if (! empty ( $InfoFieldList [3] )) {
-
-				// We have to join on extrafield table
-				if (strpos ( $InfoFieldList [3], 'extra' ) !== false) {
-					$sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList [0] . '_extrafields as extra';
-					$sql .= ' WHERE  extra.fk_object=main.' . $InfoFieldList [2] . ' AND ' . $InfoFieldList [3];
-				} else {
-					$sql .= ' WHERE ' . $InfoFieldList [3];
-				}
-			}
-			if (! empty($InfoFieldList[1])) {
-				$sql .= " ORDER BY nom";
-			}
-			// $sql.= ' WHERE entity = '.$conf->entity;
-
-			dol_syslog(get_class($this) . "::".__METHOD__,LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if ($resql) {
-
-				$num = $this->db->num_rows($resql);
-				$i = 0;
-				if ($num) {
-					while ( $i < $num ) {
-						$obj = $this->db->fetch_object ( $resql );
-						$labeltoshow = dol_trunc ( $obj->$InfoFieldList [1], 90 );
-						$options_array[$obj->rowid]=$labeltoshow;
-						$i ++;
-					}
-				}
-				$this->db->free ( $resql );
-			}
-		}
-
-		return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
-	}
-
-	/**
-	 *  Return combo list with people title
-	 *
-	 * 	@param	string $htmlname	       Name of HTML select combo field
-	 *  @param  array  $selected_array     Array
-	 *  @return	string                     HTML combo
-	 */
-	function multiselectCivility($htmlname='civilite_id',$selected_array = array())
-	{
-		global $conf,$langs,$user;
-		$langs->load("dict");
-
-		$options_array=array();
-
-
-		$sql = "SELECT rowid, code, label as civilite, active FROM ".MAIN_DB_PREFIX."c_civility";
-		$sql.= " WHERE active = 1";
-
-		dol_syslog(get_class($this)."::".__METHOD__,LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-					// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-					$label= ($langs->trans("Civility".$obj->code)!="Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->civilite!='-'?$obj->civilite:''));
-
-
-					$options_array[$obj->code]=$label;
-
-					$i++;
-				}
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-
-		return $this->advMultiselectarray ( $htmlname, $options_array, $selected_array );
-	}
-
-	/**
-	 * Return multiselect list of entities.
-	 *
-	 * @param string $htmlname select
-	 * @param array $options_array to manage
-	 * @param array $selected_array to manage
-	 * @param int $showempty show empty
-	 * @return string HTML combo
-	 */
+        global $conf,$langs;
+
+        $options_array = array ();
+
+        $langs_available=$langs->get_available_languages(DOL_DOCUMENT_ROOT,12);
+
+        foreach ($langs_available as $key => $value)
+        {
+            $label = $value;
+            $options_array[$key] = $label;
+        }
+        asort($options_array);
+        return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
+    }
+
+    /**
+     * Return multiselect list of entities for extrafeild type sellist
+     *
+     * @param string $htmlname control name
+     * @param array $sqlqueryparam array
+     * @param array $selected_array array
+     *
+     *  @return	string HTML combo
+     */
+    function advMultiselectarraySelllist($htmlname, $sqlqueryparam = array(), $selected_array = array())
+    {
+        $options_array=array();
+
+        if (is_array($sqlqueryparam))
+        {
+            $param_list = array_keys ( $sqlqueryparam );
+            $InfoFieldList = explode ( ":", $param_list [0] );
+
+            // 0 1 : tableName
+            // 1 2 : label field name Nom du champ contenant le libelle
+            // 2 3 : key fields name (if differ of rowid)
+            // 3 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
+
+            $keyList = 'rowid';
+
+            if (count ( $InfoFieldList ) >= 3) {
+                if (strpos ( $InfoFieldList [3], 'extra.' ) !== false) {
+                    $keyList = 'main.' . $InfoFieldList [2] . ' as rowid';
+                } else {
+                    $keyList = $InfoFieldList [2] . ' as rowid';
+                }
+            }
+
+            $sql = 'SELECT ' . $keyList . ', ' . $InfoFieldList [1];
+            $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList [0];
+            if (! empty ( $InfoFieldList [3] )) {
+
+                // We have to join on extrafield table
+                if (strpos ( $InfoFieldList [3], 'extra' ) !== false) {
+                    $sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList [0] . '_extrafields as extra';
+                    $sql .= ' WHERE  extra.fk_object=main.' . $InfoFieldList [2] . ' AND ' . $InfoFieldList [3];
+                } else {
+                    $sql .= ' WHERE ' . $InfoFieldList [3];
+                }
+            }
+            if (! empty($InfoFieldList[1])) {
+                $sql .= " ORDER BY nom";
+            }
+            // $sql.= ' WHERE entity = '.$conf->entity;
+
+            dol_syslog(get_class($this) . "::".__METHOD__,LOG_DEBUG);
+            $resql = $this->db->query($sql);
+            if ($resql) {
+
+                $num = $this->db->num_rows($resql);
+                $i = 0;
+                if ($num) {
+                    while ( $i < $num ) {
+                        $obj = $this->db->fetch_object ( $resql );
+                        $labeltoshow = dol_trunc ( $obj->$InfoFieldList [1], 90 );
+                        $options_array[$obj->rowid]=$labeltoshow;
+                        $i ++;
+                    }
+                }
+                $this->db->free ( $resql );
+            }
+        }
+
+        return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
+    }
+
+    /**
+     *  Return combo list with people title
+     *
+     * 	@param	string $htmlname	       Name of HTML select combo field
+     *  @param  array  $selected_array     Array
+     *  @return	string                     HTML combo
+     */
+    function multiselectCivility($htmlname='civilite_id',$selected_array = array())
+    {
+        global $conf,$langs,$user;
+        $langs->load("dict");
+
+        $options_array=array();
+
+
+        $sql = "SELECT rowid, code, label as civilite, active FROM ".MAIN_DB_PREFIX."c_civility";
+        $sql.= " WHERE active = 1";
+
+        dol_syslog(get_class($this)."::".__METHOD__,LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            if ($num)
+            {
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
+                    $label= ($langs->trans("Civility".$obj->code)!="Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->civilite!='-'?$obj->civilite:''));
+
+
+                    $options_array[$obj->code]=$label;
+
+                    $i++;
+                }
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+
+        return $this->advMultiselectarray ( $htmlname, $options_array, $selected_array );
+    }
+
+    /**
+     * Return multiselect list of entities.
+     *
+     * @param string $htmlname select
+     * @param array $options_array to manage
+     * @param array $selected_array to manage
+     * @param int $showempty show empty
+     * @return string HTML combo
+     */
     function advMultiselectarray($htmlname, $options_array = array(), $selected_array = array(), $showempty = 0)
     {
-		global $conf, $langs;
-
-		$form=new Form($this->db);
-		$return = $form->multiselectarray($htmlname, $options_array, $selected_array,0,0,'',0,295);
-		return $return;
-	}
-
-	/**
-	 *  Return combo list with customer categories
-	 *
-	 *  @param  string	$htmlname   Name of categorie
-	 * 	@param	array	$selected_array	value selected
-	 *  @return	string HTML combo
-	 */
-	function multiselectCustomerCategories($htmlname='cust_cat',$selected_array = array())
-	{
-		return $this->multiselectCategories($htmlname,$selected_array,2);
-	}
-
-	/**
-	 *  Return combo list with customer contact
-	 *
-	 *  @param  string	$htmlname   Name of categorie
-	 * 	@param	array	$selected_array	value selected
-	 *  @return	string HTML combo
-	 */
-	function multiselectContactCategories($htmlname='contact_cat',$selected_array = array())
-	{
-		return $this->multiselectCategories($htmlname,$selected_array,4);
-	}
-
-	/**
-	 *  Return combo list of categories
-	 *
-	 *  @param  string	$htmlname  		Name of categorie
-	 * 	@param	array	$selected_array	Value selected
-	 * 	@param	int		$type			Type
-	 *  @return	string 					HTML combo
-	 */
-	public function multiselectCategories($htmlname='',$selected_array = array(), $type=0)
-	{
-		global $conf,$langs,$user;
-		$langs->load("dict");
-
-		$options_array=array();
-
-		$sql = "SELECT rowid, label FROM ".MAIN_DB_PREFIX."categorie";
-		$sql.= " WHERE type=".$type;
-
-		dol_syslog(get_class($this)."::".__METHOD__,LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-
-					$options_array[$obj->rowid]=$obj->label;
-
-					$i++;
-				}
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-
-		return $this->advMultiselectarray( $htmlname, $options_array, $selected_array );
-	}
-
-	/**
-	 * Return a combo list to select emailing target selector
-	 *
-	 * @param	string 		$htmlname 		control name
-	 * @param	integer 	$selected  		defaut selected
-	 * @param	integer 	$showempty 		empty lines
-	 * @param	string		$type_element	Type element. Example: 'mailing'
-	 * @return	string 						HTML combo
-	 */
+        global $conf, $langs;
+
+        $form=new Form($this->db);
+        $return = $form->multiselectarray($htmlname, $options_array, $selected_array,0,0,'',0,295);
+        return $return;
+    }
+
+    /**
+     *  Return combo list with customer categories
+     *
+     *  @param  string	$htmlname   Name of categorie
+     * 	@param	array	$selected_array	value selected
+     *  @return	string HTML combo
+     */
+    function multiselectCustomerCategories($htmlname='cust_cat',$selected_array = array())
+    {
+        return $this->multiselectCategories($htmlname,$selected_array,2);
+    }
+
+    /**
+     *  Return combo list with customer contact
+     *
+     *  @param  string	$htmlname   Name of categorie
+     * 	@param	array	$selected_array	value selected
+     *  @return	string HTML combo
+     */
+    function multiselectContactCategories($htmlname='contact_cat',$selected_array = array())
+    {
+        return $this->multiselectCategories($htmlname,$selected_array,4);
+    }
+
+    /**
+     *  Return combo list of categories
+     *
+     *  @param  string	$htmlname  		Name of categorie
+     * 	@param	array	$selected_array	Value selected
+     * 	@param	int		$type			Type
+     *  @return	string 					HTML combo
+     */
+    public function multiselectCategories($htmlname='',$selected_array = array(), $type=0)
+    {
+        global $conf,$langs,$user;
+        $langs->load("dict");
+
+        $options_array=array();
+
+        $sql = "SELECT rowid, label FROM ".MAIN_DB_PREFIX."categorie";
+        $sql.= " WHERE type=".$type;
+
+        dol_syslog(get_class($this)."::".__METHOD__,LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            if ($num)
+            {
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+
+                    $options_array[$obj->rowid]=$obj->label;
+
+                    $i++;
+                }
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+
+        return $this->advMultiselectarray( $htmlname, $options_array, $selected_array );
+    }
+
+    /**
+     * Return a combo list to select emailing target selector
+     *
+     * @param	string 		$htmlname 		control name
+     * @param	integer 	$selected  		defaut selected
+     * @param	integer 	$showempty 		empty lines
+     * @param	string		$type_element	Type element. Example: 'mailing'
+     * @return	string 						HTML combo
+     */
     public function selectAdvtargetemailingTemplate($htmlname='template_id', $selected=0, $showempty=0, $type_element='mailing')
     {
-		global $conf, $user, $langs;
-
-		$out = '';
-
-		$sql = "SELECT c.rowid, c.name, c.fk_element";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "advtargetemailing as c";
-		$sql .= " WHERE type_element='$type_element'";
-		$sql .= " ORDER BY c.name";
-
-		dol_syslog ( get_class ( $this ) . "::".__METHOD__, LOG_DEBUG );
-		$resql = $this->db->query ( $sql );
-		if ($resql) {
-
-
-			$out .= '<select id="' . $htmlname . '" class="flat" name="' . $htmlname . '">';
-			if ($showempty)
-				$out .= '<option value=""></option>';
-			$num = $this->db->num_rows ( $resql );
-			$i = 0;
-			if ($num) {
-				while ( $i < $num ) {
-					$obj = $this->db->fetch_object ( $resql );
-					$label = $obj->name;
-					if (empty($label)) {
-						$label=$obj->fk_element;
-					}
-
-					if ($selected > 0 && $selected == $obj->rowid) {
-						$out .= '<option value="' . $obj->rowid . '" selected="selected">' . $label . '</option>';
-					} else {
-						$out .= '<option value="' . $obj->rowid . '">' . $label . '</option>';
-					}
-					$i ++;
-				}
-			}
-			$out .= '</select>';
-		} else {
-			dol_print_error ( $this->db );
-		}
-		$this->db->free ( $resql );
-		return $out;
-	}
+        global $conf, $user, $langs;
+
+        $out = '';
+
+        $sql = "SELECT c.rowid, c.name, c.fk_element";
+        $sql .= " FROM " . MAIN_DB_PREFIX . "advtargetemailing as c";
+        $sql .= " WHERE type_element='$type_element'";
+        $sql .= " ORDER BY c.name";
+
+        dol_syslog ( get_class ( $this ) . "::".__METHOD__, LOG_DEBUG );
+        $resql = $this->db->query ( $sql );
+        if ($resql) {
+
+
+            $out .= '<select id="' . $htmlname . '" class="flat" name="' . $htmlname . '">';
+            if ($showempty)
+                $out .= '<option value=""></option>';
+            $num = $this->db->num_rows ( $resql );
+            $i = 0;
+            if ($num) {
+                while ( $i < $num ) {
+                    $obj = $this->db->fetch_object ( $resql );
+                    $label = $obj->name;
+                    if (empty($label)) {
+                        $label=$obj->fk_element;
+                    }
+
+                    if ($selected > 0 && $selected == $obj->rowid) {
+                        $out .= '<option value="' . $obj->rowid . '" selected="selected">' . $label . '</option>';
+                    } else {
+                        $out .= '<option value="' . $obj->rowid . '">' . $label . '</option>';
+                    }
+                    $i ++;
+                }
+            }
+            $out .= '</select>';
+        } else {
+            dol_print_error ( $this->db );
+        }
+        $this->db->free ( $resql );
+        return $out;
+    }
 }

Spacing +92 added lines, -92 removed lines

@@ -34,7 +34,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * Constructor
@@ -61,23 +61,23 @@ 
 		$options_array = array();
 
 		$sql = "SELECT code, label";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "c_prospectlevel";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
 		$sql .= " WHERE active > 0";
 		$sql .= " ORDER BY sortorder";
-		dol_syslog ( get_class( $this ) . '::multiselectProspectionStatus sql=' . $sql, LOG_DEBUG );
-		$resql = $this->db->query( $sql );
+		dol_syslog(get_class($this).'::multiselectProspectionStatus sql='.$sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
 		if ($resql) {
-			$num = $this->db->num_rows( $resql );
+			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ( $i < $num ) {
-				$obj = $this->db->fetch_object( $resql );
+			while ($i < $num) {
+				$obj = $this->db->fetch_object($resql);
 
-				$level = $langs->trans( $obj->code );
+				$level = $langs->trans($obj->code);
 				if ($level == $obj->code)
-					$level = $langs->trans( $obj->label );
+					$level = $langs->trans($obj->label);
 				$options_array[$obj->code] = $level;
 
-				$i ++;
+				$i++;
 			}
 		} else {
 			dol_print_error($this->db);
@@ -92,7 +92,7 @@ 
 	 * @param array $selected_array or Code or Label of preselected country
 	 * @return string HTML string with select
 	 */
-    function multiselectCountry($htmlname = 'country_id', $selected_array=array())
+    function multiselectCountry($htmlname = 'country_id', $selected_array = array())
     {
 		global $conf, $langs;
 
@@ -101,16 +101,16 @@ 
 
 		$out = '';
 		$countryArray = array();
-		$label = array ();
+		$label = array();
 
 		$options_array = array();
 
 		$sql = "SELECT rowid, code as code_iso, label";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "c_country";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_country";
 		$sql .= " WHERE active = 1 AND code<>''";
 		$sql .= " ORDER BY code ASC";
 
-		dol_syslog(get_class($this) . "::select_country sql=" . $sql);
+		dol_syslog(get_class($this)."::select_country sql=".$sql);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 
@@ -120,12 +120,12 @@ 
 				$foundselected = false;
 
 				while ($i < $num) {
-					$obj = $this->db->fetch_object ( $resql );
+					$obj = $this->db->fetch_object($resql);
 					$countryArray [$i] ['rowid'] = $obj->rowid;
 					$countryArray [$i] ['code_iso'] = $obj->code_iso;
-					$countryArray [$i] ['label'] = ($obj->code_iso && $langs->transnoentitiesnoconv("Country" . $obj->code_iso ) != "Country" . $obj->code_iso ? $langs->transnoentitiesnoconv ( "Country" . $obj->code_iso ) : ($obj->label != '-' ? $obj->label : ''));
+					$countryArray [$i] ['label'] = ($obj->code_iso && $langs->transnoentitiesnoconv("Country".$obj->code_iso) != "Country".$obj->code_iso ? $langs->transnoentitiesnoconv("Country".$obj->code_iso) : ($obj->label != '-' ? $obj->label : ''));
 					$label[$i] = $countryArray[$i]['label'];
-					$i ++;
+					$i++;
 				}
 
 				array_multisort($label, SORT_ASC, $countryArray);
@@ -133,7 +133,7 @@ 
 				foreach ($countryArray as $row) {
 					$label = dol_trunc($row['label'], $maxlength, 'middle');
 					if ($row['code_iso'])
-						$label .= ' (' . $row['code_iso'] . ')';
+						$label .= ' ('.$row['code_iso'].')';
 
 					$options_array[$row['rowid']] = $label;
 				}
@@ -158,33 +158,33 @@ 
 
 		global $conf;
 
-		$options_array = array ();
+		$options_array = array();
 
-        $sql_usr  = '';
+        $sql_usr = '';
 		$sql_usr .= "SELECT DISTINCT u2.rowid, u2.lastname as name, u2.firstname, u2.login";
-		$sql_usr .= " FROM " . MAIN_DB_PREFIX . "user as u2, " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
-		$sql_usr .= " WHERE u2.entity IN (0," . $conf->entity . ")";
+		$sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u2, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql_usr .= " WHERE u2.entity IN (0,".$conf->entity.")";
 		$sql_usr .= " AND u2.rowid = sc.fk_user ";
 
-		if (! empty ( $conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX ))
+		if (!empty ($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX))
 			$sql_usr .= " AND u2.statut<>0 ";
 		$sql_usr .= " ORDER BY name ASC";
 		// print $sql_usr;exit;
 
-		$resql_usr = $this->db->query ( $sql_usr );
+		$resql_usr = $this->db->query($sql_usr);
 		if ($resql_usr) {
-			while ( $obj_usr = $this->db->fetch_object ( $resql_usr ) ) {
+			while ($obj_usr = $this->db->fetch_object($resql_usr)) {
 
-				$label = $obj_usr->firstname . " " . $obj_usr->name . " (" . $obj_usr->login . ')';
+				$label = $obj_usr->firstname." ".$obj_usr->name." (".$obj_usr->login.')';
 
 				$options_array [$obj_usr->rowid] = $label;
 			}
-			$this->db->free ( $resql_usr );
+			$this->db->free($resql_usr);
 		} else {
-			dol_print_error ( $this->db );
+			dol_print_error($this->db);
 		}
 
-		return $this->advMultiselectarray ( $htmlname, $options_array, $selected_array );
+		return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
 	}
 
 	/**
@@ -194,14 +194,14 @@ 
 	 * @param array $selected_array selected array
 	 * @return string combo list code
 	 */
-    function multiselectselectLanguage($htmlname='', $selected_array=array())
+    function multiselectselectLanguage($htmlname = '', $selected_array = array())
     {
 
-		global $conf,$langs;
+		global $conf, $langs;
 
-		$options_array = array ();
+		$options_array = array();
 
-		$langs_available=$langs->get_available_languages(DOL_DOCUMENT_ROOT,12);
+		$langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 12);
 
 		foreach ($langs_available as $key => $value)
 		{
@@ -223,12 +223,12 @@ 
 	 */
 	function advMultiselectarraySelllist($htmlname, $sqlqueryparam = array(), $selected_array = array())
 	{
-		$options_array=array();
+		$options_array = array();
 
 		if (is_array($sqlqueryparam))
 		{
-			$param_list = array_keys ( $sqlqueryparam );
-			$InfoFieldList = explode ( ":", $param_list [0] );
+			$param_list = array_keys($sqlqueryparam);
+			$InfoFieldList = explode(":", $param_list [0]);
 
 			// 0 1 : tableName
 			// 1 2 : label field name Nom du champ contenant le libelle
@@ -237,46 +237,46 @@ 
 
 			$keyList = 'rowid';
 
-			if (count ( $InfoFieldList ) >= 3) {
-				if (strpos ( $InfoFieldList [3], 'extra.' ) !== false) {
-					$keyList = 'main.' . $InfoFieldList [2] . ' as rowid';
+			if (count($InfoFieldList) >= 3) {
+				if (strpos($InfoFieldList [3], 'extra.') !== false) {
+					$keyList = 'main.'.$InfoFieldList [2].' as rowid';
 				} else {
-					$keyList = $InfoFieldList [2] . ' as rowid';
+					$keyList = $InfoFieldList [2].' as rowid';
 				}
 			}
 
-			$sql = 'SELECT ' . $keyList . ', ' . $InfoFieldList [1];
-			$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList [0];
-			if (! empty ( $InfoFieldList [3] )) {
+			$sql = 'SELECT '.$keyList.', '.$InfoFieldList [1];
+			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList [0];
+			if (!empty ($InfoFieldList [3])) {
 
 				// We have to join on extrafield table
-				if (strpos ( $InfoFieldList [3], 'extra' ) !== false) {
-					$sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList [0] . '_extrafields as extra';
-					$sql .= ' WHERE  extra.fk_object=main.' . $InfoFieldList [2] . ' AND ' . $InfoFieldList [3];
+				if (strpos($InfoFieldList [3], 'extra') !== false) {
+					$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList [0].'_extrafields as extra';
+					$sql .= ' WHERE  extra.fk_object=main.'.$InfoFieldList [2].' AND '.$InfoFieldList [3];
 				} else {
-					$sql .= ' WHERE ' . $InfoFieldList [3];
+					$sql .= ' WHERE '.$InfoFieldList [3];
 				}
 			}
-			if (! empty($InfoFieldList[1])) {
+			if (!empty($InfoFieldList[1])) {
 				$sql .= " ORDER BY nom";
 			}
 			// $sql.= ' WHERE entity = '.$conf->entity;
 
-			dol_syslog(get_class($this) . "::".__METHOD__,LOG_DEBUG);
+			dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 
 				$num = $this->db->num_rows($resql);
 				$i = 0;
 				if ($num) {
-					while ( $i < $num ) {
-						$obj = $this->db->fetch_object ( $resql );
-						$labeltoshow = dol_trunc ( $obj->$InfoFieldList [1], 90 );
-						$options_array[$obj->rowid]=$labeltoshow;
-						$i ++;
+					while ($i < $num) {
+						$obj = $this->db->fetch_object($resql);
+						$labeltoshow = dol_trunc($obj->$InfoFieldList [1], 90);
+						$options_array[$obj->rowid] = $labeltoshow;
+						$i++;
 					}
 				}
-				$this->db->free ( $resql );
+				$this->db->free($resql);
 			}
 		}
 
@@ -290,19 +290,19 @@ 
 	 *  @param  array  $selected_array     Array
 	 *  @return	string                     HTML combo
 	 */
-	function multiselectCivility($htmlname='civilite_id',$selected_array = array())
+	function multiselectCivility($htmlname = 'civilite_id', $selected_array = array())
 	{
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 		$langs->load("dict");
 
-		$options_array=array();
+		$options_array = array();
 
 
 		$sql = "SELECT rowid, code, label as civilite, active FROM ".MAIN_DB_PREFIX."c_civility";
-		$sql.= " WHERE active = 1";
+		$sql .= " WHERE active = 1";
 
-		dol_syslog(get_class($this)."::".__METHOD__,LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 
@@ -314,10 +314,10 @@ 
 				{
 					$obj = $this->db->fetch_object($resql);
 					// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-					$label= ($langs->trans("Civility".$obj->code)!="Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->civilite!='-'?$obj->civilite:''));
+					$label = ($langs->trans("Civility".$obj->code) != "Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->civilite != '-' ? $obj->civilite : ''));
 
 
-					$options_array[$obj->code]=$label;
+					$options_array[$obj->code] = $label;
 
 					$i++;
 				}
@@ -328,7 +328,7 @@ 
 			dol_print_error($this->db);
 		}
 
-		return $this->advMultiselectarray ( $htmlname, $options_array, $selected_array );
+		return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
 	}
 
 	/**
@@ -344,8 +344,8 @@ 
     {
 		global $conf, $langs;
 
-		$form=new Form($this->db);
-		$return = $form->multiselectarray($htmlname, $options_array, $selected_array,0,0,'',0,295);
+		$form = new Form($this->db);
+		$return = $form->multiselectarray($htmlname, $options_array, $selected_array, 0, 0, '', 0, 295);
 		return $return;
 	}
 
@@ -356,9 +356,9 @@ 
 	 * 	@param	array	$selected_array	value selected
 	 *  @return	string HTML combo
 	 */
-	function multiselectCustomerCategories($htmlname='cust_cat',$selected_array = array())
+	function multiselectCustomerCategories($htmlname = 'cust_cat', $selected_array = array())
 	{
-		return $this->multiselectCategories($htmlname,$selected_array,2);
+		return $this->multiselectCategories($htmlname, $selected_array, 2);
 	}
 
 	/**
@@ -368,9 +368,9 @@ 
 	 * 	@param	array	$selected_array	value selected
 	 *  @return	string HTML combo
 	 */
-	function multiselectContactCategories($htmlname='contact_cat',$selected_array = array())
+	function multiselectContactCategories($htmlname = 'contact_cat', $selected_array = array())
 	{
-		return $this->multiselectCategories($htmlname,$selected_array,4);
+		return $this->multiselectCategories($htmlname, $selected_array, 4);
 	}
 
 	/**
@@ -381,18 +381,18 @@ 
 	 * 	@param	int		$type			Type
 	 *  @return	string 					HTML combo
 	 */
-	public function multiselectCategories($htmlname='',$selected_array = array(), $type=0)
+	public function multiselectCategories($htmlname = '', $selected_array = array(), $type = 0)
 	{
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 		$langs->load("dict");
 
-		$options_array=array();
+		$options_array = array();
 
 		$sql = "SELECT rowid, label FROM ".MAIN_DB_PREFIX."categorie";
-		$sql.= " WHERE type=".$type;
+		$sql .= " WHERE type=".$type;
 
-		dol_syslog(get_class($this)."::".__METHOD__,LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 
@@ -404,7 +404,7 @@ 
 				{
 					$obj = $this->db->fetch_object($resql);
 
-					$options_array[$obj->rowid]=$obj->label;
+					$options_array[$obj->rowid] = $obj->label;
 
 					$i++;
 				}
@@ -415,7 +415,7 @@ 
 			dol_print_error($this->db);
 		}
 
-		return $this->advMultiselectarray( $htmlname, $options_array, $selected_array );
+		return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
 	}
 
 	/**
@@ -427,48 +427,48 @@ 
 	 * @param	string		$type_element	Type element. Example: 'mailing'
 	 * @return	string 						HTML combo
 	 */
-    public function selectAdvtargetemailingTemplate($htmlname='template_id', $selected=0, $showempty=0, $type_element='mailing')
+    public function selectAdvtargetemailingTemplate($htmlname = 'template_id', $selected = 0, $showempty = 0, $type_element = 'mailing')
     {
 		global $conf, $user, $langs;
 
 		$out = '';
 
 		$sql = "SELECT c.rowid, c.name, c.fk_element";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "advtargetemailing as c";
+		$sql .= " FROM ".MAIN_DB_PREFIX."advtargetemailing as c";
 		$sql .= " WHERE type_element='$type_element'";
 		$sql .= " ORDER BY c.name";
 
-		dol_syslog ( get_class ( $this ) . "::".__METHOD__, LOG_DEBUG );
-		$resql = $this->db->query ( $sql );
+		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
 		if ($resql) {
 
 
-			$out .= '<select id="' . $htmlname . '" class="flat" name="' . $htmlname . '">';
+			$out .= '<select id="'.$htmlname.'" class="flat" name="'.$htmlname.'">';
 			if ($showempty)
 				$out .= '<option value=""></option>';
-			$num = $this->db->num_rows ( $resql );
+			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num) {
-				while ( $i < $num ) {
-					$obj = $this->db->fetch_object ( $resql );
+				while ($i < $num) {
+					$obj = $this->db->fetch_object($resql);
 					$label = $obj->name;
 					if (empty($label)) {
-						$label=$obj->fk_element;
+						$label = $obj->fk_element;
 					}
 
 					if ($selected > 0 && $selected == $obj->rowid) {
-						$out .= '<option value="' . $obj->rowid . '" selected="selected">' . $label . '</option>';
+						$out .= '<option value="'.$obj->rowid.'" selected="selected">'.$label.'</option>';
 					} else {
-						$out .= '<option value="' . $obj->rowid . '">' . $label . '</option>';
+						$out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';
 					}
-					$i ++;
+					$i++;
 				}
 			}
 			$out .= '</select>';
 		} else {
-			dol_print_error ( $this->db );
+			dol_print_error($this->db);
 		}
-		$this->db->free ( $resql );
+		$this->db->free($resql);
 		return $out;
 	}
 }

Braces +14 added lines, -12 removed lines

@@ -73,8 +73,9 @@ 
 				$obj = $this->db->fetch_object( $resql );
 
 				$level = $langs->trans( $obj->code );
-				if ($level == $obj->code)
-					$level = $langs->trans( $obj->label );
+				if ($level == $obj->code) {
+									$level = $langs->trans( $obj->label );
+				}
 				$options_array[$obj->code] = $level;
 
 				$i ++;
@@ -132,8 +133,9 @@ 
 
 				foreach ($countryArray as $row) {
 					$label = dol_trunc($row['label'], $maxlength, 'middle');
-					if ($row['code_iso'])
-						$label .= ' (' . $row['code_iso'] . ')';
+					if ($row['code_iso']) {
+											$label .= ' (' . $row['code_iso'] . ')';
+					}
 
 					$options_array[$row['rowid']] = $label;
 				}
@@ -166,8 +168,9 @@ 
 		$sql_usr .= " WHERE u2.entity IN (0," . $conf->entity . ")";
 		$sql_usr .= " AND u2.rowid = sc.fk_user ";
 
-		if (! empty ( $conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX ))
-			$sql_usr .= " AND u2.statut<>0 ";
+		if (! empty ( $conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX )) {
+					$sql_usr .= " AND u2.statut<>0 ";
+		}
 		$sql_usr .= " ORDER BY name ASC";
 		// print $sql_usr;exit;
 
@@ -322,8 +325,7 @@ 
 					$i++;
 				}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -409,8 +411,7 @@ 
 					$i++;
 				}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -444,8 +445,9 @@ 
 
 
 			$out .= '<select id="' . $htmlname . '" class="flat" name="' . $htmlname . '">';
-			if ($showempty)
-				$out .= '<option value=""></option>';
+			if ($showempty) {
+							$out .= '<option value=""></option>';
+			}
 			$num = $this->db->num_rows ( $resql );
 			$i = 0;
 			if ($num) {