alxarafe / alixar

dolibarr/htdocs/expedition/document.php

Indentation +94 added lines, -94 removed lines

@@ -34,7 +34,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT .'/expedition/class/expedition.class.php';
 if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+    require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
@@ -48,7 +48,7 @@ 
 // Security check
 if ($user->societe_id)
 {
-	$socid = $user->societe_id;
+    $socid = $user->societe_id;
 }
 $result=restrictedArea($user,'expedition',$id,'');
 
@@ -71,8 +71,8 @@ 
  */
 if ($object->fetch($id))
 {
-	$object->fetch_thirdparty();
-	$upload_dir = $conf->expedition->dir_output . "/sending/" . dol_sanitizeFileName($object->ref);
+    $object->fetch_thirdparty();
+    $upload_dir = $conf->expedition->dir_output . "/sending/" . dol_sanitizeFileName($object->ref);
 }
 
 include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
@@ -87,102 +87,102 @@ 
 $form = new Form($db);
 
 if ($id > 0 || ! empty($ref)){
-	if ($object->fetch($id, $ref)){
-		$object->fetch_thirdparty();
+    if ($object->fetch($id, $ref)){
+        $object->fetch_thirdparty();
 
-		$upload_dir = $conf->expedition->dir_output.'/sending/'.dol_sanitizeFileName($object->ref);
+        $upload_dir = $conf->expedition->dir_output.'/sending/'.dol_sanitizeFileName($object->ref);
 
-		$head = shipping_prepare_head($object);
-		dol_fiche_head($head, 'documents', $langs->trans("Shipment"), -1, 'sending');
+        $head = shipping_prepare_head($object);
+        dol_fiche_head($head, 'documents', $langs->trans("Shipment"), -1, 'sending');
 	
 
-		// Build file list
-		$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-		$totalsize=0;
-		foreach($filearray as $key => $file){
-		    $totalsize+=$file['size'];
-		}
-
-		// Shipment card
-		$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">'.$langs->trans("BackToList").'</a>';
-
-
-		$morehtmlref='<div class="refidno">';
-		// Ref customer
-		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
-		// Thirdparty
-		$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
-
-		// Project
-		if (! empty($conf->projet->enabled)) {
-			$langs->load("projects");
-			$morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
-			if (0) {    // Do not change on shipment
-				if ($action != 'classify') {
-					$morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-				}
-				if ($action == 'classify') {
-					// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-					$morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '">';
-					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
-					$morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-					$morehtmlref .= '<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';
-					$morehtmlref .= '</form>';
-				} else {
-					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-				}
-			} else {
-				// We don't have project on shipment, so we will use the project or source object instead
-				// TODO Add project on shipment
-				$morehtmlref .= ' : ';
-				if (! empty($objectsrc->fk_project)) {
-					$proj = new Project($db);
-					$proj->fetch($objectsrc->fk_project);
-					$morehtmlref .= '<a href="' . DOL_URL_ROOT . '/projet/card.php?id=' . $objectsrc->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-					$morehtmlref .= $proj->ref;
-					$morehtmlref .= '</a>';
-				} else {
-					$morehtmlref .= '';
-				}
-			}
-		}
-		$morehtmlref.='</div>';
-
-		// Order card
-
-		$linkback = '<a href="' . DOL_URL_ROOT . '/expedition/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-
-		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-
-		print '<div class="fichecenter">';
-		print '<div class="underbanner clearboth"></div>';
-
-		print '<table class="border" width="100%">';
-
-		print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-		print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
-
-		print "</table>\n";
-
-		print "</div>\n";
-
-		print dol_fiche_end();
-
-		$modulepart = 'expedition';
-		$permission = $user->rights->expedition->creer;
-		$permtoedit = $user->rights->expedition->creer;
-		$param = '&id=' . $object->id;
-		include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
-	}
-	else{
-		dol_print_error($db);
-	}
+        // Build file list
+        $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+        $totalsize=0;
+        foreach($filearray as $key => $file){
+            $totalsize+=$file['size'];
+        }
+
+        // Shipment card
+        $linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">'.$langs->trans("BackToList").'</a>';
+
+
+        $morehtmlref='<div class="refidno">';
+        // Ref customer
+        $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+        $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+        // Thirdparty
+        $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+
+        // Project
+        if (! empty($conf->projet->enabled)) {
+            $langs->load("projects");
+            $morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
+            if (0) {    // Do not change on shipment
+                if ($action != 'classify') {
+                    $morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                }
+                if ($action == 'classify') {
+                    // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+                    $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '">';
+                    $morehtmlref .= '<input type="hidden" name="action" value="classin">';
+                    $morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+                    $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                    $morehtmlref .= '<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';
+                    $morehtmlref .= '</form>';
+                } else {
+                    $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+                }
+            } else {
+                // We don't have project on shipment, so we will use the project or source object instead
+                // TODO Add project on shipment
+                $morehtmlref .= ' : ';
+                if (! empty($objectsrc->fk_project)) {
+                    $proj = new Project($db);
+                    $proj->fetch($objectsrc->fk_project);
+                    $morehtmlref .= '<a href="' . DOL_URL_ROOT . '/projet/card.php?id=' . $objectsrc->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+                    $morehtmlref .= $proj->ref;
+                    $morehtmlref .= '</a>';
+                } else {
+                    $morehtmlref .= '';
+                }
+            }
+        }
+        $morehtmlref.='</div>';
+
+        // Order card
+
+        $linkback = '<a href="' . DOL_URL_ROOT . '/expedition/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+
+        dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+        print '<div class="fichecenter">';
+        print '<div class="underbanner clearboth"></div>';
+
+        print '<table class="border" width="100%">';
+
+        print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+        print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
+
+        print "</table>\n";
+
+        print "</div>\n";
+
+        print dol_fiche_end();
+
+        $modulepart = 'expedition';
+        $permission = $user->rights->expedition->creer;
+        $permtoedit = $user->rights->expedition->creer;
+        $param = '&id=' . $object->id;
+        include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+    }
+    else{
+        dol_print_error($db);
+    }
 }
 else{
-	header('Location: index.php');
-	exit;
+    header('Location: index.php');
+    exit;
 }
 
 // End of page

Spacing +41 added lines, -41 removed lines

@@ -32,17 +32,17 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT .'/expedition/class/expedition.class.php';
-if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+if (!empty($conf->projet->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'other'));
 
-$action		= GETPOST('action','aZ09');
+$action		= GETPOST('action', 'aZ09');
 $confirm	= GETPOST('confirm');
-$id			= GETPOST('id','int');
+$id			= GETPOST('id', 'int');
 $ref		= GETPOST('ref');
 
 // Security check
@@ -50,18 +50,18 @@ 
 {
 	$socid = $user->societe_id;
 }
-$result=restrictedArea($user,'expedition',$id,'');
+$result = restrictedArea($user, 'expedition', $id, '');
 
 // Get parameters
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="name";
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "name";
 
 $object = new Expedition($db);
 
@@ -72,22 +72,22 @@ 
 if ($object->fetch($id))
 {
 	$object->fetch_thirdparty();
-	$upload_dir = $conf->expedition->dir_output . "/sending/" . dol_sanitizeFileName($object->ref);
+	$upload_dir = $conf->expedition->dir_output."/sending/".dol_sanitizeFileName($object->ref);
 }
 
-include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
+include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 
 /*
  * View
  */
 
-llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:expeditions_Clients|ES:Pedidos de clientes');
+llxHeader('', $langs->trans('Order'), 'EN:Customers_Orders|FR:expeditions_Clients|ES:Pedidos de clientes');
 
 $form = new Form($db);
 
-if ($id > 0 || ! empty($ref)){
-	if ($object->fetch($id, $ref)){
+if ($id > 0 || !empty($ref)) {
+	if ($object->fetch($id, $ref)) {
 		$object->fetch_thirdparty();
 
 		$upload_dir = $conf->expedition->dir_output.'/sending/'.dol_sanitizeFileName($object->ref);
@@ -97,50 +97,50 @@ 
 	
 
 		// Build file list
-		$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-		$totalsize=0;
-		foreach($filearray as $key => $file){
-		    $totalsize+=$file['size'];
+		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+		$totalsize = 0;
+		foreach ($filearray as $key => $file) {
+		    $totalsize += $file['size'];
 		}
 
 		// Shipment card
-		$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 
-		$morehtmlref='<div class="refidno">';
+		$morehtmlref = '<div class="refidno">';
 		// Ref customer
-		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+		$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
 		// Thirdparty
-		$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 
 		// Project
-		if (! empty($conf->projet->enabled)) {
+		if (!empty($conf->projet->enabled)) {
 			$langs->load("projects");
-			$morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if (0) {    // Do not change on shipment
 				if ($action != 'classify') {
-					$morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+					$morehtmlref .= '<a href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 				}
 				if ($action == 'classify') {
 					// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-					$morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '">';
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
 					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
-					$morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-					$morehtmlref .= '<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';
+					$morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 					$morehtmlref .= '</form>';
 				} else {
-					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 				}
 			} else {
 				// We don't have project on shipment, so we will use the project or source object instead
 				// TODO Add project on shipment
 				$morehtmlref .= ' : ';
-				if (! empty($objectsrc->fk_project)) {
+				if (!empty($objectsrc->fk_project)) {
 					$proj = new Project($db);
 					$proj->fetch($objectsrc->fk_project);
-					$morehtmlref .= '<a href="' . DOL_URL_ROOT . '/projet/card.php?id=' . $objectsrc->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
 					$morehtmlref .= $proj->ref;
 					$morehtmlref .= '</a>';
 				} else {
@@ -148,11 +148,11 @@ 
 				}
 			}
 		}
-		$morehtmlref.='</div>';
+		$morehtmlref .= '</div>';
 
 		// Order card
 
-		$linkback = '<a href="' . DOL_URL_ROOT . '/expedition/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
@@ -162,7 +162,7 @@ 
 		print '<table class="border" width="100%">';
 
 		print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-		print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
+		print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
 
 		print "</table>\n";
 
@@ -173,14 +173,14 @@ 
 		$modulepart = 'expedition';
 		$permission = $user->rights->expedition->creer;
 		$permtoedit = $user->rights->expedition->creer;
-		$param = '&id=' . $object->id;
-		include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+		$param = '&id='.$object->id;
+		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 	}
-	else{
+	else {
 		dol_print_error($db);
 	}
 }
-else{
+else {
 	header('Location: index.php');
 	exit;
 }

Braces +8 added lines, -6 removed lines

@@ -60,8 +60,12 @@ 
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="name";
+if (! $sortorder) {
+    $sortorder="ASC";
+}
+if (! $sortfield) {
+    $sortfield="name";
+}
 
 $object = new Expedition($db);
 
@@ -175,12 +179,10 @@ 
 		$permtoedit = $user->rights->expedition->creer;
 		$param = '&id=' . $object->id;
 		include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
-	}
-	else{
+	} else{
 		dol_print_error($db);
 	}
-}
-else{
+} else{
 	header('Location: index.php');
 	exit;
 }

dolibarr/htdocs/expedition/note.php

Indentation +13 added lines, -13 removed lines

@@ -91,19 +91,19 @@ 
 if ($id > 0 || ! empty($ref))
 {
 
-	$head=shipping_prepare_head($object);
-	dol_fiche_head($head, 'note', $langs->trans("Shipment"), -1, 'sending');
+    $head=shipping_prepare_head($object);
+    dol_fiche_head($head, 'note', $langs->trans("Shipment"), -1, 'sending');
 
 
-	// Shipment card
-	$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">'.$langs->trans("BackToList").'</a>';
+    // Shipment card
+    $linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlref='<div class="refidno">';
-	// Ref customer shipment
-	$morehtmlref.=$form->editfieldkey("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
-	// Thirdparty
-	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+    $morehtmlref='<div class="refidno">';
+    // Ref customer shipment
+    $morehtmlref.=$form->editfieldkey("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
+    $morehtmlref.=$form->editfieldval("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
+    // Thirdparty
+    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
     // Project
     if (! empty($conf->projet->enabled)) {
         $langs->load("projects");
@@ -146,10 +146,10 @@ 
 
     print '<div class="underbanner clearboth"></div>';
 
-	$cssclass='titlefield';
-	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+    $cssclass='titlefield';
+    include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-	dol_fiche_end();
+    dol_fiche_end();
 }
 
 // End of page

Spacing +32 added lines, -32 removed lines

@@ -27,7 +27,7 @@ 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
-if (! empty($conf->projet->enabled)) {
+if (!empty($conf->projet->enabled)) {
     require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -35,17 +35,17 @@ 
 // Load translation files required by the page
 $langs->loadLangs(array('sendings', 'companies', 'bills', 'deliveries', 'orders', 'stocks', 'other', 'propal'));
 
-$id=(GETPOST('id','int')?GETPOST('id','int'):GETPOST('facid','int'));  // For backward compatibility
-$ref=GETPOST('ref','alpha');
-$action=GETPOST('action','alpha');
+$id = (GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
 
 // Security check
-$socid='';
-if ($user->societe_id) $socid=$user->societe_id;
-$result=restrictedArea($user, $origin, $origin_id);
+$socid = '';
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, $origin, $origin_id);
 
 $object = new Expedition($db);
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
     $object->fetch($id, $ref);
     $object->fetch_thirdparty();
@@ -58,26 +58,26 @@ 
     }
 
     // Linked documents
-    if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
+    if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
     {
-        $objectsrc=new Commande($db);
+        $objectsrc = new Commande($db);
         $objectsrc->fetch($object->$typeobject->id);
     }
-    if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
+    if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
     {
-        $objectsrc=new Propal($db);
+        $objectsrc = new Propal($db);
         $objectsrc->fetch($object->$typeobject->id);
     }
 }
 
-$permissionnote=$user->rights->expedition->creer;	// Used by the include of actions_setnotes.inc.php
+$permissionnote = $user->rights->expedition->creer; // Used by the include of actions_setnotes.inc.php
 
 
 /*
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
 
 /*
@@ -88,49 +88,49 @@ 
 
 $form = new Form($db);
 
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
 
-	$head=shipping_prepare_head($object);
+	$head = shipping_prepare_head($object);
 	dol_fiche_head($head, 'note', $langs->trans("Shipment"), -1, 'sending');
 
 
 	// Shipment card
-	$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlref='<div class="refidno">';
+	$morehtmlref = '<div class="refidno">';
 	// Ref customer shipment
-	$morehtmlref.=$form->editfieldkey("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
+	$morehtmlref .= $form->editfieldkey("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
 	// Thirdparty
-	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
     // Project
-    if (! empty($conf->projet->enabled)) {
+    if (!empty($conf->projet->enabled)) {
         $langs->load("projects");
-        $morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
+        $morehtmlref .= '<br>'.$langs->trans('Project').' ';
         if (0) {    // Do not change on shipment
             if ($action != 'classify') {
-                $morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                $morehtmlref .= '<a href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
             }
             if ($action == 'classify') {
                 // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '">';
+                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
                 $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+                $morehtmlref .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
                 $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';
+                $morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
                 $morehtmlref .= '</form>';
             } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
             }
         } else {
             // We don't have project on shipment, so we will use the project or source object instead
             // TODO Add project on shipment
             $morehtmlref .= ' : ';
-            if (! empty($objectsrc->fk_project)) {
+            if (!empty($objectsrc->fk_project)) {
                 $proj = new Project($db);
                 $proj->fetch($objectsrc->fk_project);
-                $morehtmlref .= '<a href="' . DOL_URL_ROOT . '/projet/card.php?id=' . $objectsrc->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+                $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
                 $morehtmlref .= $proj->ref;
                 $morehtmlref .= '</a>';
             } else {
@@ -138,7 +138,7 @@ 
             }
         }
     }
-    $morehtmlref.='</div>';
+    $morehtmlref .= '</div>';
 
 
     dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -146,7 +146,7 @@ 
 
     print '<div class="underbanner clearboth"></div>';
 
-	$cssclass='titlefield';
+	$cssclass = 'titlefield';
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 	dol_fiche_end();

Braces +3 added lines, -1 removed lines

@@ -41,7 +41,9 @@
 
 // Security check
 $socid='';
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result=restrictedArea($user, $origin, $origin_id);
 
 $object = new Expedition($db);

dolibarr/htdocs/expedition/index.php

Indentation +130 added lines, -130 removed lines

@@ -72,9 +72,9 @@ 
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
 if (!$user->rights->societe->client->voir && !$socid)
 {
-	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
-	$sql.= $clause." sc.fk_user = " .$user->id;
-	$clause = " AND ";
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
+    $sql.= $clause." sc.fk_user = " .$user->id;
+    $clause = " AND ";
 }
 $sql.= $clause." e.fk_statut = 0";
 $sql.= " AND e.entity IN (".getEntity('expedition').")";
@@ -83,34 +83,34 @@ 
 $resql=$db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
-	if ($num)
-	{
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<th colspan="3">'.$langs->trans("SendingsToValidate").'</th></tr>';
-		$i = 0;
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-
-			$shipment->id=$obj->rowid;
-			$shipment->ref=$obj->ref;
-			$shipment->ref_customer=$obj->ref_customer;
-
-			print '<tr class="oddeven"><td class="nowrap">';
-			print $shipment->getNomUrl(1);
-			print "</td>";
-			print '<td>';
-			print '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.$obj->name.'</a>';
-			print '</td>';
-			print '<td>';
-			if ($obj->commande_id) print '<a href="'.DOL_URL_ROOT.'/commande/card.php?id='.$obj->commande_id.'">'.$obj->commande_ref.'</a>';
-			print '</td></tr>';
-			$i++;
-		}
-		print "</table><br>";
-	}
+    $num = $db->num_rows($resql);
+    if ($num)
+    {
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre">';
+        print '<th colspan="3">'.$langs->trans("SendingsToValidate").'</th></tr>';
+        $i = 0;
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
+
+            $shipment->id=$obj->rowid;
+            $shipment->ref=$obj->ref;
+            $shipment->ref_customer=$obj->ref_customer;
+
+            print '<tr class="oddeven"><td class="nowrap">';
+            print $shipment->getNomUrl(1);
+            print "</td>";
+            print '<td>';
+            print '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.$obj->name.'</a>';
+            print '</td>';
+            print '<td>';
+            if ($obj->commande_id) print '<a href="'.DOL_URL_ROOT.'/commande/card.php?id='.$obj->commande_id.'">'.$obj->commande_ref.'</a>';
+            print '</td></tr>';
+            $i++;
+        }
+        print "</table><br>";
+    }
 }
 
 
@@ -131,43 +131,43 @@ 
 $resql=$db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
-	if ($num)
-	{
-		$langs->load("orders");
-
-		$i = 0;
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<th colspan="3">'.$langs->trans("OrdersToProcess").'</th></tr>';
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-
-			$orderstatic->id=$obj->rowid;
-			$orderstatic->ref=$obj->ref;
-			$orderstatic->ref_customer=$obj->ref_customer;
-			$orderstatic->statut=$obj->fk_statut;
-			$orderstatic->billed=0;
-
-			$companystatic->name=$obj->name;
-			$companystatic->id=$obj->socid;
-
-			print '<tr class="oddeven">';
-			print '<td class="nowrap">';
-			print $orderstatic->getNomUrl(1);
-			print '</td>';
-			print '<td>';
-			print $companystatic->getNomUrl(1,'customer',32);
-			print '</td>';
-			print '<td align="right">';
-			print $orderstatic->getLibStatut(3);
-			print '</td>';
-			print '</tr>';
-			$i++;
-		}
-		print "</table><br>";
-	}
+    $num = $db->num_rows($resql);
+    if ($num)
+    {
+        $langs->load("orders");
+
+        $i = 0;
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre">';
+        print '<th colspan="3">'.$langs->trans("OrdersToProcess").'</th></tr>';
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
+
+            $orderstatic->id=$obj->rowid;
+            $orderstatic->ref=$obj->ref;
+            $orderstatic->ref_customer=$obj->ref_customer;
+            $orderstatic->statut=$obj->fk_statut;
+            $orderstatic->billed=0;
+
+            $companystatic->name=$obj->name;
+            $companystatic->id=$obj->socid;
+
+            print '<tr class="oddeven">';
+            print '<td class="nowrap">';
+            print $orderstatic->getNomUrl(1);
+            print '</td>';
+            print '<td>';
+            print $companystatic->getNomUrl(1,'customer',32);
+            print '</td>';
+            print '<td align="right">';
+            print $orderstatic->getLibStatut(3);
+            print '</td>';
+            print '</tr>';
+            $i++;
+        }
+        print "</table><br>";
+    }
 }
 
 
@@ -191,42 +191,42 @@ 
 $resql = $db->query($sql);
 if ( $resql )
 {
-	$langs->load("orders");
-
-	$num = $db->num_rows($resql);
-	if ($num)
-	{
-		$i = 0;
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<th colspan="3">'.$langs->trans("OrdersInProcess").'</th></tr>';
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-
-		    $orderstatic->id=$obj->rowid;
-			$orderstatic->ref=$obj->ref;
-			$orderstatic->ref_customer=$obj->ref_customer;
-			$orderstatic->statut=$obj->status;
+    $langs->load("orders");
+
+    $num = $db->num_rows($resql);
+    if ($num)
+    {
+        $i = 0;
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre">';
+        print '<th colspan="3">'.$langs->trans("OrdersInProcess").'</th></tr>';
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
+
+            $orderstatic->id=$obj->rowid;
+            $orderstatic->ref=$obj->ref;
+            $orderstatic->ref_customer=$obj->ref_customer;
+            $orderstatic->statut=$obj->status;
             $orderstatic->billed=$obj->billed;
 
             $companystatic->name=$obj->name;
-			$companystatic->id=$obj->socid;
-
-			print '<tr class="oddeven"><td>';
-			print $orderstatic->getNomUrl(1);
-			print '</td>';
-			print '<td>';
-			print $companystatic->getNomUrl(1,'customer');
-			print '</td>';
+            $companystatic->id=$obj->socid;
+
+            print '<tr class="oddeven"><td>';
+            print $orderstatic->getNomUrl(1);
+            print '</td>';
+            print '<td>';
+            print $companystatic->getNomUrl(1,'customer');
+            print '</td>';
             print '<td align="right">';
             print $orderstatic->getLibStatut(3);
             print '</td>';
             print '</tr>';
-			$i++;
-		}
-		print "</table><br>";
-	}
+            $i++;
+        }
+        print "</table><br>";
+    }
 }
 else dol_print_error($db);
 
@@ -252,39 +252,39 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
-	if ($num)
-	{
-		$i = 0;
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<th colspan="3">'.$langs->trans("LastSendings", $num).'</th></tr>';
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-
-			$shipment->id=$obj->rowid;
-			$shipment->ref=$obj->ref;
-			$shipment->ref_customer=$obj->ref_customer;
-
-			print '<tr class="oddeven"><td>';
-			print $shipment->getNomUrl(1);
-			print '</td>';
-			print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
-			print '<td>';
-			if ($obj->commande_id > 0)
-			{
-				$orderstatic->id=$obj->commande_id;
-				$orderstatic->ref=$obj->commande_ref;
-				print $orderstatic->getNomUrl(1);
-			}
-			else print '&nbsp;';
-			print '</td></tr>';
-			$i++;
-		}
-		print "</table><br>";
-	}
-	$db->free($resql);
+    $num = $db->num_rows($resql);
+    if ($num)
+    {
+        $i = 0;
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre">';
+        print '<th colspan="3">'.$langs->trans("LastSendings", $num).'</th></tr>';
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
+
+            $shipment->id=$obj->rowid;
+            $shipment->ref=$obj->ref;
+            $shipment->ref_customer=$obj->ref_customer;
+
+            print '<tr class="oddeven"><td>';
+            print $shipment->getNomUrl(1);
+            print '</td>';
+            print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
+            print '<td>';
+            if ($obj->commande_id > 0)
+            {
+                $orderstatic->id=$obj->commande_id;
+                $orderstatic->ref=$obj->commande_ref;
+                print $orderstatic->getNomUrl(1);
+            }
+            else print '&nbsp;';
+            print '</td></tr>';
+            $i++;
+        }
+        print "</table><br>";
+    }
+    $db->free($resql);
 }
 else dol_print_error($db);
 

Spacing +76 added lines, -76 removed lines

@@ -34,12 +34,12 @@ 
  *	View
  */
 
-$orderstatic=new Commande($db);
-$companystatic=new Societe($db);
-$shipment=new Expedition($db);
+$orderstatic = new Commande($db);
+$companystatic = new Societe($db);
+$shipment = new Expedition($db);
 
-$helpurl='EN:Module_Shipments|FR:Module_Expéditions|ES:Módulo_Expediciones';
-llxHeader('',$langs->trans("Shipment"),$helpurl);
+$helpurl = 'EN:Module_Shipments|FR:Module_Expéditions|ES:Módulo_Expediciones';
+llxHeader('', $langs->trans("Shipment"), $helpurl);
 
 print load_fiche_titre($langs->trans("SendingsArea"));
 
@@ -47,7 +47,7 @@ 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
     print '<form method="post" action="list.php">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -64,23 +64,23 @@ 
 $clause = " WHERE ";
 
 $sql = "SELECT e.rowid, e.ref, e.ref_customer,";
-$sql.= " s.nom as name, s.rowid as socid,";
-$sql.= " c.ref as commande_ref, c.rowid as commande_id";
-$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping'";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
+$sql .= " s.nom as name, s.rowid as socid,";
+$sql .= " c.ref as commande_ref, c.rowid as commande_id";
+$sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping'";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
 if (!$user->rights->societe->client->voir && !$socid)
 {
-	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
-	$sql.= $clause." sc.fk_user = " .$user->id;
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
+	$sql .= $clause." sc.fk_user = ".$user->id;
 	$clause = " AND ";
 }
-$sql.= $clause." e.fk_statut = 0";
-$sql.= " AND e.entity IN (".getEntity('expedition').")";
-if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+$sql .= $clause." e.fk_statut = 0";
+$sql .= " AND e.entity IN (".getEntity('expedition').")";
+if ($socid) $sql .= " AND c.fk_soc = ".$socid;
 
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
@@ -94,9 +94,9 @@ 
 		{
 			$obj = $db->fetch_object($resql);
 
-			$shipment->id=$obj->rowid;
-			$shipment->ref=$obj->ref;
-			$shipment->ref_customer=$obj->ref_customer;
+			$shipment->id = $obj->rowid;
+			$shipment->ref = $obj->ref;
+			$shipment->ref_customer = $obj->ref_customer;
 
 			print '<tr class="oddeven"><td class="nowrap">';
 			print $shipment->getNomUrl(1);
@@ -118,17 +118,17 @@ 
  * Commandes a traiter
  */
 $sql = "SELECT c.rowid, c.ref, c.ref_client as ref_customer, c.fk_statut, s.nom as name, s.rowid as socid";
-$sql.= " FROM ".MAIN_DB_PREFIX."commande as c,";
-$sql.= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= " WHERE c.fk_soc = s.rowid";
-$sql.= " AND c.entity = ".$conf->entity;
-$sql.= " AND c.fk_statut = 1";
-if ($socid) $sql.= " AND c.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-$sql.= " ORDER BY c.rowid ASC";
-
-$resql=$db->query($sql);
+$sql .= " FROM ".MAIN_DB_PREFIX."commande as c,";
+$sql .= " ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql .= " WHERE c.fk_soc = s.rowid";
+$sql .= " AND c.entity = ".$conf->entity;
+$sql .= " AND c.fk_statut = 1";
+if ($socid) $sql .= " AND c.fk_soc = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+$sql .= " ORDER BY c.rowid ASC";
+
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
@@ -144,21 +144,21 @@ 
 		{
 			$obj = $db->fetch_object($resql);
 
-			$orderstatic->id=$obj->rowid;
-			$orderstatic->ref=$obj->ref;
-			$orderstatic->ref_customer=$obj->ref_customer;
-			$orderstatic->statut=$obj->fk_statut;
-			$orderstatic->billed=0;
+			$orderstatic->id = $obj->rowid;
+			$orderstatic->ref = $obj->ref;
+			$orderstatic->ref_customer = $obj->ref_customer;
+			$orderstatic->statut = $obj->fk_statut;
+			$orderstatic->billed = 0;
 
-			$companystatic->name=$obj->name;
-			$companystatic->id=$obj->socid;
+			$companystatic->name = $obj->name;
+			$companystatic->id = $obj->socid;
 
 			print '<tr class="oddeven">';
 			print '<td class="nowrap">';
 			print $orderstatic->getNomUrl(1);
 			print '</td>';
 			print '<td>';
-			print $companystatic->getNomUrl(1,'customer',32);
+			print $companystatic->getNomUrl(1, 'customer', 32);
 			print '</td>';
 			print '<td align="right">';
 			print $orderstatic->getLibStatut(3);
@@ -179,17 +179,17 @@ 
  * Commandes en traitement
  */
 $sql = "SELECT c.rowid, c.ref, c.ref_client as ref_customer, c.fk_statut as status, c.facture as billed, s.nom as name, s.rowid as socid";
-$sql.= " FROM ".MAIN_DB_PREFIX."commande as c,";
-$sql.= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= " WHERE c.fk_soc = s.rowid";
-$sql.= " AND c.entity = ".$conf->entity;
-$sql.= " AND c.fk_statut = 2";
-if ($socid) $sql.= " AND c.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+$sql .= " FROM ".MAIN_DB_PREFIX."commande as c,";
+$sql .= " ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql .= " WHERE c.fk_soc = s.rowid";
+$sql .= " AND c.entity = ".$conf->entity;
+$sql .= " AND c.fk_statut = 2";
+if ($socid) $sql .= " AND c.fk_soc = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 
 $resql = $db->query($sql);
-if ( $resql )
+if ($resql)
 {
 	$langs->load("orders");
 
@@ -204,20 +204,20 @@ 
 		{
 			$obj = $db->fetch_object($resql);
 
-		    $orderstatic->id=$obj->rowid;
-			$orderstatic->ref=$obj->ref;
-			$orderstatic->ref_customer=$obj->ref_customer;
-			$orderstatic->statut=$obj->status;
-            $orderstatic->billed=$obj->billed;
+		    $orderstatic->id = $obj->rowid;
+			$orderstatic->ref = $obj->ref;
+			$orderstatic->ref_customer = $obj->ref_customer;
+			$orderstatic->statut = $obj->status;
+            $orderstatic->billed = $obj->billed;
 
-            $companystatic->name=$obj->name;
-			$companystatic->id=$obj->socid;
+            $companystatic->name = $obj->name;
+			$companystatic->id = $obj->socid;
 
 			print '<tr class="oddeven"><td>';
 			print $orderstatic->getNomUrl(1);
 			print '</td>';
 			print '<td>';
-			print $companystatic->getNomUrl(1,'customer');
+			print $companystatic->getNomUrl(1, 'customer');
 			print '</td>';
             print '<td align="right">';
             print $orderstatic->getLibStatut(3);
@@ -235,19 +235,19 @@ 
  * Last shipments
  */
 $sql = "SELECT e.rowid, e.ref, e.ref_customer,";
-$sql.= " s.nom as name, s.rowid as socid,";
-$sql.= " c.ref as commande_ref, c.rowid as commande_id";
-$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
-$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND sc.fk_user = " .$user->id;
-$sql.= " AND e.fk_statut = 1";
-if ($socid) $sql.= " AND c.fk_soc = ".$socid;
-$sql.= " ORDER BY e.date_delivery DESC";
-$sql.= $db->plimit(5, 0);
+$sql .= " s.nom as name, s.rowid as socid,";
+$sql .= " c.ref as commande_ref, c.rowid as commande_id";
+$sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
+$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
+$sql .= " AND e.fk_statut = 1";
+if ($socid) $sql .= " AND c.fk_soc = ".$socid;
+$sql .= " ORDER BY e.date_delivery DESC";
+$sql .= $db->plimit(5, 0);
 
 $resql = $db->query($sql);
 if ($resql)
@@ -263,19 +263,19 @@ 
 		{
 			$obj = $db->fetch_object($resql);
 
-			$shipment->id=$obj->rowid;
-			$shipment->ref=$obj->ref;
-			$shipment->ref_customer=$obj->ref_customer;
+			$shipment->id = $obj->rowid;
+			$shipment->ref = $obj->ref;
+			$shipment->ref_customer = $obj->ref_customer;
 
 			print '<tr class="oddeven"><td>';
 			print $shipment->getNomUrl(1);
 			print '</td>';
-			print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
+			print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"), "company").' '.$obj->name.'</a></td>';
 			print '<td>';
 			if ($obj->commande_id > 0)
 			{
-				$orderstatic->id=$obj->commande_id;
-				$orderstatic->ref=$obj->commande_ref;
+				$orderstatic->id = $obj->commande_id;
+				$orderstatic->ref = $obj->commande_ref;
 				print $orderstatic->getNomUrl(1);
 			}
 			else print '&nbsp;';

Braces +42 added lines, -15 removed lines

@@ -47,9 +47,11 @@ 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {
+    // This is useless due to the global search combo
 {
     print '<form method="post" action="list.php">';
+}
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<table class="noborder nohover" width="100%">';
     print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
@@ -78,7 +80,9 @@ 
 }
 $sql.= $clause." e.fk_statut = 0";
 $sql.= " AND e.entity IN (".getEntity('expedition').")";
-if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+if ($socid) {
+    $sql.= " AND c.fk_soc = ".$socid;
+}
 
 $resql=$db->query($sql);
 if ($resql)
@@ -105,7 +109,9 @@ 
 			print '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.$obj->name.'</a>';
 			print '</td>';
 			print '<td>';
-			if ($obj->commande_id) print '<a href="'.DOL_URL_ROOT.'/commande/card.php?id='.$obj->commande_id.'">'.$obj->commande_ref.'</a>';
+			if ($obj->commande_id) {
+			    print '<a href="'.DOL_URL_ROOT.'/commande/card.php?id='.$obj->commande_id.'">'.$obj->commande_ref.'</a>';
+			}
 			print '</td></tr>';
 			$i++;
 		}
@@ -120,12 +126,18 @@ 
 $sql = "SELECT c.rowid, c.ref, c.ref_client as ref_customer, c.fk_statut, s.nom as name, s.rowid as socid";
 $sql.= " FROM ".MAIN_DB_PREFIX."commande as c,";
 $sql.= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql.= " WHERE c.fk_soc = s.rowid";
 $sql.= " AND c.entity = ".$conf->entity;
 $sql.= " AND c.fk_statut = 1";
-if ($socid) $sql.= " AND c.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid) {
+    $sql.= " AND c.fk_soc = ".$socid;
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+}
 $sql.= " ORDER BY c.rowid ASC";
 
 $resql=$db->query($sql);
@@ -181,12 +193,18 @@ 
 $sql = "SELECT c.rowid, c.ref, c.ref_client as ref_customer, c.fk_statut as status, c.facture as billed, s.nom as name, s.rowid as socid";
 $sql.= " FROM ".MAIN_DB_PREFIX."commande as c,";
 $sql.= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql.= " WHERE c.fk_soc = s.rowid";
 $sql.= " AND c.entity = ".$conf->entity;
 $sql.= " AND c.fk_statut = 2";
-if ($socid) $sql.= " AND c.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($socid) {
+    $sql.= " AND c.fk_soc = ".$socid;
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+}
 
 $resql = $db->query($sql);
 if ( $resql )
@@ -227,8 +245,9 @@ 
 		}
 		print "</table><br>";
 	}
+} else {
+    dol_print_error($db);
 }
-else dol_print_error($db);
 
 
 /*
@@ -241,11 +260,17 @@ 
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
+if (! $user->rights->societe->client->voir && ! $socid) {
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
+}
 $sql.= " WHERE e.entity IN (".getEntity('expedition').")";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND sc.fk_user = " .$user->id;
+if (! $user->rights->societe->client->voir && ! $socid) {
+    $sql.= " AND sc.fk_user = " .$user->id;
+}
 $sql.= " AND e.fk_statut = 1";
-if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+if ($socid) {
+    $sql.= " AND c.fk_soc = ".$socid;
+}
 $sql.= " ORDER BY e.date_delivery DESC";
 $sql.= $db->plimit(5, 0);
 
@@ -277,16 +302,18 @@ 
 				$orderstatic->id=$obj->commande_id;
 				$orderstatic->ref=$obj->commande_ref;
 				print $orderstatic->getNomUrl(1);
+			} else {
+			    print '&nbsp;';
 			}
-			else print '&nbsp;';
 			print '</td></tr>';
 			$i++;
 		}
 		print "</table><br>";
 	}
 	$db->free($resql);
+} else {
+    dol_print_error($db);
 }
-else dol_print_error($db);
 
 
 print '</div></div></div>';

dolibarr/htdocs/expedition/contact.php

Indentation +93 added lines, -93 removed lines

@@ -80,26 +80,26 @@ 
 {
     if ($result > 0 && $id > 0)
     {
-  		$result = $objectsrc->add_contact(GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'), $_POST["type"], $_POST["source"]);
+            $result = $objectsrc->add_contact(GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'), $_POST["type"], $_POST["source"]);
     }
 
-	if ($result >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	}
-	else
-	{
-		if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
-			$langs->load("errors");
-			$mesg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
-		} else {
-			$mesg = $objectsrc->error;
-			$mesgs = $objectsrc->errors;
-		}
-		setEventMessages($mesg, $mesgs, 'errors');
-	}
+    if ($result >= 0)
+    {
+        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+        exit;
+    }
+    else
+    {
+        if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+        {
+            $langs->load("errors");
+            $mesg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
+        } else {
+            $mesg = $objectsrc->error;
+            $mesgs = $objectsrc->errors;
+        }
+        setEventMessages($mesg, $mesgs, 'errors');
+    }
 }
 
 // bascule du statut d'un contact
@@ -111,16 +111,16 @@ 
 // Efface un contact
 else if ($action == 'deletecontact' && $user->rights->expedition->creer)
 {
-	$result = $objectsrc->delete_contact(GETPOST("lineid"));
-
-	if ($result >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	}
-	else {
-		dol_print_error($db);
-	}
+    $result = $objectsrc->delete_contact(GETPOST("lineid"));
+
+    if ($result >= 0)
+    {
+        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+        exit;
+    }
+    else {
+        dol_print_error($db);
+    }
 }
 /*
 else if ($action == 'setaddress' && $user->rights->expedition->creer)
@@ -152,20 +152,20 @@ 
 
 if ($id > 0 || ! empty($ref))
 {
-	$langs->trans("OrderCard");
+    $langs->trans("OrderCard");
 
-	$head = shipping_prepare_head($object);
-	dol_fiche_head($head, 'contact', $langs->trans("Shipment"), -1, 'sending');
+    $head = shipping_prepare_head($object);
+    dol_fiche_head($head, 'contact', $langs->trans("Shipment"), -1, 'sending');
 
 
-	// Shipment card
-	$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">'.$langs->trans("BackToList").'</a>';
+    // Shipment card
+    $linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlref='<div class="refidno">';
-	// Ref customer shipment
-	$morehtmlref.=$form->editfieldkey("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
-	// Thirdparty
+    $morehtmlref='<div class="refidno">';
+    // Ref customer shipment
+    $morehtmlref.=$form->editfieldkey("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
+    $morehtmlref.=$form->editfieldval("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
+    // Thirdparty
     $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
     // Project
     if (! empty($conf->projet->enabled)) {
@@ -201,70 +201,70 @@ 
             }
         }
     }
-	$morehtmlref.='</div>';
+    $morehtmlref.='</div>';
 
 
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-	print '<div class="fichecenter">';
+    print '<div class="fichecenter">';
     //print '<div class="fichehalfleft">';
-	print '<div class="underbanner clearboth"></div>';
+    print '<div class="underbanner clearboth"></div>';
 
     print '<table class="border centpercent">';
 
     // Linked documents
-	if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
-	{
-	    print '<tr><td class="titlefield">';
-	    $objectsrc=new Commande($db);
-	    $objectsrc->fetch($object->$typeobject->id);
-	    print $langs->trans("RefOrder").'</td>';
-	    print '<td colspan="3">';
-	    print $objectsrc->getNomUrl(1,'commande');
-	    print "</td>\n";
-	    print '</tr>';
-	}
-	if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
-	{
-	    print '<tr><td class="titlefield">';
-	    $objectsrc=new Propal($db);
-	    $objectsrc->fetch($object->$typeobject->id);
-	    print $langs->trans("RefProposal").'</td>';
-	    print '<td colspan="3">';
-	    print $objectsrc->getNomUrl(1,'expedition');
-	    print "</td>\n";
-	    print '</tr>';
-	}
-
-	print "</table>";
-
-
-	//print '</div>';
-	//print '<div class="fichehalfright">';
-	//print '<div class="ficheaddleft">';
-	//print '<div class="underbanner clearboth"></div>';
-
-
-	//print '</div>';
-	//print '</div>';
-	print '</div>';
-
-	print '<div class="clearboth"></div>';
-
-
-	dol_fiche_end();
-
-	// Lignes de contacts
-	echo '<br>';
-
-	// Contacts lines (modules that overwrite templates must declare this into descriptor)
-	$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
-	foreach($dirtpls as $reldir)
-	{
-	    $res=@include dol_buildpath($reldir.'/contacts.tpl.php');
-	    if ($res) break;
-	}
+    if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
+    {
+        print '<tr><td class="titlefield">';
+        $objectsrc=new Commande($db);
+        $objectsrc->fetch($object->$typeobject->id);
+        print $langs->trans("RefOrder").'</td>';
+        print '<td colspan="3">';
+        print $objectsrc->getNomUrl(1,'commande');
+        print "</td>\n";
+        print '</tr>';
+    }
+    if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
+    {
+        print '<tr><td class="titlefield">';
+        $objectsrc=new Propal($db);
+        $objectsrc->fetch($object->$typeobject->id);
+        print $langs->trans("RefProposal").'</td>';
+        print '<td colspan="3">';
+        print $objectsrc->getNomUrl(1,'expedition');
+        print "</td>\n";
+        print '</tr>';
+    }
+
+    print "</table>";
+
+
+    //print '</div>';
+    //print '<div class="fichehalfright">';
+    //print '<div class="ficheaddleft">';
+    //print '<div class="underbanner clearboth"></div>';
+
+
+    //print '</div>';
+    //print '</div>';
+    print '</div>';
+
+    print '<div class="clearboth"></div>';
+
+
+    dol_fiche_end();
+
+    // Lignes de contacts
+    echo '<br>';
+
+    // Contacts lines (modules that overwrite templates must declare this into descriptor)
+    $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
+    foreach($dirtpls as $reldir)
+    {
+        $res=@include dol_buildpath($reldir.'/contacts.tpl.php');
+        if ($res) break;
+    }
 }
 
 // End of page

Spacing +40 added lines, -40 removed lines

@@ -29,7 +29,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-if (! empty($conf->projet->enabled)) {
+if (!empty($conf->projet->enabled)) {
     require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -37,16 +37,16 @@ 
 // Load translation files required by the page
 $langs->loadLangs(array('orders', 'sendings', 'companies'));
 
-$id=GETPOST('id','int');
-$ref=GETPOST('ref','alpha');
-$action=GETPOST('action','alpha');
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'expedition', $id,'');
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'expedition', $id, '');
 
 $object = new Expedition($db);
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
     $object->fetch($id, $ref);
     $object->fetch_thirdparty();
@@ -59,14 +59,14 @@ 
     }
 
     // Linked documents
-    if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
+    if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
     {
-        $objectsrc=new Commande($db);
+        $objectsrc = new Commande($db);
         $objectsrc->fetch($object->$typeobject->id);
     }
-    if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
+    if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
     {
-        $objectsrc=new Propal($db);
+        $objectsrc = new Propal($db);
         $objectsrc->fetch($object->$typeobject->id);
     }
 }
@@ -105,7 +105,7 @@ 
 // bascule du statut d'un contact
 else if ($action == 'swapstatut' && $user->rights->expedition->creer)
 {
-    $result=$objectsrc->swapContactStatus(GETPOST('ligne'));
+    $result = $objectsrc->swapContactStatus(GETPOST('ligne'));
 }
 
 // Efface un contact
@@ -135,13 +135,13 @@ 
  * View
  */
 
-llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:expeditions_Clients|ES:Pedidos de clientes');
+llxHeader('', $langs->trans('Order'), 'EN:Customers_Orders|FR:expeditions_Clients|ES:Pedidos de clientes');
 
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 $formother = new FormOther($db);
-$contactstatic=new Contact($db);
-$userstatic=new User($db);
+$contactstatic = new Contact($db);
+$userstatic = new User($db);
 
 
 /* *************************************************************************** */
@@ -150,7 +150,7 @@ 
 /*                                                                             */
 /* *************************************************************************** */
 
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
 	$langs->trans("OrderCard");
 
@@ -159,41 +159,41 @@ 
 
 
 	// Shipment card
-	$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlref='<div class="refidno">';
+	$morehtmlref = '<div class="refidno">';
 	// Ref customer shipment
-	$morehtmlref.=$form->editfieldkey("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
+	$morehtmlref .= $form->editfieldkey("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
 	// Thirdparty
-    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
     // Project
-    if (! empty($conf->projet->enabled)) {
+    if (!empty($conf->projet->enabled)) {
         $langs->load("projects");
-        $morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
+        $morehtmlref .= '<br>'.$langs->trans('Project').' ';
         if (0) {    // Do not change on shipment
             if ($action != 'classify') {
-                $morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                $morehtmlref .= '<a href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
             }
             if ($action == 'classify') {
                 // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '">';
+                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
                 $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+                $morehtmlref .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
                 $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';
+                $morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
                 $morehtmlref .= '</form>';
             } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
             }
         } else {
             // We don't have project on shipment, so we will use the project or source object instead
             // TODO Add project on shipment
             $morehtmlref .= ' : ';
-            if (! empty($objectsrc->fk_project)) {
+            if (!empty($objectsrc->fk_project)) {
                 $proj = new Project($db);
                 $proj->fetch($objectsrc->fk_project);
-                $morehtmlref .= '<a href="' . DOL_URL_ROOT . '/projet/card.php?id=' . $objectsrc->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+                $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
                 $morehtmlref .= $proj->ref;
                 $morehtmlref .= '</a>';
             } else {
@@ -201,7 +201,7 @@ 
             }
         }
     }
-	$morehtmlref.='</div>';
+	$morehtmlref .= '</div>';
 
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -214,25 +214,25 @@ 
     print '<table class="border centpercent">';
 
     // Linked documents
-	if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
+	if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
 	{
 	    print '<tr><td class="titlefield">';
-	    $objectsrc=new Commande($db);
+	    $objectsrc = new Commande($db);
 	    $objectsrc->fetch($object->$typeobject->id);
 	    print $langs->trans("RefOrder").'</td>';
 	    print '<td colspan="3">';
-	    print $objectsrc->getNomUrl(1,'commande');
+	    print $objectsrc->getNomUrl(1, 'commande');
 	    print "</td>\n";
 	    print '</tr>';
 	}
-	if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
+	if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
 	{
 	    print '<tr><td class="titlefield">';
-	    $objectsrc=new Propal($db);
+	    $objectsrc = new Propal($db);
 	    $objectsrc->fetch($object->$typeobject->id);
 	    print $langs->trans("RefProposal").'</td>';
 	    print '<td colspan="3">';
-	    print $objectsrc->getNomUrl(1,'expedition');
+	    print $objectsrc->getNomUrl(1, 'expedition');
 	    print "</td>\n";
 	    print '</tr>';
 	}
@@ -259,10 +259,10 @@ 
 	echo '<br>';
 
 	// Contacts lines (modules that overwrite templates must declare this into descriptor)
-	$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
-	foreach($dirtpls as $reldir)
+	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+	foreach ($dirtpls as $reldir)
 	{
-	    $res=@include dol_buildpath($reldir.'/contacts.tpl.php');
+	    $res = @include dol_buildpath($reldir.'/contacts.tpl.php');
 	    if ($res) break;
 	}
 }

Braces +8 added lines, -6 removed lines

@@ -42,7 +42,9 @@ 
 $action=GETPOST('action','alpha');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'expedition', $id,'');
 
 $object = new Expedition($db);
@@ -87,8 +89,7 @@ 
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
+	} else
 	{
 		if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
@@ -117,8 +118,7 @@ 
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -263,7 +263,9 @@ 
 	foreach($dirtpls as $reldir)
 	{
 	    $res=@include dol_buildpath($reldir.'/contacts.tpl.php');
-	    if ($res) break;
+	    if ($res) {
+	        break;
+	    }
 	}
 }
 

dolibarr/htdocs/expedition/list.php

Indentation +430 added lines, -430 removed lines

@@ -81,38 +81,38 @@ 
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'e.ref'=>"Ref",
-	's.nom'=>"ThirdParty",
-	'e.note_public'=>'NotePublic',
+    'e.ref'=>"Ref",
+    's.nom'=>"ThirdParty",
+    'e.note_public'=>'NotePublic',
 );
 if (empty($user->socid)) $fieldstosearchall["e.note_private"]="NotePrivate";
 
 $checkedtypetiers=0;
 $arrayfields=array(
-	'e.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-	'e.ref_customer'=>array('label'=>$langs->trans("RefCustomer"), 'checked'=>1),
-	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
-	's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1),
-	's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1),
-	'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
-	'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
-	'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
-	'e.date_delivery'=>array('label'=>$langs->trans("DateDeliveryPlanned"), 'checked'=>1),
-	'e.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-	'e.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-	'e.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
-	'l.ref'=>array('label'=>$langs->trans("DeliveryRef"), 'checked'=>1, 'enabled'=>(empty($conf->livraison_bon->enabled)?0:1)),
-	'l.date_delivery'=>array('label'=>$langs->trans("DateReceived"), 'checked'=>1, 'enabled'=>(empty($conf->livraison_bon->enabled)?0:1)),
-	'e.billed'=>array('label'=>$langs->trans("Billed"), 'checked'=>1, 'position'=>1000, 'enabled'=>(!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)))
+    'e.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+    'e.ref_customer'=>array('label'=>$langs->trans("RefCustomer"), 'checked'=>1),
+    's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
+    's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1),
+    's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1),
+    'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
+    'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
+    'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
+    'e.date_delivery'=>array('label'=>$langs->trans("DateDeliveryPlanned"), 'checked'=>1),
+    'e.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+    'e.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+    'e.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+    'l.ref'=>array('label'=>$langs->trans("DeliveryRef"), 'checked'=>1, 'enabled'=>(empty($conf->livraison_bon->enabled)?0:1)),
+    'l.date_delivery'=>array('label'=>$langs->trans("DateReceived"), 'checked'=>1, 'enabled'=>(empty($conf->livraison_bon->enabled)?0:1)),
+    'e.billed'=>array('label'=>$langs->trans("Billed"), 'checked'=>1, 'position'=>1000, 'enabled'=>(!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)))
 );
 
 // 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]));
+    }
 }
 
 
@@ -132,36 +132,36 @@ 
 // 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_ref_exp='';
-	$search_ref_liv='';
-	$search_ref_customer='';
-	$search_company='';
-	$search_town='';
-	$search_zip="";
-	$search_state="";
-	$search_type='';
-	$search_country='';
-	$search_type_thirdparty='';
-	$search_billed='';
-	$viewstatut='';
-	$search_array_options=array();
+    $search_ref_exp='';
+    $search_ref_liv='';
+    $search_ref_customer='';
+    $search_company='';
+    $search_town='';
+    $search_zip="";
+    $search_state="";
+    $search_type='';
+    $search_country='';
+    $search_type_thirdparty='';
+    $search_billed='';
+    $viewstatut='';
+    $search_array_options=array();
 }
 
 if (empty($reshook))
 {
-	// Mass actions. Controls on number of lines checked
-	$maxformassaction=1000;
-	$numtoselect = (is_array($toselect)?count($toselect):0);
-	if (! empty($massaction) && $numtoselect < 1)
-	{
-		$error++;
-		setEventMessages($langs->trans("NoLineChecked"), null, "warnings");
-	}
-	if (! $error && $numtoselect > $maxformassaction)
-	{
-		setEventMessages($langs->trans('TooManyRecordForMassAction',$maxformassaction), null, 'errors');
-		$error++;
-	}
+    // Mass actions. Controls on number of lines checked
+    $maxformassaction=1000;
+    $numtoselect = (is_array($toselect)?count($toselect):0);
+    if (! empty($massaction) && $numtoselect < 1)
+    {
+        $error++;
+        setEventMessages($langs->trans("NoLineChecked"), null, "warnings");
+    }
+    if (! $error && $numtoselect > $maxformassaction)
+    {
+        setEventMessages($langs->trans('TooManyRecordForMassAction',$maxformassaction), null, 'errors');
+        $error++;
+    }
 }
 
 
@@ -200,20 +200,20 @@ 
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.rowid = ee.fk_target";
 if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
 {
-	$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql.= " WHERE e.entity IN (".getEntity('expedition').")";
 if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
 {
-	$sql.= " AND e.fk_soc = sc.fk_soc";
-	$sql.= " AND sc.fk_user = " .$user->id;
+    $sql.= " AND e.fk_soc = sc.fk_soc";
+    $sql.= " AND sc.fk_user = " .$user->id;
 }
 if ($socid)
 {
-	$sql.= " AND e.fk_soc = ".$socid;
+    $sql.= " AND e.fk_soc = ".$socid;
 }
 if ($viewstatut <> '' && $viewstatut >= 0) {
-	$sql.= " AND e.fk_statut = ".$viewstatut;
+    $sql.= " AND e.fk_statut = ".$viewstatut;
 }
 if ($search_ref_customer != '') $sql.=natural_search('e.ref_customer', $search_ref_customer);
 if ($search_billed != '' && $search_billed >= 0) $sql.=' AND e.billed = '.$search_billed;
@@ -240,13 +240,13 @@ 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-	{
-		$page = 0;
-		$offset = 0;
-	}
+    $result = $db->query($sql);
+    $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+        $page = 0;
+        $offset = 0;
+    }
 }
 
 $sql.= $db->plimit($limit + 1,$offset);
@@ -255,382 +255,382 @@ 
 $resql=$db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
-
-	$expedition = new Expedition($db);
-
-	$param='';
-	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-	if ($sall) $param.= "&amp;sall=".urlencode($sall);
-	if ($search_ref_exp)  $param.= "&amp;search_ref_exp=".urlencode($search_ref_exp);
-	if ($search_ref_liv)  $param.= "&amp;search_ref_liv=".urlencode($search_ref_liv);
-	if ($search_ref_customer) $param.= "&amp;search_ref_customer=".urlencode($search_ref_customer);
-	if ($search_company)   $param.= "&amp;search_company=".urlencode($search_company);
-	if ($search_town)      $param.= '&search_town='.urlencode($search_town);
-	if ($search_zip)       $param.= '&search_zip='.urlencode($search_zip);
-	if ($viewstatut != '') $param.= '&viewstatut='.urlencode($viewstatut);
-	if ($optioncss != '')  $param.='&amp;optioncss='.urlencode($optioncss);
-	// Add $param from extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
-
-	//$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
-
-	$newcardbutton='';
-	if ($user->rights->expedition->creer)
-	{
-		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/expedition/card.php?action=create2"><span class="valignmiddle">'.$langs->trans('NewSending').'</span>';
-		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-		$newcardbutton.= '</a>';
-	}
-
-	$i = 0;
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-	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="action" value="list">';
-	print '<input type="hidden" name="page" value="'.$page.'">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
-	print_barre_liste($langs->trans('ListOfSendings'), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit);
-
-	if ($sall)
-	{
-		foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
-	}
-
-	$moreforfilter='';
-	if (! empty($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>';
-	}
-
-	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-	$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-
-	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-
-	// Lignes des champs de filtre
-	print '<tr class="liste_titre_filter">';
-	// Ref
-	if (! empty($arrayfields['e.ref']['checked']))
-	{
-		print '<td class="liste_titre">';
-		print '<input class="flat" size="6" type="text" name="search_ref_exp" value="'.$search_ref_exp.'">';
-		print '</td>';
-	}
-	// Ref customer
-	if (! empty($arrayfields['e.ref_customer']['checked']))
-	{
-		print '<td class="liste_titre">';
-		print '<input class="flat" size="6" type="text" name="search_ref_customer" value="'.$search_ref_customer.'">';
-		print '</td>';
-	}
-	// Thirdparty
-	if (! empty($arrayfields['s.nom']['checked']))
-	{
-		print '<td class="liste_titre" align="left">';
-		print '<input class="flat" type="text" size="8" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
-		print '</td>';
-	}
-	// Town
-	if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
-	// Zip
-	if (! empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_zip" value="'.$search_zip.'"></td>';
-	// State
-	if (! empty($arrayfields['state.nom']['checked']))
-	{
-		print '<td class="liste_titre">';
-		print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
-		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>';
-	}
-	// 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>';
-	}
-	// Date delivery planned
-	if (! empty($arrayfields['e.date_delivery']['checked']))
-	{
-		print '<td class="liste_titre">&nbsp;</td>';
-	}
-	if (! empty($arrayfields['l.ref']['checked']))
-	{
-		// Delivery ref
-		print '<td class="liste_titre">';
-		print '<input class="flat" size="10" type="text" name="search_ref_liv" value="'.$search_ref_liv.'"';
-		print '</td>';
-	}
-	if (! empty($arrayfields['l.date_delivery']['checked']))
-	{
-		// Date received
-		print '<td class="liste_titre">&nbsp;</td>';
-	}
-	// Extra fields
-	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
-	print $hookmanager->resPrint;
-	// Date creation
-	if (! empty($arrayfields['e.datec']['checked']))
-	{
-		print '<td class="liste_titre">';
-		print '</td>';
-	}
-	// Date modification
-	if (! empty($arrayfields['e.tms']['checked']))
-	{
-		print '<td class="liste_titre">';
-		print '</td>';
-	}
-	// Status
-	if (! empty($arrayfields['e.fk_statut']['checked']))
-	{
-		print '<td class="liste_titre maxwidthonsmartphone" align="right">';
-		print $form->selectarray('viewstatut', array('0'=>$langs->trans('StatusSendingDraftShort'),'1'=>$langs->trans('StatusSendingValidatedShort'),'2'=>$langs->trans('StatusSendingProcessedShort')),$viewstatut,1);
-		print '</td>';
-	}
-	// Status billed
-	if (! empty($arrayfields['e.billed']['checked']))
-	{
-		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
-		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1);
-		print '</td>';
-	}
-	// Action column
-	print '<td class="liste_titre" align="middle">';
-	$searchpicto=$form->showFilterAndCheckAddButtons(0);
-	print $searchpicto;
-	print '</td>';
-	print "</tr>\n";
-
-	print '<tr class="liste_titre">';
-	if (! empty($arrayfields['e.ref']['checked']))            print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"],"e.ref","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.ref_customer']['checked']))   print_liste_field_titre($arrayfields['e.ref_customer']['label'], $_SERVER["PHP_SELF"],"e.ref_customer","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"],"s.nom", "", $param,'align="left"',$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['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['e.date_delivery']['checked']))  print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"],"e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['l.ref']['checked']))            print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"],"l.ref","",$param, '',$sortfield,$sortorder);
-	if (! empty($arrayfields['l.date_delivery']['checked']))  print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"],"l.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
-	// Extra fields
-	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-	{
-		foreach($extrafields->attribute_label as $key => $val)
-		{
-			if (! empty($arrayfields["ef.".$key]['checked']))
-			{
-				$align=$extrafields->getAlignFlag($key);
-				$sortonfield = "ef.".$key;
-				if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
-				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-			}
-		}
-	}
-	// 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['e.datec']['checked']))  print_liste_field_titre($arrayfields['e.datec']['label'],$_SERVER["PHP_SELF"],"e.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.tms']['checked']))    print_liste_field_titre($arrayfields['e.tms']['label'],$_SERVER["PHP_SELF"],"e.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.fk_statut']['checked'])) print_liste_field_titre($arrayfields['e.fk_statut']['label'],$_SERVER["PHP_SELF"],"e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.billed']['checked'])) print_liste_field_titre($arrayfields['e.billed']['label'],$_SERVER["PHP_SELF"],"e.billed","",$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();
-	while ($i < min($num,$limit))
-	{
-		$obj = $db->fetch_object($resql);
-
-		$shipment->id=$obj->rowid;
-		$shipment->ref=$obj->ref;
-
-		$companystatic->id=$obj->socid;
-		$companystatic->ref=$obj->name;
-		$companystatic->name=$obj->name;
-
-
-		print '<tr class="oddeven">';
-
-		// Ref
-		if (! empty($arrayfields['e.ref']['checked']))
-		{
-			print "<td>";
-			print $shipment->getNomUrl(1);
-			print "</td>\n";
-			if (! $i) $totalarray['nbfield']++;
-		}
-
-		// Ref customer
-		if (! empty($arrayfields['e.ref_customer']['checked']))
-		{
-			print "<td>";
-			print $obj->ref_customer;
-			print "</td>\n";
-			if (! $i) $totalarray['nbfield']++;
-		}
-
-		// Third party
-		if (! empty($arrayfields['s.nom']['checked']))
-		{
-			print '<td>';
-			print $companystatic->getNomUrl(1);
-			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
-		}
-		// Town
-		if (! empty($arrayfields['s.town']['checked']))
-		{
-			print '<td class="nocellnopadd">';
-			print $obj->town;
-			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
-		}
-		// Zip
-		if (! empty($arrayfields['s.zip']['checked']))
-		{
-			print '<td class="nocellnopadd">';
-			print $obj->zip;
-			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
-		}
-		// State
-		if (! empty($arrayfields['state.nom']['checked']))
-		{
-			print "<td>".$obj->state_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 (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
-			print $typenArray[$obj->typent_code];
-			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
-		}
-
-		// Date delivery planed
-		if (! empty($arrayfields['e.date_delivery']['checked']))
-		{
-			print '<td align="center">';
-			print dol_print_date($db->jdate($obj->date_livraison),"day");
-			/*$now = time();
+    $num = $db->num_rows($resql);
+
+    $expedition = new Expedition($db);
+
+    $param='';
+    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+    if ($sall) $param.= "&amp;sall=".urlencode($sall);
+    if ($search_ref_exp)  $param.= "&amp;search_ref_exp=".urlencode($search_ref_exp);
+    if ($search_ref_liv)  $param.= "&amp;search_ref_liv=".urlencode($search_ref_liv);
+    if ($search_ref_customer) $param.= "&amp;search_ref_customer=".urlencode($search_ref_customer);
+    if ($search_company)   $param.= "&amp;search_company=".urlencode($search_company);
+    if ($search_town)      $param.= '&search_town='.urlencode($search_town);
+    if ($search_zip)       $param.= '&search_zip='.urlencode($search_zip);
+    if ($viewstatut != '') $param.= '&viewstatut='.urlencode($viewstatut);
+    if ($optioncss != '')  $param.='&amp;optioncss='.urlencode($optioncss);
+    // Add $param from extra fields
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+
+    //$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
+
+    $newcardbutton='';
+    if ($user->rights->expedition->creer)
+    {
+        $newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/expedition/card.php?action=create2"><span class="valignmiddle">'.$langs->trans('NewSending').'</span>';
+        $newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+        $newcardbutton.= '</a>';
+    }
+
+    $i = 0;
+    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+    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="action" value="list">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+
+    print_barre_liste($langs->trans('ListOfSendings'), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit);
+
+    if ($sall)
+    {
+        foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+        print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
+    }
+
+    $moreforfilter='';
+    if (! empty($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>';
+    }
+
+    $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+    $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+
+    print '<div class="div-table-responsive">';
+    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+
+    // Lignes des champs de filtre
+    print '<tr class="liste_titre_filter">';
+    // Ref
+    if (! empty($arrayfields['e.ref']['checked']))
+    {
+        print '<td class="liste_titre">';
+        print '<input class="flat" size="6" type="text" name="search_ref_exp" value="'.$search_ref_exp.'">';
+        print '</td>';
+    }
+    // Ref customer
+    if (! empty($arrayfields['e.ref_customer']['checked']))
+    {
+        print '<td class="liste_titre">';
+        print '<input class="flat" size="6" type="text" name="search_ref_customer" value="'.$search_ref_customer.'">';
+        print '</td>';
+    }
+    // Thirdparty
+    if (! empty($arrayfields['s.nom']['checked']))
+    {
+        print '<td class="liste_titre" align="left">';
+        print '<input class="flat" type="text" size="8" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
+        print '</td>';
+    }
+    // Town
+    if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
+    // Zip
+    if (! empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_zip" value="'.$search_zip.'"></td>';
+    // State
+    if (! empty($arrayfields['state.nom']['checked']))
+    {
+        print '<td class="liste_titre">';
+        print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
+        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>';
+    }
+    // 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>';
+    }
+    // Date delivery planned
+    if (! empty($arrayfields['e.date_delivery']['checked']))
+    {
+        print '<td class="liste_titre">&nbsp;</td>';
+    }
+    if (! empty($arrayfields['l.ref']['checked']))
+    {
+        // Delivery ref
+        print '<td class="liste_titre">';
+        print '<input class="flat" size="10" type="text" name="search_ref_liv" value="'.$search_ref_liv.'"';
+        print '</td>';
+    }
+    if (! empty($arrayfields['l.date_delivery']['checked']))
+    {
+        // Date received
+        print '<td class="liste_titre">&nbsp;</td>';
+    }
+    // Extra fields
+    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
+    print $hookmanager->resPrint;
+    // Date creation
+    if (! empty($arrayfields['e.datec']['checked']))
+    {
+        print '<td class="liste_titre">';
+        print '</td>';
+    }
+    // Date modification
+    if (! empty($arrayfields['e.tms']['checked']))
+    {
+        print '<td class="liste_titre">';
+        print '</td>';
+    }
+    // Status
+    if (! empty($arrayfields['e.fk_statut']['checked']))
+    {
+        print '<td class="liste_titre maxwidthonsmartphone" align="right">';
+        print $form->selectarray('viewstatut', array('0'=>$langs->trans('StatusSendingDraftShort'),'1'=>$langs->trans('StatusSendingValidatedShort'),'2'=>$langs->trans('StatusSendingProcessedShort')),$viewstatut,1);
+        print '</td>';
+    }
+    // Status billed
+    if (! empty($arrayfields['e.billed']['checked']))
+    {
+        print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+        print $form->selectyesno('search_billed', $search_billed, 1, 0, 1);
+        print '</td>';
+    }
+    // Action column
+    print '<td class="liste_titre" align="middle">';
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
+    print '</td>';
+    print "</tr>\n";
+
+    print '<tr class="liste_titre">';
+    if (! empty($arrayfields['e.ref']['checked']))            print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"],"e.ref","",$param,'',$sortfield,$sortorder);
+    if (! empty($arrayfields['e.ref_customer']['checked']))   print_liste_field_titre($arrayfields['e.ref_customer']['label'], $_SERVER["PHP_SELF"],"e.ref_customer","",$param,'',$sortfield,$sortorder);
+    if (! empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"],"s.nom", "", $param,'align="left"',$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['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['e.date_delivery']['checked']))  print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"],"e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
+    if (! empty($arrayfields['l.ref']['checked']))            print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"],"l.ref","",$param, '',$sortfield,$sortorder);
+    if (! empty($arrayfields['l.date_delivery']['checked']))  print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"],"l.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
+    // Extra fields
+    if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+    {
+        foreach($extrafields->attribute_label as $key => $val)
+        {
+            if (! empty($arrayfields["ef.".$key]['checked']))
+            {
+                $align=$extrafields->getAlignFlag($key);
+                $sortonfield = "ef.".$key;
+                if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+                print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+            }
+        }
+    }
+    // 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['e.datec']['checked']))  print_liste_field_titre($arrayfields['e.datec']['label'],$_SERVER["PHP_SELF"],"e.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+    if (! empty($arrayfields['e.tms']['checked']))    print_liste_field_titre($arrayfields['e.tms']['label'],$_SERVER["PHP_SELF"],"e.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+    if (! empty($arrayfields['e.fk_statut']['checked'])) print_liste_field_titre($arrayfields['e.fk_statut']['label'],$_SERVER["PHP_SELF"],"e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
+    if (! empty($arrayfields['e.billed']['checked'])) print_liste_field_titre($arrayfields['e.billed']['label'],$_SERVER["PHP_SELF"],"e.billed","",$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();
+    while ($i < min($num,$limit))
+    {
+        $obj = $db->fetch_object($resql);
+
+        $shipment->id=$obj->rowid;
+        $shipment->ref=$obj->ref;
+
+        $companystatic->id=$obj->socid;
+        $companystatic->ref=$obj->name;
+        $companystatic->name=$obj->name;
+
+
+        print '<tr class="oddeven">';
+
+        // Ref
+        if (! empty($arrayfields['e.ref']['checked']))
+        {
+            print "<td>";
+            print $shipment->getNomUrl(1);
+            print "</td>\n";
+            if (! $i) $totalarray['nbfield']++;
+        }
+
+        // Ref customer
+        if (! empty($arrayfields['e.ref_customer']['checked']))
+        {
+            print "<td>";
+            print $obj->ref_customer;
+            print "</td>\n";
+            if (! $i) $totalarray['nbfield']++;
+        }
+
+        // Third party
+        if (! empty($arrayfields['s.nom']['checked']))
+        {
+            print '<td>';
+            print $companystatic->getNomUrl(1);
+            print '</td>';
+            if (! $i) $totalarray['nbfield']++;
+        }
+        // Town
+        if (! empty($arrayfields['s.town']['checked']))
+        {
+            print '<td class="nocellnopadd">';
+            print $obj->town;
+            print '</td>';
+            if (! $i) $totalarray['nbfield']++;
+        }
+        // Zip
+        if (! empty($arrayfields['s.zip']['checked']))
+        {
+            print '<td class="nocellnopadd">';
+            print $obj->zip;
+            print '</td>';
+            if (! $i) $totalarray['nbfield']++;
+        }
+        // State
+        if (! empty($arrayfields['state.nom']['checked']))
+        {
+            print "<td>".$obj->state_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 (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
+            print $typenArray[$obj->typent_code];
+            print '</td>';
+            if (! $i) $totalarray['nbfield']++;
+        }
+
+        // Date delivery planed
+        if (! empty($arrayfields['e.date_delivery']['checked']))
+        {
+            print '<td align="center">';
+            print dol_print_date($db->jdate($obj->date_livraison),"day");
+            /*$now = time();
     		if ( ($now - $db->jdate($obj->date_expedition)) > $conf->warnings->lim && $obj->statutid == 1 )
     		{
     		}*/
-			print "</td>\n";
-		}
-
-		if (! empty($arrayfields['l.ref']['checked']) || ! empty($arrayfields['l.date_delivery']['checked']))
-		{
-			$shipment->fetchObjectLinked($shipment->id,$shipment->element);
-			$receiving='';
-			if (is_array($shipment->linkedObjects['delivery']) && count($shipment->linkedObjects['delivery']) > 0) $receiving=reset($shipment->linkedObjects['delivery']);
-
-			if (! empty($arrayfields['l.ref']['checked']))
-			{
-				// Ref
-				print '<td>';
-				print !empty($receiving) ? $receiving->getNomUrl($db) : '';
-				print '</td>';
-			}
-
-			if (! empty($arrayfields['l.date_delivery']['checked']))
-			{
-				// Date received
-				print '<td align="center">';
-				print dol_print_date($db->jdate($obj->date_reception),"day");
-				print '</td>'."\n";
-			}
-		}
-
-		// 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['e.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['e.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['e.fk_statut']['checked']))
-		{
-			print '<td align="right" class="nowrap">'.$shipment->LibStatut($obj->fk_statut,5).'</td>';
-			if (! $i) $totalarray['nbfield']++;
-		}
-		// Billed
-		if (! empty($arrayfields['e.billed']['checked']))
-		{
-			print '<td align="center">'.yn($obj->billed).'</td>';
-			if (! $i) $totalarray['nbfield']++;
-		}
-
-		// Action column
-		print '<td></td>';
-		if (! $i) $totalarray['nbfield']++;
-
-		print "</tr>\n";
-
-		$i++;
-	}
-
-	print "</table>";
-	print "</div>";
-	print '</form>';
-	$db->free($resql);
+            print "</td>\n";
+        }
+
+        if (! empty($arrayfields['l.ref']['checked']) || ! empty($arrayfields['l.date_delivery']['checked']))
+        {
+            $shipment->fetchObjectLinked($shipment->id,$shipment->element);
+            $receiving='';
+            if (is_array($shipment->linkedObjects['delivery']) && count($shipment->linkedObjects['delivery']) > 0) $receiving=reset($shipment->linkedObjects['delivery']);
+
+            if (! empty($arrayfields['l.ref']['checked']))
+            {
+                // Ref
+                print '<td>';
+                print !empty($receiving) ? $receiving->getNomUrl($db) : '';
+                print '</td>';
+            }
+
+            if (! empty($arrayfields['l.date_delivery']['checked']))
+            {
+                // Date received
+                print '<td align="center">';
+                print dol_print_date($db->jdate($obj->date_reception),"day");
+                print '</td>'."\n";
+            }
+        }
+
+        // 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['e.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['e.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['e.fk_statut']['checked']))
+        {
+            print '<td align="right" class="nowrap">'.$shipment->LibStatut($obj->fk_statut,5).'</td>';
+            if (! $i) $totalarray['nbfield']++;
+        }
+        // Billed
+        if (! empty($arrayfields['e.billed']['checked']))
+        {
+            print '<td align="center">'.yn($obj->billed).'</td>';
+            if (! $i) $totalarray['nbfield']++;
+        }
+
+        // Action column
+        print '<td></td>';
+        if (! $i) $totalarray['nbfield']++;
+
+        print "</tr>\n";
+
+        $i++;
+    }
+
+    print "</table>";
+    print "</div>";
+    print '</form>';
+    $db->free($resql);
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 // End of page

Spacing +210 added lines, -210 removed lines

@@ -31,43 +31,43 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("sendings","deliveries",'companies','bills'));
+$langs->loadLangs(array("sendings", "deliveries", 'companies', 'bills'));
 
-$contextpage= GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'shipmentlist';   // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'shipmentlist'; // To manage different context of search
 
-$socid=GETPOST('socid','int');
+$socid = GETPOST('socid', 'int');
 // Security check
-$expeditionid = GETPOST('id','int');
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'expedition',$expeditionid,'');
+$expeditionid = GETPOST('id', 'int');
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'expedition', $expeditionid, '');
 
-$diroutputmassaction=$conf->expedition->dir_output . '/temp/massgeneration/'.$user->id;
+$diroutputmassaction = $conf->expedition->dir_output.'/temp/massgeneration/'.$user->id;
 
 $search_ref_exp = GETPOST("search_ref_exp", 'alpha');
 $search_ref_liv = GETPOST('search_ref_liv', 'alpha');
 $search_ref_customer = GETPOST('search_ref_customer', 'alpha');
 $search_company = GETPOST("search_company", 'alpha');
-$search_town=GETPOST('search_town','alpha');
-$search_zip=GETPOST('search_zip','alpha');
-$search_state=trim(GETPOST("search_state"));
-$search_country=GETPOST("search_country",'int');
-$search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
-$search_billed=GETPOST("search_billed",'int');
-$sall = trim((GETPOST('search_all', 'alphanohtml')!='')?GETPOST('search_all', 'alphanohtml'):GETPOST('sall', 'alphanohtml'));
-$optioncss = GETPOST('optioncss','alpha');
-
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
-if (! $sortfield) $sortfield="e.ref";
-if (! $sortorder) $sortorder="DESC";
+$search_town = GETPOST('search_town', 'alpha');
+$search_zip = GETPOST('search_zip', 'alpha');
+$search_state = trim(GETPOST("search_state"));
+$search_country = GETPOST("search_country", 'int');
+$search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
+$search_billed = GETPOST("search_billed", 'int');
+$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$optioncss = GETPOST('optioncss', 'alpha');
+
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
+$page = GETPOST('page', 'int');
+if (!$sortfield) $sortfield = "e.ref";
+if (!$sortorder) $sortorder = "DESC";
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-$viewstatut=GETPOST('viewstatut');
+$viewstatut = GETPOST('viewstatut');
 
 $object = new Expedition($db);
 
@@ -77,7 +77,7 @@ 
 
 // fetch optionals attributes and labels
 $extralabels = $extrafields->fetch_name_optionals_label('expedition');
-$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
@@ -85,10 +85,10 @@ 
 	's.nom'=>"ThirdParty",
 	'e.note_public'=>'NotePublic',
 );
-if (empty($user->socid)) $fieldstosearchall["e.note_private"]="NotePrivate";
+if (empty($user->socid)) $fieldstosearchall["e.note_private"] = "NotePrivate";
 
-$checkedtypetiers=0;
-$arrayfields=array(
+$checkedtypetiers = 0;
+$arrayfields = array(
 	'e.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
 	'e.ref_customer'=>array('label'=>$langs->trans("RefCustomer"), 'checked'=>1),
 	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
@@ -101,17 +101,17 @@ 
 	'e.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
 	'e.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
 	'e.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
-	'l.ref'=>array('label'=>$langs->trans("DeliveryRef"), 'checked'=>1, 'enabled'=>(empty($conf->livraison_bon->enabled)?0:1)),
-	'l.date_delivery'=>array('label'=>$langs->trans("DateReceived"), 'checked'=>1, 'enabled'=>(empty($conf->livraison_bon->enabled)?0:1)),
+	'l.ref'=>array('label'=>$langs->trans("DeliveryRef"), 'checked'=>1, 'enabled'=>(empty($conf->livraison_bon->enabled) ? 0 : 1)),
+	'l.date_delivery'=>array('label'=>$langs->trans("DateReceived"), 'checked'=>1, 'enabled'=>(empty($conf->livraison_bon->enabled) ? 0 : 1)),
 	'e.billed'=>array('label'=>$langs->trans("Billed"), 'checked'=>1, 'position'=>1000, 'enabled'=>(!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)))
 );
 
 // 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]));
 	}
 }
 
@@ -120,46 +120,46 @@ 
  * Actions
  */
 
-if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction','alpha')) { $massaction=''; }
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha')) { $massaction = ''; }
 
-$parameters=array('socid'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('socid'=>$socid);
+$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');
 
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // 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_ref_exp='';
-	$search_ref_liv='';
-	$search_ref_customer='';
-	$search_company='';
-	$search_town='';
-	$search_zip="";
-	$search_state="";
-	$search_type='';
-	$search_country='';
-	$search_type_thirdparty='';
-	$search_billed='';
-	$viewstatut='';
-	$search_array_options=array();
+	$search_ref_exp = '';
+	$search_ref_liv = '';
+	$search_ref_customer = '';
+	$search_company = '';
+	$search_town = '';
+	$search_zip = "";
+	$search_state = "";
+	$search_type = '';
+	$search_country = '';
+	$search_type_thirdparty = '';
+	$search_billed = '';
+	$viewstatut = '';
+	$search_array_options = array();
 }
 
 if (empty($reshook))
 {
 	// Mass actions. Controls on number of lines checked
-	$maxformassaction=1000;
-	$numtoselect = (is_array($toselect)?count($toselect):0);
-	if (! empty($massaction) && $numtoselect < 1)
+	$maxformassaction = 1000;
+	$numtoselect = (is_array($toselect) ?count($toselect) : 0);
+	if (!empty($massaction) && $numtoselect < 1)
 	{
 		$error++;
 		setEventMessages($langs->trans("NoLineChecked"), null, "warnings");
 	}
-	if (! $error && $numtoselect > $maxformassaction)
+	if (!$error && $numtoselect > $maxformassaction)
 	{
-		setEventMessages($langs->trans('TooManyRecordForMassAction',$maxformassaction), null, 'errors');
+		setEventMessages($langs->trans('TooManyRecordForMassAction', $maxformassaction), null, 'errors');
 		$error++;
 	}
 }
@@ -171,55 +171,55 @@ 
  * View
  */
 
-$form=new Form($db);
-$companystatic=new Societe($db);
-$shipment=new Expedition($db);
-$formcompany=new FormCompany($db);
+$form = new Form($db);
+$companystatic = new Societe($db);
+$shipment = new Expedition($db);
+$formcompany = new FormCompany($db);
 
-$helpurl='EN:Module_Shipments|FR:Module_Exp&eacute;ditions|ES:M&oacute;dulo_Expediciones';
-llxHeader('',$langs->trans('ListOfSendings'),$helpurl);
+$helpurl = 'EN:Module_Shipments|FR:Module_Exp&eacute;ditions|ES:M&oacute;dulo_Expediciones';
+llxHeader('', $langs->trans('ListOfSendings'), $helpurl);
 
 $sql = "SELECT e.rowid, e.ref, e.ref_customer, e.date_expedition as date_expedition, e.date_delivery as date_livraison, l.date_delivery as date_reception, e.fk_statut, e.billed,";
-$sql.= ' s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';
-$sql.= " typent.code as typent_code,";
-$sql.= " state.code_departement as state_code, state.nom as state_name,";
-$sql.= ' e.date_creation as date_creation, e.tms as date_update';
+$sql .= ' s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';
+$sql .= " typent.code as typent_code,";
+$sql .= " state.code_departement as state_code, state.nom as state_name,";
+$sql .= ' e.date_creation as date_creation, e.tms as date_update';
 // 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."expedition as e";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expedition_extrafields as ef on (e.rowid = ef.fk_object)";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-$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."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'shipping' AND ee.targettype = 'delivery'";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.rowid = ee.fk_target";
+$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."expedition as e";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expedition_extrafields as ef on (e.rowid = ef.fk_object)";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
+$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."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'shipping' AND ee.targettype = 'delivery'";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.rowid = ee.fk_target";
 if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
 {
-	$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
-$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
+$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
 if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
 {
-	$sql.= " AND e.fk_soc = sc.fk_soc";
-	$sql.= " AND sc.fk_user = " .$user->id;
+	$sql .= " AND e.fk_soc = sc.fk_soc";
+	$sql .= " AND sc.fk_user = ".$user->id;
 }
 if ($socid)
 {
-	$sql.= " AND e.fk_soc = ".$socid;
+	$sql .= " AND e.fk_soc = ".$socid;
 }
 if ($viewstatut <> '' && $viewstatut >= 0) {
-	$sql.= " AND e.fk_statut = ".$viewstatut;
+	$sql .= " AND e.fk_statut = ".$viewstatut;
 }
-if ($search_ref_customer != '') $sql.=natural_search('e.ref_customer', $search_ref_customer);
-if ($search_billed != '' && $search_billed >= 0) $sql.=' AND e.billed = '.$search_billed;
-if ($search_town)  $sql.= natural_search('s.town', $search_town);
-if ($search_zip)   $sql.= natural_search("s.zip",$search_zip);
-if ($search_state) $sql.= natural_search("state.nom",$search_state);
+if ($search_ref_customer != '') $sql .= natural_search('e.ref_customer', $search_ref_customer);
+if ($search_billed != '' && $search_billed >= 0) $sql .= ' AND e.billed = '.$search_billed;
+if ($search_town)  $sql .= natural_search('s.town', $search_town);
+if ($search_zip)   $sql .= natural_search("s.zip", $search_zip);
+if ($search_state) $sql .= natural_search("state.nom", $search_state);
 if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
 if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
 if ($search_ref_exp) $sql .= natural_search('e.ref', $search_ref_exp);
@@ -231,11 +231,11 @@ 
 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);
 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -249,39 +249,39 @@ 
 	}
 }
 
-$sql.= $db->plimit($limit + 1,$offset);
+$sql .= $db->plimit($limit + 1, $offset);
 
 //print $sql;
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
 
 	$expedition = new Expedition($db);
 
-	$param='';
-	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-	if ($sall) $param.= "&amp;sall=".urlencode($sall);
-	if ($search_ref_exp)  $param.= "&amp;search_ref_exp=".urlencode($search_ref_exp);
-	if ($search_ref_liv)  $param.= "&amp;search_ref_liv=".urlencode($search_ref_liv);
-	if ($search_ref_customer) $param.= "&amp;search_ref_customer=".urlencode($search_ref_customer);
-	if ($search_company)   $param.= "&amp;search_company=".urlencode($search_company);
-	if ($search_town)      $param.= '&search_town='.urlencode($search_town);
-	if ($search_zip)       $param.= '&search_zip='.urlencode($search_zip);
-	if ($viewstatut != '') $param.= '&viewstatut='.urlencode($viewstatut);
-	if ($optioncss != '')  $param.='&amp;optioncss='.urlencode($optioncss);
+	$param = '';
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if ($sall) $param .= "&amp;sall=".urlencode($sall);
+	if ($search_ref_exp)  $param .= "&amp;search_ref_exp=".urlencode($search_ref_exp);
+	if ($search_ref_liv)  $param .= "&amp;search_ref_liv=".urlencode($search_ref_liv);
+	if ($search_ref_customer) $param .= "&amp;search_ref_customer=".urlencode($search_ref_customer);
+	if ($search_company)   $param .= "&amp;search_company=".urlencode($search_company);
+	if ($search_town)      $param .= '&search_town='.urlencode($search_town);
+	if ($search_zip)       $param .= '&search_zip='.urlencode($search_zip);
+	if ($viewstatut != '') $param .= '&viewstatut='.urlencode($viewstatut);
+	if ($optioncss != '')  $param .= '&amp;optioncss='.urlencode($optioncss);
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 	//$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
 
-	$newcardbutton='';
+	$newcardbutton = '';
 	if ($user->rights->expedition->creer)
 	{
-		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/expedition/card.php?action=create2"><span class="valignmiddle">'.$langs->trans('NewSending').'</span>';
-		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-		$newcardbutton.= '</a>';
+		$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/expedition/card.php?action=create2"><span class="valignmiddle">'.$langs->trans('NewSending').'</span>';
+		$newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton .= '</a>';
 	}
 
 	$i = 0;
@@ -294,92 +294,92 @@ 
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-	print_barre_liste($langs->trans('ListOfSendings'), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit);
+	print_barre_liste($langs->trans('ListOfSendings'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit);
 
 	if ($sall)
 	{
-		foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
+		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 	}
 
-	$moreforfilter='';
-	if (! empty($moreforfilter))
+	$moreforfilter = '';
+	if (!empty($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
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
 	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// Lignes des champs de filtre
 	print '<tr class="liste_titre_filter">';
 	// Ref
-	if (! empty($arrayfields['e.ref']['checked']))
+	if (!empty($arrayfields['e.ref']['checked']))
 	{
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="6" type="text" name="search_ref_exp" value="'.$search_ref_exp.'">';
 		print '</td>';
 	}
 	// Ref customer
-	if (! empty($arrayfields['e.ref_customer']['checked']))
+	if (!empty($arrayfields['e.ref_customer']['checked']))
 	{
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="6" type="text" name="search_ref_customer" value="'.$search_ref_customer.'">';
 		print '</td>';
 	}
 	// Thirdparty
-	if (! empty($arrayfields['s.nom']['checked']))
+	if (!empty($arrayfields['s.nom']['checked']))
 	{
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat" type="text" size="8" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
 		print '</td>';
 	}
 	// Town
-	if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
+	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
 	// Zip
-	if (! empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_zip" value="'.$search_zip.'"></td>';
+	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_zip" value="'.$search_zip.'"></td>';
 	// State
-	if (! empty($arrayfields['state.nom']['checked']))
+	if (!empty($arrayfields['state.nom']['checked']))
 	{
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
 		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>';
 	}
 	// Date delivery planned
-	if (! empty($arrayfields['e.date_delivery']['checked']))
+	if (!empty($arrayfields['e.date_delivery']['checked']))
 	{
 		print '<td class="liste_titre">&nbsp;</td>';
 	}
-	if (! empty($arrayfields['l.ref']['checked']))
+	if (!empty($arrayfields['l.ref']['checked']))
 	{
 		// Delivery ref
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="10" type="text" name="search_ref_liv" value="'.$search_ref_liv.'"';
 		print '</td>';
 	}
-	if (! empty($arrayfields['l.date_delivery']['checked']))
+	if (!empty($arrayfields['l.date_delivery']['checked']))
 	{
 		// Date received
 		print '<td class="liste_titre">&nbsp;</td>';
@@ -388,30 +388,30 @@ 
 	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['e.datec']['checked']))
+	if (!empty($arrayfields['e.datec']['checked']))
 	{
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Date modification
-	if (! empty($arrayfields['e.tms']['checked']))
+	if (!empty($arrayfields['e.tms']['checked']))
 	{
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Status
-	if (! empty($arrayfields['e.fk_statut']['checked']))
+	if (!empty($arrayfields['e.fk_statut']['checked']))
 	{
 		print '<td class="liste_titre maxwidthonsmartphone" align="right">';
-		print $form->selectarray('viewstatut', array('0'=>$langs->trans('StatusSendingDraftShort'),'1'=>$langs->trans('StatusSendingValidatedShort'),'2'=>$langs->trans('StatusSendingProcessedShort')),$viewstatut,1);
+		print $form->selectarray('viewstatut', array('0'=>$langs->trans('StatusSendingDraftShort'), '1'=>$langs->trans('StatusSendingValidatedShort'), '2'=>$langs->trans('StatusSendingProcessedShort')), $viewstatut, 1);
 		print '</td>';
 	}
 	// Status billed
-	if (! empty($arrayfields['e.billed']['checked']))
+	if (!empty($arrayfields['e.billed']['checked']))
 	{
 		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
 		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1);
@@ -419,136 +419,136 @@ 
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
 	print $searchpicto;
 	print '</td>';
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
-	if (! empty($arrayfields['e.ref']['checked']))            print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"],"e.ref","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.ref_customer']['checked']))   print_liste_field_titre($arrayfields['e.ref_customer']['label'], $_SERVER["PHP_SELF"],"e.ref_customer","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"],"s.nom", "", $param,'align="left"',$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['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['e.date_delivery']['checked']))  print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"],"e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['l.ref']['checked']))            print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"],"l.ref","",$param, '',$sortfield,$sortorder);
-	if (! empty($arrayfields['l.date_delivery']['checked']))  print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"],"l.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
+	if (!empty($arrayfields['e.ref']['checked']))            print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['e.ref_customer']['checked']))   print_liste_field_titre($arrayfields['e.ref_customer']['label'], $_SERVER["PHP_SELF"], "e.ref_customer", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, 'align="left"', $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['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['e.date_delivery']['checked']))  print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"], "e.date_delivery", "", $param, 'align="center"', $sortfield, $sortorder);
+	if (!empty($arrayfields['l.ref']['checked']))            print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"], "l.ref", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['l.date_delivery']['checked']))  print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"], "l.date_delivery", "", $param, 'align="center"', $sortfield, $sortorder);
 	// 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($arrayfields["ef.".$key]['checked']))
+			if (!empty($arrayfields["ef.".$key]['checked']))
 			{
-				$align=$extrafields->getAlignFlag($key);
+				$align = $extrafields->getAlignFlag($key);
 				$sortonfield = "ef.".$key;
-				if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
-				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+				if (!empty($extrafields->attribute_computed[$key])) $sortonfield = '';
+				print_liste_field_titre($extralabels[$key], $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align ? 'align="'.$align.'"' : ''), $sortfield, $sortorder);
 			}
 		}
 	}
 	// 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['e.datec']['checked']))  print_liste_field_titre($arrayfields['e.datec']['label'],$_SERVER["PHP_SELF"],"e.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.tms']['checked']))    print_liste_field_titre($arrayfields['e.tms']['label'],$_SERVER["PHP_SELF"],"e.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.fk_statut']['checked'])) print_liste_field_titre($arrayfields['e.fk_statut']['label'],$_SERVER["PHP_SELF"],"e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.billed']['checked'])) print_liste_field_titre($arrayfields['e.billed']['label'],$_SERVER["PHP_SELF"],"e.billed","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
+	if (!empty($arrayfields['e.datec']['checked']))  print_liste_field_titre($arrayfields['e.datec']['label'], $_SERVER["PHP_SELF"], "e.date_creation", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+	if (!empty($arrayfields['e.tms']['checked']))    print_liste_field_titre($arrayfields['e.tms']['label'], $_SERVER["PHP_SELF"], "e.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+	if (!empty($arrayfields['e.fk_statut']['checked'])) print_liste_field_titre($arrayfields['e.fk_statut']['label'], $_SERVER["PHP_SELF"], "e.fk_statut", "", $param, 'align="right"', $sortfield, $sortorder);
+	if (!empty($arrayfields['e.billed']['checked'])) print_liste_field_titre($arrayfields['e.billed']['label'], $_SERVER["PHP_SELF"], "e.billed", "", $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();
-	while ($i < min($num,$limit))
+	$i = 0;
+	$totalarray = array();
+	while ($i < min($num, $limit))
 	{
 		$obj = $db->fetch_object($resql);
 
-		$shipment->id=$obj->rowid;
-		$shipment->ref=$obj->ref;
+		$shipment->id = $obj->rowid;
+		$shipment->ref = $obj->ref;
 
-		$companystatic->id=$obj->socid;
-		$companystatic->ref=$obj->name;
-		$companystatic->name=$obj->name;
+		$companystatic->id = $obj->socid;
+		$companystatic->ref = $obj->name;
+		$companystatic->name = $obj->name;
 
 
 		print '<tr class="oddeven">';
 
 		// Ref
-		if (! empty($arrayfields['e.ref']['checked']))
+		if (!empty($arrayfields['e.ref']['checked']))
 		{
 			print "<td>";
 			print $shipment->getNomUrl(1);
 			print "</td>\n";
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Ref customer
-		if (! empty($arrayfields['e.ref_customer']['checked']))
+		if (!empty($arrayfields['e.ref_customer']['checked']))
 		{
 			print "<td>";
 			print $obj->ref_customer;
 			print "</td>\n";
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Third party
-		if (! empty($arrayfields['s.nom']['checked']))
+		if (!empty($arrayfields['s.nom']['checked']))
 		{
 			print '<td>';
 			print $companystatic->getNomUrl(1);
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Town
-		if (! empty($arrayfields['s.town']['checked']))
+		if (!empty($arrayfields['s.town']['checked']))
 		{
 			print '<td class="nocellnopadd">';
 			print $obj->town;
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Zip
-		if (! empty($arrayfields['s.zip']['checked']))
+		if (!empty($arrayfields['s.zip']['checked']))
 		{
 			print '<td class="nocellnopadd">';
 			print $obj->zip;
 			print '</td>';
-			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']++;
 		}
 		// 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 (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
+			if (count($typenArray) == 0) $typenArray = $formcompany->typent_array(1);
 			print $typenArray[$obj->typent_code];
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Date delivery planed
-		if (! empty($arrayfields['e.date_delivery']['checked']))
+		if (!empty($arrayfields['e.date_delivery']['checked']))
 		{
 			print '<td align="center">';
-			print dol_print_date($db->jdate($obj->date_livraison),"day");
+			print dol_print_date($db->jdate($obj->date_livraison), "day");
 			/*$now = time();
     		if ( ($now - $db->jdate($obj->date_expedition)) > $conf->warnings->lim && $obj->statutid == 1 )
     		{
@@ -556,13 +556,13 @@ 
 			print "</td>\n";
 		}
 
-		if (! empty($arrayfields['l.ref']['checked']) || ! empty($arrayfields['l.date_delivery']['checked']))
+		if (!empty($arrayfields['l.ref']['checked']) || !empty($arrayfields['l.date_delivery']['checked']))
 		{
-			$shipment->fetchObjectLinked($shipment->id,$shipment->element);
-			$receiving='';
-			if (is_array($shipment->linkedObjects['delivery']) && count($shipment->linkedObjects['delivery']) > 0) $receiving=reset($shipment->linkedObjects['delivery']);
+			$shipment->fetchObjectLinked($shipment->id, $shipment->element);
+			$receiving = '';
+			if (is_array($shipment->linkedObjects['delivery']) && count($shipment->linkedObjects['delivery']) > 0) $receiving = reset($shipment->linkedObjects['delivery']);
 
-			if (! empty($arrayfields['l.ref']['checked']))
+			if (!empty($arrayfields['l.ref']['checked']))
 			{
 				// Ref
 				print '<td>';
@@ -570,11 +570,11 @@ 
 				print '</td>';
 			}
 
-			if (! empty($arrayfields['l.date_delivery']['checked']))
+			if (!empty($arrayfields['l.date_delivery']['checked']))
 			{
 				// Date received
 				print '<td align="center">';
-				print dol_print_date($db->jdate($obj->date_reception),"day");
+				print dol_print_date($db->jdate($obj->date_reception), "day");
 				print '</td>'."\n";
 			}
 		}
@@ -582,41 +582,41 @@ 
 		// 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['e.datec']['checked']))
+		if (!empty($arrayfields['e.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['e.tms']['checked']))
+		if (!empty($arrayfields['e.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['e.fk_statut']['checked']))
+		if (!empty($arrayfields['e.fk_statut']['checked']))
 		{
-			print '<td align="right" class="nowrap">'.$shipment->LibStatut($obj->fk_statut,5).'</td>';
-			if (! $i) $totalarray['nbfield']++;
+			print '<td align="right" class="nowrap">'.$shipment->LibStatut($obj->fk_statut, 5).'</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Billed
-		if (! empty($arrayfields['e.billed']['checked']))
+		if (!empty($arrayfields['e.billed']['checked']))
 		{
 			print '<td align="center">'.yn($obj->billed).'</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Action column
 		print '<td></td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 
 		print "</tr>\n";
 

Braces +208 added lines, -71 removed lines

@@ -38,7 +38,9 @@ 
 $socid=GETPOST('socid','int');
 // Security check
 $expeditionid = GETPOST('id','int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'expedition',$expeditionid,'');
 
 $diroutputmassaction=$conf->expedition->dir_output . '/temp/massgeneration/'.$user->id;
@@ -60,8 +62,12 @@ 
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if (! $sortfield) $sortfield="e.ref";
-if (! $sortorder) $sortorder="DESC";
+if (! $sortfield) {
+    $sortfield="e.ref";
+}
+if (! $sortorder) {
+    $sortorder="DESC";
+}
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
@@ -85,7 +91,9 @@ 
 	's.nom'=>"ThirdParty",
 	'e.note_public'=>'NotePublic',
 );
-if (empty($user->socid)) $fieldstosearchall["e.note_private"]="NotePrivate";
+if (empty($user->socid)) {
+    $fieldstosearchall["e.note_private"]="NotePrivate";
+}
 
 $checkedtypetiers=0;
 $arrayfields=array(
@@ -111,7 +119,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]));
+		}
 	}
 }
 
@@ -125,14 +135,18 @@ 
 
 $parameters=array('socid'=>$socid);
 $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');
+}
 
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // 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_ref_exp='';
+}
 	$search_ref_liv='';
 	$search_ref_customer='';
 	$search_company='';
@@ -185,27 +199,35 @@ 
 $sql.= " state.code_departement as state_code, state.nom as state_name,";
 $sql.= ' e.date_creation as date_creation, e.tms as date_update';
 // 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."expedition as e";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expedition_extrafields as ef on (e.rowid = ef.fk_object)";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expedition_extrafields as ef on (e.rowid = ef.fk_object)";
+}
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
 $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."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'shipping' AND ee.targettype = 'delivery'";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.rowid = ee.fk_target";
-if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
+if (!$user->rights->societe->client->voir && !$socid) {
+    // Internal user with no permission to see all
 {
 	$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
+}
 $sql.= " WHERE e.entity IN (".getEntity('expedition').")";
-if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
+if (!$user->rights->societe->client->voir && !$socid) {
+    // Internal user with no permission to see all
 {
 	$sql.= " AND e.fk_soc = sc.fk_soc";
+}
 	$sql.= " AND sc.fk_user = " .$user->id;
 }
 if ($socid)
@@ -215,17 +237,39 @@ 
 if ($viewstatut <> '' && $viewstatut >= 0) {
 	$sql.= " AND e.fk_statut = ".$viewstatut;
 }
-if ($search_ref_customer != '') $sql.=natural_search('e.ref_customer', $search_ref_customer);
-if ($search_billed != '' && $search_billed >= 0) $sql.=' AND e.billed = '.$search_billed;
-if ($search_town)  $sql.= natural_search('s.town', $search_town);
-if ($search_zip)   $sql.= natural_search("s.zip",$search_zip);
-if ($search_state) $sql.= natural_search("state.nom",$search_state);
-if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
-if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
-if ($search_ref_exp) $sql .= natural_search('e.ref', $search_ref_exp);
-if ($search_ref_liv) $sql .= natural_search('l.ref', $search_ref_liv);
-if ($search_company) $sql .= natural_search('s.nom', $search_company);
-if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
+if ($search_ref_customer != '') {
+    $sql.=natural_search('e.ref_customer', $search_ref_customer);
+}
+if ($search_billed != '' && $search_billed >= 0) {
+    $sql.=' AND e.billed = '.$search_billed;
+}
+if ($search_town) {
+    $sql.= natural_search('s.town', $search_town);
+}
+if ($search_zip) {
+    $sql.= natural_search("s.zip",$search_zip);
+}
+if ($search_state) {
+    $sql.= natural_search("state.nom",$search_state);
+}
+if ($search_country) {
+    $sql .= " AND s.fk_pays IN (".$search_country.')';
+}
+if ($search_type_thirdparty) {
+    $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
+}
+if ($search_ref_exp) {
+    $sql .= natural_search('e.ref', $search_ref_exp);
+}
+if ($search_ref_liv) {
+    $sql .= natural_search('l.ref', $search_ref_liv);
+}
+if ($search_company) {
+    $sql .= natural_search('s.nom', $search_company);
+}
+if ($sall) {
+    $sql .= natural_search(array_keys($fieldstosearchall), $sall);
+}
 
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -242,9 +286,11 @@ 
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {
+	    // if total resultset is smaller then paging size (filtering), goto and load page 0
 	{
 		$page = 0;
+	}
 		$offset = 0;
 	}
 }
@@ -260,17 +306,39 @@ 
 	$expedition = new Expedition($db);
 
 	$param='';
-	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-	if ($sall) $param.= "&amp;sall=".urlencode($sall);
-	if ($search_ref_exp)  $param.= "&amp;search_ref_exp=".urlencode($search_ref_exp);
-	if ($search_ref_liv)  $param.= "&amp;search_ref_liv=".urlencode($search_ref_liv);
-	if ($search_ref_customer) $param.= "&amp;search_ref_customer=".urlencode($search_ref_customer);
-	if ($search_company)   $param.= "&amp;search_company=".urlencode($search_company);
-	if ($search_town)      $param.= '&search_town='.urlencode($search_town);
-	if ($search_zip)       $param.= '&search_zip='.urlencode($search_zip);
-	if ($viewstatut != '') $param.= '&viewstatut='.urlencode($viewstatut);
-	if ($optioncss != '')  $param.='&amp;optioncss='.urlencode($optioncss);
+	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	    $param.='&contextpage='.urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+	    $param.='&limit='.urlencode($limit);
+	}
+	if ($sall) {
+	    $param.= "&amp;sall=".urlencode($sall);
+	}
+	if ($search_ref_exp) {
+	    $param.= "&amp;search_ref_exp=".urlencode($search_ref_exp);
+	}
+	if ($search_ref_liv) {
+	    $param.= "&amp;search_ref_liv=".urlencode($search_ref_liv);
+	}
+	if ($search_ref_customer) {
+	    $param.= "&amp;search_ref_customer=".urlencode($search_ref_customer);
+	}
+	if ($search_company) {
+	    $param.= "&amp;search_company=".urlencode($search_company);
+	}
+	if ($search_town) {
+	    $param.= '&search_town='.urlencode($search_town);
+	}
+	if ($search_zip) {
+	    $param.= '&search_zip='.urlencode($search_zip);
+	}
+	if ($viewstatut != '') {
+	    $param.= '&viewstatut='.urlencode($viewstatut);
+	}
+	if ($optioncss != '') {
+	    $param.='&amp;optioncss='.urlencode($optioncss);
+	}
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -286,7 +354,9 @@ 
 
 	$i = 0;
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-	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="action" value="list">';
@@ -298,7 +368,9 @@ 
 
 	if ($sall)
 	{
-		foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+		foreach($fieldstosearchall as $key => $val) {
+		    $fieldstosearchall[$key]=$langs->trans($val);
+		}
 		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
 	}
 
@@ -343,9 +415,13 @@ 
 		print '</td>';
 	}
 	// Town
-	if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
+	if (! empty($arrayfields['s.town']['checked'])) {
+	    print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
+	}
 	// Zip
-	if (! empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_zip" value="'.$search_zip.'"></td>';
+	if (! empty($arrayfields['s.zip']['checked'])) {
+	    print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_zip" value="'.$search_zip.'"></td>';
+	}
 	// State
 	if (! empty($arrayfields['state.nom']['checked']))
 	{
@@ -425,17 +501,39 @@ 
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
-	if (! empty($arrayfields['e.ref']['checked']))            print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"],"e.ref","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.ref_customer']['checked']))   print_liste_field_titre($arrayfields['e.ref_customer']['label'], $_SERVER["PHP_SELF"],"e.ref_customer","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"],"s.nom", "", $param,'align="left"',$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['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['e.date_delivery']['checked']))  print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"],"e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['l.ref']['checked']))            print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"],"l.ref","",$param, '',$sortfield,$sortorder);
-	if (! empty($arrayfields['l.date_delivery']['checked']))  print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"],"l.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['e.ref']['checked'])) {
+	    print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"],"e.ref","",$param,'',$sortfield,$sortorder);
+	}
+	if (! empty($arrayfields['e.ref_customer']['checked'])) {
+	    print_liste_field_titre($arrayfields['e.ref_customer']['label'], $_SERVER["PHP_SELF"],"e.ref_customer","",$param,'',$sortfield,$sortorder);
+	}
+	if (! empty($arrayfields['s.nom']['checked'])) {
+	    print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"],"s.nom", "", $param,'align="left"',$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['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['e.date_delivery']['checked'])) {
+	    print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"],"e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
+	}
+	if (! empty($arrayfields['l.ref']['checked'])) {
+	    print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"],"l.ref","",$param, '',$sortfield,$sortorder);
+	}
+	if (! empty($arrayfields['l.date_delivery']['checked'])) {
+	    print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"],"l.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
+	}
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
@@ -445,7 +543,9 @@ 
 			{
 				$align=$extrafields->getAlignFlag($key);
 				$sortonfield = "ef.".$key;
-				if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+				if (! empty($extrafields->attribute_computed[$key])) {
+				    $sortonfield='';
+				}
 				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
 			}
 		}
@@ -454,10 +554,18 @@ 
 	$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['e.datec']['checked']))  print_liste_field_titre($arrayfields['e.datec']['label'],$_SERVER["PHP_SELF"],"e.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.tms']['checked']))    print_liste_field_titre($arrayfields['e.tms']['label'],$_SERVER["PHP_SELF"],"e.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.fk_statut']['checked'])) print_liste_field_titre($arrayfields['e.fk_statut']['label'],$_SERVER["PHP_SELF"],"e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.billed']['checked'])) print_liste_field_titre($arrayfields['e.billed']['label'],$_SERVER["PHP_SELF"],"e.billed","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['e.datec']['checked'])) {
+	    print_liste_field_titre($arrayfields['e.datec']['label'],$_SERVER["PHP_SELF"],"e.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	}
+	if (! empty($arrayfields['e.tms']['checked'])) {
+	    print_liste_field_titre($arrayfields['e.tms']['label'],$_SERVER["PHP_SELF"],"e.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	}
+	if (! empty($arrayfields['e.fk_statut']['checked'])) {
+	    print_liste_field_titre($arrayfields['e.fk_statut']['label'],$_SERVER["PHP_SELF"],"e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
+	}
+	if (! empty($arrayfields['e.billed']['checked'])) {
+	    print_liste_field_titre($arrayfields['e.billed']['label'],$_SERVER["PHP_SELF"],"e.billed","",$param,'align="center"',$sortfield,$sortorder);
+	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
@@ -483,7 +591,9 @@ 
 			print "<td>";
 			print $shipment->getNomUrl(1);
 			print "</td>\n";
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 		}
 
 		// Ref customer
@@ -492,7 +602,9 @@ 
 			print "<td>";
 			print $obj->ref_customer;
 			print "</td>\n";
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 		}
 
 		// Third party
@@ -501,7 +613,9 @@ 
 			print '<td>';
 			print $companystatic->getNomUrl(1);
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 		}
 		// Town
 		if (! empty($arrayfields['s.town']['checked']))
@@ -509,7 +623,9 @@ 
 			print '<td class="nocellnopadd">';
 			print $obj->town;
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 		}
 		// Zip
 		if (! empty($arrayfields['s.zip']['checked']))
@@ -517,13 +633,17 @@ 
 			print '<td class="nocellnopadd">';
 			print $obj->zip;
 			print '</td>';
-			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']++;
+			}
 		}
 		// Country
 		if (! empty($arrayfields['country.code_iso']['checked']))
@@ -532,16 +652,22 @@ 
 			$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 (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
+			if (count($typenArray)==0) {
+			    $typenArray = $formcompany->typent_array(1);
+			}
 			print $typenArray[$obj->typent_code];
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 		}
 
 		// Date delivery planed
@@ -560,7 +686,9 @@ 
 		{
 			$shipment->fetchObjectLinked($shipment->id,$shipment->element);
 			$receiving='';
-			if (is_array($shipment->linkedObjects['delivery']) && count($shipment->linkedObjects['delivery']) > 0) $receiving=reset($shipment->linkedObjects['delivery']);
+			if (is_array($shipment->linkedObjects['delivery']) && count($shipment->linkedObjects['delivery']) > 0) {
+			    $receiving=reset($shipment->linkedObjects['delivery']);
+			}
 
 			if (! empty($arrayfields['l.ref']['checked']))
 			{
@@ -591,7 +719,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['e.tms']['checked']))
@@ -599,24 +729,32 @@ 
 			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['e.fk_statut']['checked']))
 		{
 			print '<td align="right" class="nowrap">'.$shipment->LibStatut($obj->fk_statut,5).'</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 		}
 		// Billed
 		if (! empty($arrayfields['e.billed']['checked']))
 		{
 			print '<td align="center">'.yn($obj->billed).'</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 		}
 
 		// Action column
 		print '<td></td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 
 		print "</tr>\n";
 
@@ -627,8 +765,7 @@ 
 	print "</div>";
 	print '</form>';
 	$db->free($resql);
-}
-else
+} else
 {
 	dol_print_error($db);
 }

dolibarr/htdocs/expedition/stats/month.php

Indentation +2 added lines, -2 removed lines

@@ -61,8 +61,8 @@
     $px->SetHeight($HEIGHT);
     $px->SetYLabel($langs->trans("NbOfOrders"));
     $px->SetShading(3);
-	$px->SetHorizTickIncrement(1);
-	$px->SetPrecisionY(0);
+    $px->SetHorizTickIncrement(1);
+    $px->SetPrecisionY(0);
     $px->draw($filename,$fileurl);
 }
 

Spacing +4 added lines, -4 removed lines

@@ -36,8 +36,8 @@ 
 
 llxHeader();
 
-$WIDTH=DolGraph::getDefaultGraphSizeForStats('width');
-$HEIGHT=DolGraph::getDefaultGraphSizeForStats('height');
+$WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
+$HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
 $mesg = '';
 
@@ -53,7 +53,7 @@ 
 
 $px = new DolGraph();
 $mesg = $px->isGraphKo();
-if (! $mesg)
+if (!$mesg)
 {
     $px->SetData($data);
     $px->SetMaxValue($px->GetCeilMaxValue());
@@ -63,7 +63,7 @@ 
     $px->SetShading(3);
 	$px->SetHorizTickIncrement(1);
 	$px->SetPrecisionY(0);
-    $px->draw($filename,$fileurl);
+    $px->draw($filename, $fileurl);
 }
 
 print '<table class="border" width="100%">';

dolibarr/htdocs/expedition/stats/index.php

Indentation +50 added lines, -50 removed lines

@@ -205,9 +205,9 @@ 
 $data = $stats->getAllByYear();
 $arrayyears=array();
 foreach($data as $val) {
-	if (! empty($val['year'])) {
-		$arrayyears[$val['year']]=$val['year'];
-	}
+    if (! empty($val['year'])) {
+        $arrayyears[$val['year']]=$val['year'];
+    }
 }
 if (! count($arrayyears)) $arrayyears[$nowyear]=$nowyear;
 
@@ -230,33 +230,33 @@ 
 
 //if (empty($socid))
 //{
-	// Show filter box
-	print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="mode" value="'.$mode.'">';
-
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
-	// Company
-	print '<tr><td align="left">'.$langs->trans("ThirdParty").'</td><td align="left">';
-	if ($mode == 'customer') $filter='s.client in (1,2,3)';
-	if ($mode == 'supplier') $filter='s.fournisseur = 1';
-	print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"');
-	print '</td></tr>';
-	// User
-	print '<tr><td align="left">'.$langs->trans("CreatedBy").'</td><td align="left">';
-	print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-	print '</td></tr>';
-	// Year
-	print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">';
-	if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
-	if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
-	arsort($arrayyears);
-	print $form->selectarray('year',$arrayyears,$year,0);
-	print '</td></tr>';
-	print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
-	print '</table>';
-	print '</form>';
-	print '<br><br>';
+    // Show filter box
+    print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+    print '<input type="hidden" name="mode" value="'.$mode.'">';
+
+    print '<table class="noborder" width="100%">';
+    print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
+    // Company
+    print '<tr><td align="left">'.$langs->trans("ThirdParty").'</td><td align="left">';
+    if ($mode == 'customer') $filter='s.client in (1,2,3)';
+    if ($mode == 'supplier') $filter='s.fournisseur = 1';
+    print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"');
+    print '</td></tr>';
+    // User
+    print '<tr><td align="left">'.$langs->trans("CreatedBy").'</td><td align="left">';
+    print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+    print '</td></tr>';
+    // Year
+    print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">';
+    if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
+    if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
+    arsort($arrayyears);
+    print $form->selectarray('year',$arrayyears,$year,0);
+    print '</td></tr>';
+    print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
+    print '</table>';
+    print '</form>';
+    print '<br><br>';
 //}
 
 
@@ -272,31 +272,31 @@ 
 $oldyear=0;
 foreach ($data as $val)
 {
-	$year = $val['year'];
-	while (! empty($year) && $oldyear > $year+1)
-	{ // If we have empty year
-		$oldyear--;
+    $year = $val['year'];
+    while (! empty($year) && $oldyear > $year+1)
+    { // If we have empty year
+        $oldyear--;
 
 
-		print '<tr class="oddeven" height="24">';
-		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.'">'.$oldyear.'</a></td>';
+        print '<tr class="oddeven" height="24">';
+        print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.'">'.$oldyear.'</a></td>';
 
-		print '<td align="right">0</td>';
-		/*print '<td align="right">0</td>';
+        print '<td align="right">0</td>';
+        /*print '<td align="right">0</td>';
 		print '<td align="right">0</td>';*/
-		print '</tr>';
-	}
-
-	print '<tr class="oddeven" height="24">';
-	print '<td align="center">';
-	if ($year) print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.'">'.$year.'</a>';
-	else print $langs->trans("ValidationDateNotDefinedEvenIfShipmentValidated");
-	print '</td>';
-	print '<td align="right">'.$val['nb'].'</td>';
-	/*print '<td align="right">'.price(price2num($val['total'],'MT'),1).'</td>';
+        print '</tr>';
+    }
+
+    print '<tr class="oddeven" height="24">';
+    print '<td align="center">';
+    if ($year) print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.'">'.$year.'</a>';
+    else print $langs->trans("ValidationDateNotDefinedEvenIfShipmentValidated");
+    print '</td>';
+    print '<td align="right">'.$val['nb'].'</td>';
+    /*print '<td align="right">'.price(price2num($val['total'],'MT'),1).'</td>';
 	print '<td align="right">'.price(price2num($val['avg'],'MT'),1).'</td>';*/
-	print '</tr>';
-	$oldyear=$year;
+    print '</tr>';
+    $oldyear=$year;
 }
 
 print '</table>';

Spacing +35 added lines, -35 removed lines

@@ -28,11 +28,11 @@ 
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionstats.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 
-$WIDTH=DolGraph::getDefaultGraphSizeForStats('width');
-$HEIGHT=DolGraph::getDefaultGraphSizeForStats('height');
+$WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
+$HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
-$userid=GETPOST('userid','int');
-$socid=GETPOST('socid','int');
+$userid = GETPOST('userid', 'int');
+$socid = GETPOST('socid', 'int');
 // Security check
 if ($user->societe_id > 0)
 {
@@ -40,11 +40,11 @@ 
     $socid = $user->societe_id;
 }
 
-$nowyear=strftime("%Y", dol_now());
-$year = GETPOST('year')>0?GETPOST('year'):$nowyear;
+$nowyear = strftime("%Y", dol_now());
+$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
 //$startyear=$year-2;
-$startyear=$year-1;
-$endyear=$year;
+$startyear = $year - 1;
+$endyear = $year;
 
 // Load translation files required by the page
 $langs->loadLangs(array('sendings', 'other', 'companies'));
@@ -54,7 +54,7 @@ 
  * View
  */
 
-$form=new Form($db);
+$form = new Form($db);
 
 llxHeader();
 
@@ -63,10 +63,10 @@ 
 
 dol_mkdir($dir);
 
-$stats = new ExpeditionStats($db, $socid, $mode, ($userid>0?$userid:0));
+$stats = new ExpeditionStats($db, $socid, $mode, ($userid > 0 ? $userid : 0));
 
 // Build graphic number of object
-$data = $stats->getNbByMonthWithPrevYear($endyear,$startyear);
+$data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 //var_dump($data);exit;
 // $data = array(array('Lib',val1,val2,val3),...)
 
@@ -86,29 +86,29 @@ 
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
-if (! $mesg)
+if (!$mesg)
 {
     $px1->SetData($data);
     $px1->SetPrecisionY(0);
-    $i=$startyear;$legend=array();
+    $i = $startyear; $legend = array();
     while ($i <= $endyear)
     {
-        $legend[]=$i;
+        $legend[] = $i;
         $i++;
     }
     $px1->SetLegend($legend);
     $px1->SetMaxValue($px1->GetCeilMaxValue());
-    $px1->SetMinValue(min(0,$px1->GetFloorMinValue()));
+    $px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
     $px1->SetWidth($WIDTH);
     $px1->SetHeight($HEIGHT);
     $px1->SetYLabel($langs->trans("NbOfSendings"));
     $px1->SetShading(3);
     $px1->SetHorizTickIncrement(1);
     $px1->SetPrecisionY(0);
-    $px1->mode='depth';
+    $px1->mode = 'depth';
     $px1->SetTitle($langs->trans("NumberOfShipmentsByMonth"));
 
-    $px1->draw($filenamenb,$fileurlnb);
+    $px1->draw($filenamenb, $fileurlnb);
 }
 
 // Build graphic amount of object
@@ -203,24 +203,24 @@ 
 
 // Show array
 $data = $stats->getAllByYear();
-$arrayyears=array();
-foreach($data as $val) {
-	if (! empty($val['year'])) {
-		$arrayyears[$val['year']]=$val['year'];
+$arrayyears = array();
+foreach ($data as $val) {
+	if (!empty($val['year'])) {
+		$arrayyears[$val['year']] = $val['year'];
 	}
 }
-if (! count($arrayyears)) $arrayyears[$nowyear]=$nowyear;
+if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
 
-$h=0;
+$h = 0;
 $head = array();
-$head[$h][0] = DOL_URL_ROOT . '/expedition/stats/index.php?mode='.$mode;
+$head[$h][0] = DOL_URL_ROOT.'/expedition/stats/index.php?mode='.$mode;
 $head[$h][1] = $langs->trans("ByMonthYear");
 $head[$h][2] = 'byyear';
 $h++;
 
-$type='shipment_stats';
+$type = 'shipment_stats';
 
-complete_head_from_modules($conf,$langs,null,$head,$h,$type);
+complete_head_from_modules($conf, $langs, null, $head, $h, $type);
 
 dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
@@ -238,9 +238,9 @@ 
 	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 	// Company
 	print '<tr><td align="left">'.$langs->trans("ThirdParty").'</td><td align="left">';
-	if ($mode == 'customer') $filter='s.client in (1,2,3)';
-	if ($mode == 'supplier') $filter='s.fournisseur = 1';
-	print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"');
+	if ($mode == 'customer') $filter = 's.client in (1,2,3)';
+	if ($mode == 'supplier') $filter = 's.fournisseur = 1';
+	print $form->select_company($socid, 'socid', $filter, 1, 0, 0, array(), 0, '', 'style="width: 95%"');
 	print '</td></tr>';
 	// User
 	print '<tr><td align="left">'.$langs->trans("CreatedBy").'</td><td align="left">';
@@ -248,10 +248,10 @@ 
 	print '</td></tr>';
 	// Year
 	print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">';
-	if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
-	if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
+	if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
+	if (!in_array($nowyear, $arrayyears)) $arrayyears[$nowyear] = $nowyear;
 	arsort($arrayyears);
-	print $form->selectarray('year',$arrayyears,$year,0);
+	print $form->selectarray('year', $arrayyears, $year, 0);
 	print '</td></tr>';
 	print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
 	print '</table>';
@@ -269,11 +269,11 @@ 
 print '<td align="center">'.$langs->trans("AmountAverage").'</td>';*/
 print '</tr>';
 
-$oldyear=0;
+$oldyear = 0;
 foreach ($data as $val)
 {
 	$year = $val['year'];
-	while (! empty($year) && $oldyear > $year+1)
+	while (!empty($year) && $oldyear > $year + 1)
 	{ // If we have empty year
 		$oldyear--;
 
@@ -296,7 +296,7 @@ 
 	/*print '<td align="right">'.price(price2num($val['total'],'MT'),1).'</td>';
 	print '<td align="right">'.price(price2num($val['avg'],'MT'),1).'</td>';*/
 	print '</tr>';
-	$oldyear=$year;
+	$oldyear = $year;
 }
 
 print '</table>';

Braces +35 added lines, -16 removed lines

@@ -74,15 +74,22 @@ 
 if (!$user->rights->societe->client->voir || $user->societe_id)
 {
     $filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstats&file=shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstatssupplier&file=shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
-}
-else
+    if ($mode == 'customer') {
+        $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstats&file=shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
+    }
+    if ($mode == 'supplier') {
+        $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstatssupplier&file=shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
+    }
+    } else
 {
     $filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
-    if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstats&file=shipmentsnbinyear-'.$year.'.png';
-    if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstatssupplier&file=shipmentsnbinyear-'.$year.'.png';
-}
+    if ($mode == 'customer') {
+        $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstats&file=shipmentsnbinyear-'.$year.'.png';
+    }
+    if ($mode == 'supplier') {
+        $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstatssupplier&file=shipmentsnbinyear-'.$year.'.png';
+    }
+    }
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
@@ -209,7 +216,9 @@ 
 		$arrayyears[$val['year']]=$val['year'];
 	}
 }
-if (! count($arrayyears)) $arrayyears[$nowyear]=$nowyear;
+if (! count($arrayyears)) {
+    $arrayyears[$nowyear]=$nowyear;
+}
 
 $h=0;
 $head = array();
@@ -238,8 +247,12 @@ 
 	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 	// Company
 	print '<tr><td align="left">'.$langs->trans("ThirdParty").'</td><td align="left">';
-	if ($mode == 'customer') $filter='s.client in (1,2,3)';
-	if ($mode == 'supplier') $filter='s.fournisseur = 1';
+	if ($mode == 'customer') {
+	    $filter='s.client in (1,2,3)';
+	}
+	if ($mode == 'supplier') {
+	    $filter='s.fournisseur = 1';
+	}
 	print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"');
 	print '</td></tr>';
 	// User
@@ -248,8 +261,12 @@ 
 	print '</td></tr>';
 	// Year
 	print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">';
-	if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
-	if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
+	if (! in_array($year,$arrayyears)) {
+	    $arrayyears[$year]=$year;
+	}
+	if (! in_array($nowyear,$arrayyears)) {
+	    $arrayyears[$nowyear]=$nowyear;
+	}
 	arsort($arrayyears);
 	print $form->selectarray('year',$arrayyears,$year,0);
 	print '</td></tr>';
@@ -289,8 +306,11 @@ 
 
 	print '<tr class="oddeven" height="24">';
 	print '<td align="center">';
-	if ($year) print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.'">'.$year.'</a>';
-	else print $langs->trans("ValidationDateNotDefinedEvenIfShipmentValidated");
+	if ($year) {
+	    print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.'">'.$year.'</a>';
+	} else {
+	    print $langs->trans("ValidationDateNotDefinedEvenIfShipmentValidated");
+	}
 	print '</td>';
 	print '<td align="right">'.$val['nb'].'</td>';
 	/*print '<td align="right">'.price(price2num($val['total'],'MT'),1).'</td>';
@@ -308,8 +328,7 @@ 
 
 // Show graphs
 print '<table class="border" width="100%"><tr class="pair nohover"><td align="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     /*print $px2->show();

dolibarr/htdocs/societe/class/companypaymentmode.class.php

Indentation +495 added lines, -495 removed lines

@@ -32,279 +32,279 @@ 
  */
 class CompanyPaymentMode extends CommonObject
 {
-	/**
-	 * @var string ID to identify managed object
-	 */
-	public $element = 'companypaymentmode';
-
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element = 'societe_rib';
-
-	/**
-	 * @var int  Does companypaymentmode support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	 */
-	public $ismultientitymanaged = 2;
-
-	/**
-	 * @var int  Does companypaymentmode support extrafields ? 0=No, 1=Yes
-	 */
-	public $isextrafieldmanaged = 0;
-
-	/**
-	 * @var string String with name of icon for companypaymentmode. Must be the part after the 'object_' into object_companypaymentmode.png
-	 */
-	public $picto = 'generic';
-
-
-	/**
-	 *  'type' if the field format.
-	 *  'label' the translation key.
-	 *  'enabled' is a condition when the field must be managed.
-	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing)
-	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
-	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
-	 *  'position' is the sort order of field.
-	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
-	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-	 *  'help' is a string visible as a tooltip on field
-	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
-	 *  'default' is a default value for creation (can still be replaced by the global setup of default values)
-	 *  'showoncombobox' if field must be shown into the label of combobox
-	 */
-
-	// BEGIN MODULEBUILDER PROPERTIES
-	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
-	 */
-	public $fields=array(
-		'rowid' =>array('type'=>'integer', 'label'=>'Rowid', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>10),
-		'fk_soc' =>array('type'=>'integer', 'label'=>'Fk soc', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>15),
-		'label' =>array('type'=>'varchar(30)', 'label'=>'Label', 'enabled'=>1, 'visible'=>-2, 'position'=>30),
-		'bank' =>array('type'=>'varchar(255)', 'label'=>'Bank', 'enabled'=>1, 'visible'=>-2, 'position'=>35),
-		'code_banque' =>array('type'=>'varchar(128)', 'label'=>'Code banque', 'enabled'=>1, 'visible'=>-2, 'position'=>40),
-		'code_guichet' =>array('type'=>'varchar(6)', 'label'=>'Code guichet', 'enabled'=>1, 'visible'=>-2, 'position'=>45),
-		'number' =>array('type'=>'varchar(255)', 'label'=>'Number', 'enabled'=>1, 'visible'=>-2, 'position'=>50),
-		'cle_rib' =>array('type'=>'varchar(5)', 'label'=>'Cle rib', 'enabled'=>1, 'visible'=>-2, 'position'=>55),
-		'bic' =>array('type'=>'varchar(20)', 'label'=>'Bic', 'enabled'=>1, 'visible'=>-2, 'position'=>60),
-		'iban_prefix' =>array('type'=>'varchar(34)', 'label'=>'Iban prefix', 'enabled'=>1, 'visible'=>-2, 'position'=>65),
-		'domiciliation' =>array('type'=>'varchar(255)', 'label'=>'Domiciliation', 'enabled'=>1, 'visible'=>-2, 'position'=>70),
-		'proprio' =>array('type'=>'varchar(60)', 'label'=>'Proprio', 'enabled'=>1, 'visible'=>-2, 'position'=>75),
-		'owner_address' =>array('type'=>'text', 'label'=>'Owner address', 'enabled'=>1, 'visible'=>-2, 'position'=>80),
-		'default_rib' =>array('type'=>'tinyint(4)', 'label'=>'Default rib', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>85),
-		'rum' =>array('type'=>'varchar(32)', 'label'=>'Rum', 'enabled'=>1, 'visible'=>-2, 'position'=>90),
-		'date_rum' =>array('type'=>'date', 'label'=>'Date rum', 'enabled'=>1, 'visible'=>-2, 'position'=>95),
-		'frstrecur' =>array('type'=>'varchar(16)', 'label'=>'Frstrecur', 'enabled'=>1, 'visible'=>-2, 'position'=>100),
-		'type' =>array('type'=>'varchar(32)', 'label'=>'Type', 'enabled'=>1, 'visible'=>-2, 'position'=>110),
-		'last_four' =>array('type'=>'varchar(4)', 'label'=>'Last four', 'enabled'=>1, 'visible'=>-2, 'position'=>115),
-		'card_type' =>array('type'=>'varchar(255)', 'label'=>'Card type', 'enabled'=>1, 'visible'=>-2, 'position'=>120),
-		'cvn' =>array('type'=>'varchar(255)', 'label'=>'Cvn', 'enabled'=>1, 'visible'=>-2, 'position'=>125),
-		'exp_date_month' =>array('type'=>'integer', 'label'=>'Exp date month', 'enabled'=>1, 'visible'=>-2, 'position'=>130),
-		'exp_date_year' =>array('type'=>'integer', 'label'=>'Exp date year', 'enabled'=>1, 'visible'=>-2, 'position'=>135),
-		'country_code' =>array('type'=>'varchar(10)', 'label'=>'Country code', 'enabled'=>1, 'visible'=>-2, 'position'=>140),
-		'approved' =>array('type'=>'integer', 'label'=>'Approved', 'enabled'=>1, 'visible'=>-2, 'position'=>145),
-		'email' =>array('type'=>'varchar(255)', 'label'=>'Email', 'enabled'=>1, 'visible'=>-2, 'position'=>150),
-		'max_total_amount_of_all_payments' =>array('type'=>'double(24,8)', 'label'=>'Max total amount of all payments', 'enabled'=>1, 'visible'=>-2, 'position'=>155),
-		'preapproval_key' =>array('type'=>'varchar(255)', 'label'=>'Preapproval key', 'enabled'=>1, 'visible'=>-2, 'position'=>160),
-		'total_amount_of_all_payments' =>array('type'=>'double(24,8)', 'label'=>'Total amount of all payments', 'enabled'=>1, 'visible'=>-2, 'position'=>165),
-		'stripe_card_ref' =>array('type'=>'varchar(128)', 'label'=>'Stripe card ref', 'enabled'=>1, 'visible'=>-2, 'position'=>170),
-		'status' =>array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>175),
-		'starting_date' =>array('type'=>'date', 'label'=>'Starting date', 'enabled'=>1, 'visible'=>-2, 'position'=>180),
-		'ending_date' =>array('type'=>'date', 'label'=>'Ending date', 'enabled'=>1, 'visible'=>-2, 'position'=>185),
-		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>20),
-		'tms' =>array('type'=>'timestamp', 'label'=>'Tms', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>25),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'Import key', 'enabled'=>1, 'visible'=>-2, 'position'=>105),
-	//'aaa' =>array('type'=>'date', 'label'=>'Ending date', 'enabled'=>0, 'visible'=>-2, 'position'=>185),
-	);
-
-	/**
-	 * @var int ID
-	 */
-	public $rowid;
-
-	/**
-	 * @var int Thirdparty ID
-	 */
+    /**
+     * @var string ID to identify managed object
+     */
+    public $element = 'companypaymentmode';
+
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element = 'societe_rib';
+
+    /**
+     * @var int  Does companypaymentmode support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+     */
+    public $ismultientitymanaged = 2;
+
+    /**
+     * @var int  Does companypaymentmode support extrafields ? 0=No, 1=Yes
+     */
+    public $isextrafieldmanaged = 0;
+
+    /**
+     * @var string String with name of icon for companypaymentmode. Must be the part after the 'object_' into object_companypaymentmode.png
+     */
+    public $picto = 'generic';
+
+
+    /**
+     *  'type' if the field format.
+     *  'label' the translation key.
+     *  'enabled' is a condition when the field must be managed.
+     *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing)
+     *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+     *  'index' if we want an index in database.
+     *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+     *  'position' is the sort order of field.
+     *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+     *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+     *  'help' is a string visible as a tooltip on field
+     *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+     *  'default' is a default value for creation (can still be replaced by the global setup of default values)
+     *  'showoncombobox' if field must be shown into the label of combobox
+     */
+
+    // BEGIN MODULEBUILDER PROPERTIES
+    /**
+     * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+     */
+    public $fields=array(
+        'rowid' =>array('type'=>'integer', 'label'=>'Rowid', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>10),
+        'fk_soc' =>array('type'=>'integer', 'label'=>'Fk soc', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>15),
+        'label' =>array('type'=>'varchar(30)', 'label'=>'Label', 'enabled'=>1, 'visible'=>-2, 'position'=>30),
+        'bank' =>array('type'=>'varchar(255)', 'label'=>'Bank', 'enabled'=>1, 'visible'=>-2, 'position'=>35),
+        'code_banque' =>array('type'=>'varchar(128)', 'label'=>'Code banque', 'enabled'=>1, 'visible'=>-2, 'position'=>40),
+        'code_guichet' =>array('type'=>'varchar(6)', 'label'=>'Code guichet', 'enabled'=>1, 'visible'=>-2, 'position'=>45),
+        'number' =>array('type'=>'varchar(255)', 'label'=>'Number', 'enabled'=>1, 'visible'=>-2, 'position'=>50),
+        'cle_rib' =>array('type'=>'varchar(5)', 'label'=>'Cle rib', 'enabled'=>1, 'visible'=>-2, 'position'=>55),
+        'bic' =>array('type'=>'varchar(20)', 'label'=>'Bic', 'enabled'=>1, 'visible'=>-2, 'position'=>60),
+        'iban_prefix' =>array('type'=>'varchar(34)', 'label'=>'Iban prefix', 'enabled'=>1, 'visible'=>-2, 'position'=>65),
+        'domiciliation' =>array('type'=>'varchar(255)', 'label'=>'Domiciliation', 'enabled'=>1, 'visible'=>-2, 'position'=>70),
+        'proprio' =>array('type'=>'varchar(60)', 'label'=>'Proprio', 'enabled'=>1, 'visible'=>-2, 'position'=>75),
+        'owner_address' =>array('type'=>'text', 'label'=>'Owner address', 'enabled'=>1, 'visible'=>-2, 'position'=>80),
+        'default_rib' =>array('type'=>'tinyint(4)', 'label'=>'Default rib', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>85),
+        'rum' =>array('type'=>'varchar(32)', 'label'=>'Rum', 'enabled'=>1, 'visible'=>-2, 'position'=>90),
+        'date_rum' =>array('type'=>'date', 'label'=>'Date rum', 'enabled'=>1, 'visible'=>-2, 'position'=>95),
+        'frstrecur' =>array('type'=>'varchar(16)', 'label'=>'Frstrecur', 'enabled'=>1, 'visible'=>-2, 'position'=>100),
+        'type' =>array('type'=>'varchar(32)', 'label'=>'Type', 'enabled'=>1, 'visible'=>-2, 'position'=>110),
+        'last_four' =>array('type'=>'varchar(4)', 'label'=>'Last four', 'enabled'=>1, 'visible'=>-2, 'position'=>115),
+        'card_type' =>array('type'=>'varchar(255)', 'label'=>'Card type', 'enabled'=>1, 'visible'=>-2, 'position'=>120),
+        'cvn' =>array('type'=>'varchar(255)', 'label'=>'Cvn', 'enabled'=>1, 'visible'=>-2, 'position'=>125),
+        'exp_date_month' =>array('type'=>'integer', 'label'=>'Exp date month', 'enabled'=>1, 'visible'=>-2, 'position'=>130),
+        'exp_date_year' =>array('type'=>'integer', 'label'=>'Exp date year', 'enabled'=>1, 'visible'=>-2, 'position'=>135),
+        'country_code' =>array('type'=>'varchar(10)', 'label'=>'Country code', 'enabled'=>1, 'visible'=>-2, 'position'=>140),
+        'approved' =>array('type'=>'integer', 'label'=>'Approved', 'enabled'=>1, 'visible'=>-2, 'position'=>145),
+        'email' =>array('type'=>'varchar(255)', 'label'=>'Email', 'enabled'=>1, 'visible'=>-2, 'position'=>150),
+        'max_total_amount_of_all_payments' =>array('type'=>'double(24,8)', 'label'=>'Max total amount of all payments', 'enabled'=>1, 'visible'=>-2, 'position'=>155),
+        'preapproval_key' =>array('type'=>'varchar(255)', 'label'=>'Preapproval key', 'enabled'=>1, 'visible'=>-2, 'position'=>160),
+        'total_amount_of_all_payments' =>array('type'=>'double(24,8)', 'label'=>'Total amount of all payments', 'enabled'=>1, 'visible'=>-2, 'position'=>165),
+        'stripe_card_ref' =>array('type'=>'varchar(128)', 'label'=>'Stripe card ref', 'enabled'=>1, 'visible'=>-2, 'position'=>170),
+        'status' =>array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>175),
+        'starting_date' =>array('type'=>'date', 'label'=>'Starting date', 'enabled'=>1, 'visible'=>-2, 'position'=>180),
+        'ending_date' =>array('type'=>'date', 'label'=>'Ending date', 'enabled'=>1, 'visible'=>-2, 'position'=>185),
+        'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>20),
+        'tms' =>array('type'=>'timestamp', 'label'=>'Tms', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>25),
+        'import_key' =>array('type'=>'varchar(14)', 'label'=>'Import key', 'enabled'=>1, 'visible'=>-2, 'position'=>105),
+    //'aaa' =>array('type'=>'date', 'label'=>'Ending date', 'enabled'=>0, 'visible'=>-2, 'position'=>185),
+    );
+
+    /**
+     * @var int ID
+     */
+    public $rowid;
+
+    /**
+     * @var int Thirdparty ID
+     */
     public $fk_soc;
 
-	/**
+    /**
      * @var string company payment mode label
      */
     public $label;
 
-	public $bank;
-	public $code_banque;
-	public $code_guichet;
-	public $number;
-	public $cle_rib;
-	public $bic;
-	public $iban_prefix;
-	public $domiciliation;
-	public $proprio;
-	public $owner_address;
-	public $default_rib;
-	public $rum;
-	public $date_rum;
-	public $frstrecur;
-	public $type;
-	public $last_four;
-	public $card_type;
-	public $cvn;
-	public $exp_date_month;
-	public $exp_date_year;
-	public $country_code;
-	public $approved;
-	public $email;
-	public $max_total_amount_of_all_payments;
-	public $preapproval_key;
-	public $total_amount_of_all_payments;
-	public $stripe_card_ref;
-
-	/**
-	 * @var int Status
-	 */
-	public $status;
-
-	public $starting_date;
-	public $ending_date;
-	public $datec;
-	public $tms;
-	public $import_key;
-	// END MODULEBUILDER PROPERTIES
-
-
-
-	// If this object has a subtable with lines
-
-	/**
-	 * @var int    Name of subtable line
-	 */
-	//public $table_element_line = 'companypaymentmodedet';
-	/**
-	 * @var int    Field with ID of parent key if this field has a parent
-	 */
-	//public $fk_element = 'fk_companypaymentmode';
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
-	//public $class_element_line = 'CompanyPaymentModeline';
-	/**
-	 * @var array  Array of child tables (child tables to delete before deleting a record)
-	 */
-	//protected $childtables=array('companypaymentmodedet');
-	/**
-	 * @var CompanyPaymentModeLine[]     Array of subtable lines
-	 */
-	//public $lines = array();
-
-
-
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDb $db Database handler
-	 */
-	public function __construct(DoliDB $db)
-	{
-		global $conf;
-
-		$this->db = $db;
-
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible']=0;
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled']=0;
-	}
-
-	/**
-	 * Create object into database
-	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
-	 */
-	public function create(User $user, $notrigger = false)
-	{
-		$idpayment =  $this->createCommon($user, $notrigger);
-
-		return $idpayment;
-	}
-
-	/**
-	 * Clone and object into another one
-	 *
-	 * @param  	User 	$user      	User that creates
-	 * @param  	int 	$fromid     Id of object to clone
-	 * @return 	mixed 				New object created, <0 if KO
-	 */
-	public function createFromClone(User $user, $fromid)
-	{
-		global $hookmanager, $langs;
-	    $error = 0;
-
-	    dol_syslog(__METHOD__, LOG_DEBUG);
-
-	    $object = new self($this->db);
-
-	    $this->db->begin();
-
-	    // Load source object
-	    $object->fetchCommon($fromid);
-	    // Reset some properties
-	    unset($object->id);
-	    unset($object->fk_user_creat);
-	    unset($object->import_key);
-
-	    // Clear fields
-	    $object->ref = "copy_of_".$object->ref;
-	    $object->title = $langs->trans("CopyOf")." ".$object->title;
-	    // ...
-
-	    // Create clone
-		$object->context['createfromclone'] = 'createfromclone';
-	    $result = $object->createCommon($user);
-	    if ($result < 0) {
-	        $error++;
-	        $this->error = $object->error;
-	        $this->errors = $object->errors;
-	    }
-
-	    // End
-	    if (!$error) {
-	        $this->db->commit();
-	        return $object;
-	    } else {
-	        $this->db->rollback();
-	        return -1;
-	    }
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param 	int    	$id   	Id object
-	 * @param 	string 	$ref  	Ref
-	 * @param	int		$socid	Id of company to get first default payment mode
-	 * @param	string	$type	Filter on type ('ban', 'card', ...)
-	 * @return 	int         	<0 if KO, 0 if not found, >0 if OK
-	 */
-	public function fetch($id, $ref = null, $socid = 0, $type = '')
-	{
-		$morewhere = '';
-		if ($socid) $morewhere.= " AND fk_soc  = ".$this->db->escape($socid)." AND default_rib = 1";
-		if ($type)  $morewhere.= " AND type = '".$this->db->escape($type)."'";
-
-		$result = $this->fetchCommon($id, $ref, $morewhere);
-		if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
-		return $result;
-	}
-
-	/**
-	 * Load object lines in memory from the database
-	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
-	 */
-	/*public function fetchLines()
+    public $bank;
+    public $code_banque;
+    public $code_guichet;
+    public $number;
+    public $cle_rib;
+    public $bic;
+    public $iban_prefix;
+    public $domiciliation;
+    public $proprio;
+    public $owner_address;
+    public $default_rib;
+    public $rum;
+    public $date_rum;
+    public $frstrecur;
+    public $type;
+    public $last_four;
+    public $card_type;
+    public $cvn;
+    public $exp_date_month;
+    public $exp_date_year;
+    public $country_code;
+    public $approved;
+    public $email;
+    public $max_total_amount_of_all_payments;
+    public $preapproval_key;
+    public $total_amount_of_all_payments;
+    public $stripe_card_ref;
+
+    /**
+     * @var int Status
+     */
+    public $status;
+
+    public $starting_date;
+    public $ending_date;
+    public $datec;
+    public $tms;
+    public $import_key;
+    // END MODULEBUILDER PROPERTIES
+
+
+
+    // If this object has a subtable with lines
+
+    /**
+     * @var int    Name of subtable line
+     */
+    //public $table_element_line = 'companypaymentmodedet';
+    /**
+     * @var int    Field with ID of parent key if this field has a parent
+     */
+    //public $fk_element = 'fk_companypaymentmode';
+    /**
+     * @var int    Name of subtable class that manage subtable lines
+     */
+    //public $class_element_line = 'CompanyPaymentModeline';
+    /**
+     * @var array  Array of child tables (child tables to delete before deleting a record)
+     */
+    //protected $childtables=array('companypaymentmodedet');
+    /**
+     * @var CompanyPaymentModeLine[]     Array of subtable lines
+     */
+    //public $lines = array();
+
+
+
+    /**
+     * Constructor
+     *
+     * @param DoliDb $db Database handler
+     */
+    public function __construct(DoliDB $db)
+    {
+        global $conf;
+
+        $this->db = $db;
+
+        if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible']=0;
+        if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled']=0;
+    }
+
+    /**
+     * Create object into database
+     *
+     * @param  User $user      User that creates
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
+     * @return int             <0 if KO, Id of created object if OK
+     */
+    public function create(User $user, $notrigger = false)
+    {
+        $idpayment =  $this->createCommon($user, $notrigger);
+
+        return $idpayment;
+    }
+
+    /**
+     * Clone and object into another one
+     *
+     * @param  	User 	$user      	User that creates
+     * @param  	int 	$fromid     Id of object to clone
+     * @return 	mixed 				New object created, <0 if KO
+     */
+    public function createFromClone(User $user, $fromid)
+    {
+        global $hookmanager, $langs;
+        $error = 0;
+
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $object = new self($this->db);
+
+        $this->db->begin();
+
+        // Load source object
+        $object->fetchCommon($fromid);
+        // Reset some properties
+        unset($object->id);
+        unset($object->fk_user_creat);
+        unset($object->import_key);
+
+        // Clear fields
+        $object->ref = "copy_of_".$object->ref;
+        $object->title = $langs->trans("CopyOf")." ".$object->title;
+        // ...
+
+        // Create clone
+        $object->context['createfromclone'] = 'createfromclone';
+        $result = $object->createCommon($user);
+        if ($result < 0) {
+            $error++;
+            $this->error = $object->error;
+            $this->errors = $object->errors;
+        }
+
+        // End
+        if (!$error) {
+            $this->db->commit();
+            return $object;
+        } else {
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+    /**
+     * Load object in memory from the database
+     *
+     * @param 	int    	$id   	Id object
+     * @param 	string 	$ref  	Ref
+     * @param	int		$socid	Id of company to get first default payment mode
+     * @param	string	$type	Filter on type ('ban', 'card', ...)
+     * @return 	int         	<0 if KO, 0 if not found, >0 if OK
+     */
+    public function fetch($id, $ref = null, $socid = 0, $type = '')
+    {
+        $morewhere = '';
+        if ($socid) $morewhere.= " AND fk_soc  = ".$this->db->escape($socid)." AND default_rib = 1";
+        if ($type)  $morewhere.= " AND type = '".$this->db->escape($type)."'";
+
+        $result = $this->fetchCommon($id, $ref, $morewhere);
+        if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+        return $result;
+    }
+
+    /**
+     * Load object lines in memory from the database
+     *
+     * @return int         <0 if KO, 0 if not found, >0 if OK
+     */
+    /*public function fetchLines()
 	{
 		$this->lines=array();
 
@@ -313,43 +313,43 @@ 
 		return count($this->lines)?1:0;
 	}*/
 
-	/**
-	 * Update object into database
-	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
-	 */
-	public function update(User $user, $notrigger = false)
-	{
-		return $this->updateCommon($user, $notrigger);
-	}
-
-	/**
-	 * Delete object in database
-	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
-	 */
-	public function delete(User $user, $notrigger = false)
-	{
-		return $this->deleteCommon($user, $notrigger);
-	}
-
-	/**
-	 *  Return a link to the object card (with optionaly the picto)
-	 *
-	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-	 *	@param	string	$option						On what the link point to ('nolink', ...)
+    /**
+     * Update object into database
+     *
+     * @param  User $user      User that modifies
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
+     * @return int             <0 if KO, >0 if OK
+     */
+    public function update(User $user, $notrigger = false)
+    {
+        return $this->updateCommon($user, $notrigger);
+    }
+
+    /**
+     * Delete object in database
+     *
+     * @param User $user       User that deletes
+     * @param bool $notrigger  false=launch triggers after, true=disable triggers
+     * @return int             <0 if KO, >0 if OK
+     */
+    public function delete(User $user, $notrigger = false)
+    {
+        return $this->deleteCommon($user, $notrigger);
+    }
+
+    /**
+     *  Return a link to the object card (with optionaly the picto)
+     *
+     *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+     *	@param	string	$option						On what the link point to ('nolink', ...)
      *  @param	int  	$notooltip					1=Disable tooltip
      *  @param  string  $morecss            		Add more css on link
      *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-	 *	@return	string								String with URL
-	 */
-	function getNomUrl($withpicto=0, $option='', $notooltip=0, $morecss='', $save_lastsearch_value=-1)
-	{
-		global $db, $conf, $langs;
+     *	@return	string								String with URL
+     */
+    function getNomUrl($withpicto=0, $option='', $notooltip=0, $morecss='', $save_lastsearch_value=-1)
+    {
+        global $db, $conf, $langs;
         global $dolibarr_main_authentication, $dolibarr_main_demo;
         global $menumanager;
 
@@ -366,10 +366,10 @@ 
 
         if ($option != 'nolink')
         {
-	        // Add param to save lastsearch_values or not
-	        $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-	        if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+            // Add param to save lastsearch_values or not
+            $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+            if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+            if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
         }
 
         $linkclose='';
@@ -385,197 +385,197 @@ 
         }
         else $linkclose = ($morecss?' class="'.$morecss.'"':'');
 
-		$linkstart = '<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
-
-		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= $this->ref;
-		$result .= $linkend;
-		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
-
-		return $result;
-	}
-
-	/**
-	 * Set a Payment mode as Default
-	 *
-	 * @param   int     $id    		Payment mode ID
-	 * @param	string	$alltypes	1=The default is for all payment types instead of per type
-	 * @return  int             	0 if KO, 1 if OK
-	 */
-	function setAsDefault($id=0, $alltypes=0)
-	{
-		$sql1 = "SELECT rowid as id, fk_soc, type FROM ".MAIN_DB_PREFIX."societe_rib";
-		$sql1.= " WHERE rowid = ".($id?$id:$this->id);
-
-		dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
-		$result1 = $this->db->query($sql1);
-		if ($result1)
-		{
-			if ($this->db->num_rows($result1) == 0)
-			{
-				return 0;
-			}
-			else
-			{
-				$obj = $this->db->fetch_object($result1);
-
-				$type = '';
-				if (empty($alltypes)) $type = $obj->type;
-
-				$this->db->begin();
-
-				$sql2 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 0";
-				$sql2.= " WHERE default_rib <> 0 AND fk_soc = ".$obj->fk_soc;
-				if ($type) $sql2.= " AND type = '".$this->db->escape($type)."'";
-				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
-				$result2 = $this->db->query($sql2);
-
-				$sql3 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 1";
-				$sql3.= " WHERE rowid = ".$obj->id;
-				if ($type) $sql3.= " AND type = '".$this->db->escape($type)."'";
-				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
-				$result3 = $this->db->query($sql3);
-
-				if (!$result2 || !$result3)
-				{
-					dol_print_error($this->db);
-					$this->db->rollback();
-					return -1;
-				}
-				else
-				{
-					$this->db->commit();
-					return 1;
-				}
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
-
-	/**
-	 *  Retourne le libelle du status d'un user (actif, inactif)
-	 *
-	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *  @return	string 			       Label of status
-	 */
-	function getLibStatut($mode=0)
-	{
-		return $this->LibStatut($this->status,$mode);
-	}
+        $linkstart = '<a href="'.$url.'"';
+        $linkstart.=$linkclose.'>';
+        $linkend='</a>';
+
+        $result .= $linkstart;
+        if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+        if ($withpicto != 2) $result.= $this->ref;
+        $result .= $linkend;
+        //if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+
+        return $result;
+    }
+
+    /**
+     * Set a Payment mode as Default
+     *
+     * @param   int     $id    		Payment mode ID
+     * @param	string	$alltypes	1=The default is for all payment types instead of per type
+     * @return  int             	0 if KO, 1 if OK
+     */
+    function setAsDefault($id=0, $alltypes=0)
+    {
+        $sql1 = "SELECT rowid as id, fk_soc, type FROM ".MAIN_DB_PREFIX."societe_rib";
+        $sql1.= " WHERE rowid = ".($id?$id:$this->id);
+
+        dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
+        $result1 = $this->db->query($sql1);
+        if ($result1)
+        {
+            if ($this->db->num_rows($result1) == 0)
+            {
+                return 0;
+            }
+            else
+            {
+                $obj = $this->db->fetch_object($result1);
+
+                $type = '';
+                if (empty($alltypes)) $type = $obj->type;
+
+                $this->db->begin();
+
+                $sql2 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 0";
+                $sql2.= " WHERE default_rib <> 0 AND fk_soc = ".$obj->fk_soc;
+                if ($type) $sql2.= " AND type = '".$this->db->escape($type)."'";
+                dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
+                $result2 = $this->db->query($sql2);
+
+                $sql3 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 1";
+                $sql3.= " WHERE rowid = ".$obj->id;
+                if ($type) $sql3.= " AND type = '".$this->db->escape($type)."'";
+                dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
+                $result3 = $this->db->query($sql3);
+
+                if (!$result2 || !$result3)
+                {
+                    dol_print_error($this->db);
+                    $this->db->rollback();
+                    return -1;
+                }
+                else
+                {
+                    $this->db->commit();
+                    return 1;
+                }
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
+
+    /**
+     *  Retourne le libelle du status d'un user (actif, inactif)
+     *
+     *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+     *  @return	string 			       Label of status
+     */
+    function getLibStatut($mode=0)
+    {
+        return $this->LibStatut($this->status,$mode);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return the status
-	 *
-	 *  @param	int		$status        	Id status
-	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
-	 *  @return string 			       	Label of status
-	 */
-	static function LibStatut($status,$mode=0)
-	{
+    /**
+     *  Return the status
+     *
+     *  @param	int		$status        	Id status
+     *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+     *  @return string 			       	Label of status
+     */
+    static function LibStatut($status,$mode=0)
+    {
         // phpcs:enable
-		global $langs;
-
-		if ($mode == 0 || $mode == 1)
-		{
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
-		}
-		elseif ($mode == 4)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-		elseif ($mode == 6)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-	}
-
-	/**
-	 *	Charge les informations d'ordre info dans l'objet commande
-	 *
-	 *	@param  int		$id       Id of order
-	 *	@return	void
-	 */
-	function info($id)
-	{
-		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
-		$sql.= ' fk_user_creat, fk_user_modif';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		$sql.= ' WHERE t.rowid = '.$id;
-		$result=$this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
-				$obj = $this->db->fetch_object($result);
-				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation   = $cuser;
-				}
-
-				if ($obj->fk_user_valid)
-				{
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture)
-				{
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture   = $cluser;
-				}
-
-				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
-			}
-
-			$this->db->free($result);
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-	}
-
-	/**
-	 * Initialise object with example values
-	 * Id must be 0 if object instance is a specimen
-	 *
-	 * @return void
-	 */
-	public function initAsSpecimen()
-	{
-		$this->initAsSpecimenCommon();
-	}
+        global $langs;
+
+        if ($mode == 0 || $mode == 1)
+        {
+            if ($status == 1) return $langs->trans('Enabled');
+            if ($status == 0) return $langs->trans('Disabled');
+        }
+        elseif ($mode == 2)
+        {
+            if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+            if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+        }
+        elseif ($mode == 3)
+        {
+            if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
+            if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+        }
+        elseif ($mode == 4)
+        {
+            if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+            if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+        }
+        elseif ($mode == 5)
+        {
+            if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+            if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+        }
+        elseif ($mode == 6)
+        {
+            if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+            if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+        }
+    }
+
+    /**
+     *	Charge les informations d'ordre info dans l'objet commande
+     *
+     *	@param  int		$id       Id of order
+     *	@return	void
+     */
+    function info($id)
+    {
+        $sql = 'SELECT rowid, date_creation as datec, tms as datem,';
+        $sql.= ' fk_user_creat, fk_user_modif';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+        $sql.= ' WHERE t.rowid = '.$id;
+        $result=$this->db->query($sql);
+        if ($result)
+        {
+            if ($this->db->num_rows($result))
+            {
+                $obj = $this->db->fetch_object($result);
+                $this->id = $obj->rowid;
+                if ($obj->fk_user_author)
+                {
+                    $cuser = new User($this->db);
+                    $cuser->fetch($obj->fk_user_author);
+                    $this->user_creation   = $cuser;
+                }
+
+                if ($obj->fk_user_valid)
+                {
+                    $vuser = new User($this->db);
+                    $vuser->fetch($obj->fk_user_valid);
+                    $this->user_validation = $vuser;
+                }
+
+                if ($obj->fk_user_cloture)
+                {
+                    $cluser = new User($this->db);
+                    $cluser->fetch($obj->fk_user_cloture);
+                    $this->user_cloture   = $cluser;
+                }
+
+                $this->date_creation     = $this->db->jdate($obj->datec);
+                $this->date_modification = $this->db->jdate($obj->datem);
+                $this->date_validation   = $this->db->jdate($obj->datev);
+            }
+
+            $this->db->free($result);
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+    }
+
+    /**
+     * Initialise object with example values
+     * Id must be 0 if object instance is a specimen
+     *
+     * @return void
+     */
+    public function initAsSpecimen()
+    {
+        $this->initAsSpecimenCommon();
+    }
 }

Spacing +53 added lines, -53 removed lines

@@ -23,7 +23,7 @@ 
  */
 
 // Put here all includes required by your class file
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
@@ -79,7 +79,7 @@ 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
+	public $fields = array(
 		'rowid' =>array('type'=>'integer', 'label'=>'Rowid', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>10),
 		'fk_soc' =>array('type'=>'integer', 'label'=>'Fk soc', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>15),
 		'label' =>array('type'=>'varchar(30)', 'label'=>'Label', 'enabled'=>1, 'visible'=>-2, 'position'=>30),
@@ -212,8 +212,8 @@ 
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible']=0;
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled']=0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
 	}
 
 	/**
@@ -225,7 +225,7 @@ 
 	 */
 	public function create(User $user, $notrigger = false)
 	{
-		$idpayment =  $this->createCommon($user, $notrigger);
+		$idpayment = $this->createCommon($user, $notrigger);
 
 		return $idpayment;
 	}
@@ -291,11 +291,11 @@ 
 	public function fetch($id, $ref = null, $socid = 0, $type = '')
 	{
 		$morewhere = '';
-		if ($socid) $morewhere.= " AND fk_soc  = ".$this->db->escape($socid)." AND default_rib = 1";
-		if ($type)  $morewhere.= " AND type = '".$this->db->escape($type)."'";
+		if ($socid) $morewhere .= " AND fk_soc  = ".$this->db->escape($socid)." AND default_rib = 1";
+		if ($type)  $morewhere .= " AND type = '".$this->db->escape($type)."'";
 
 		$result = $this->fetchCommon($id, $ref, $morewhere);
-		if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
 		return $result;
 	}
 
@@ -347,51 +347,51 @@ 
      *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								String with URL
 	 */
-	function getNomUrl($withpicto=0, $option='', $notooltip=0, $morecss='', $save_lastsearch_value=-1)
+	function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
 	{
 		global $db, $conf, $langs;
         global $dolibarr_main_authentication, $dolibarr_main_demo;
         global $menumanager;
 
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
         $result = '';
         $companylink = '';
 
-        $label = '<u>' . $langs->trans("CompanyPaymentMode") . '</u>';
-        $label.= '<br>';
-        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+        $label = '<u>'.$langs->trans("CompanyPaymentMode").'</u>';
+        $label .= '<br>';
+        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $url = dol_buildpath('/monmodule/companypaymentmode_card.php',1).'?id='.$this->id;
+        $url = dol_buildpath('/monmodule/companypaymentmode_card.php', 1).'?id='.$this->id;
 
         if ($option != 'nolink')
         {
 	        // Add param to save lastsearch_values or not
-	        $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-	        if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+	        $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+	        if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
         }
 
-        $linkclose='';
+        $linkclose = '';
         if (empty($notooltip))
         {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
             {
-                $label=$langs->trans("ShowCompanyPaymentMode");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+                $label = $langs->trans("ShowCompanyPaymentMode");
+                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
             }
-            $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
         }
-        else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= $this->ref;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
@@ -405,10 +405,10 @@ 
 	 * @param	string	$alltypes	1=The default is for all payment types instead of per type
 	 * @return  int             	0 if KO, 1 if OK
 	 */
-	function setAsDefault($id=0, $alltypes=0)
+	function setAsDefault($id = 0, $alltypes = 0)
 	{
 		$sql1 = "SELECT rowid as id, fk_soc, type FROM ".MAIN_DB_PREFIX."societe_rib";
-		$sql1.= " WHERE rowid = ".($id?$id:$this->id);
+		$sql1 .= " WHERE rowid = ".($id ? $id : $this->id);
 
 		dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 		$result1 = $this->db->query($sql1);
@@ -428,14 +428,14 @@ 
 				$this->db->begin();
 
 				$sql2 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 0";
-				$sql2.= " WHERE default_rib <> 0 AND fk_soc = ".$obj->fk_soc;
-				if ($type) $sql2.= " AND type = '".$this->db->escape($type)."'";
+				$sql2 .= " WHERE default_rib <> 0 AND fk_soc = ".$obj->fk_soc;
+				if ($type) $sql2 .= " AND type = '".$this->db->escape($type)."'";
 				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 				$result2 = $this->db->query($sql2);
 
 				$sql3 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 1";
-				$sql3.= " WHERE rowid = ".$obj->id;
-				if ($type) $sql3.= " AND type = '".$this->db->escape($type)."'";
+				$sql3 .= " WHERE rowid = ".$obj->id;
+				if ($type) $sql3 .= " AND type = '".$this->db->escape($type)."'";
 				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 				$result3 = $this->db->query($sql3);
 
@@ -465,9 +465,9 @@ 
 	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return	string 			       Label of status
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->status,$mode);
+		return $this->LibStatut($this->status, $mode);
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -478,7 +478,7 @@ 
 	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
 	 *  @return string 			       	Label of status
 	 */
-	static function LibStatut($status,$mode=0)
+	static function LibStatut($status, $mode = 0)
 	{
         // phpcs:enable
 		global $langs;
@@ -490,28 +490,28 @@ 
 		}
 		elseif ($mode == 2)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
 		}
 		elseif ($mode == 3)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
 		}
 		elseif ($mode == 4)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
 		}
 		elseif ($mode == 5)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
+			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
 		}
 		elseif ($mode == 6)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
+			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
 		}
 	}
 
@@ -524,10 +524,10 @@ 
 	function info($id)
 	{
 		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
-		$sql.= ' fk_user_creat, fk_user_modif';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		$sql.= ' WHERE t.rowid = '.$id;
-		$result=$this->db->query($sql);
+		$sql .= ' fk_user_creat, fk_user_modif';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= ' WHERE t.rowid = '.$id;
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			if ($this->db->num_rows($result))
@@ -538,7 +538,7 @@ 
 				{
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation   = $cuser;
+					$this->user_creation = $cuser;
 				}
 
 				if ($obj->fk_user_valid)
@@ -552,7 +552,7 @@ 
 				{
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture   = $cluser;
+					$this->user_cloture = $cluser;
 				}
 
 				$this->date_creation     = $this->db->jdate($obj->datec);

Braces +87 added lines, -44 removed lines

@@ -212,8 +212,12 @@ 
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible']=0;
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled']=0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		    $this->fields['rowid']['visible']=0;
+		}
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		    $this->fields['entity']['enabled']=0;
+		}
 	}
 
 	/**
@@ -291,11 +295,17 @@ 
 	public function fetch($id, $ref = null, $socid = 0, $type = '')
 	{
 		$morewhere = '';
-		if ($socid) $morewhere.= " AND fk_soc  = ".$this->db->escape($socid)." AND default_rib = 1";
-		if ($type)  $morewhere.= " AND type = '".$this->db->escape($type)."'";
+		if ($socid) {
+		    $morewhere.= " AND fk_soc  = ".$this->db->escape($socid)." AND default_rib = 1";
+		}
+		if ($type) {
+		    $morewhere.= " AND type = '".$this->db->escape($type)."'";
+		}
 
 		$result = $this->fetchCommon($id, $ref, $morewhere);
-		if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+		if ($result > 0 && ! empty($this->table_element_line)) {
+		    $this->fetchLines();
+		}
 		return $result;
 	}
 
@@ -353,7 +363,10 @@ 
         global $dolibarr_main_authentication, $dolibarr_main_demo;
         global $menumanager;
 
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+        if (! empty($conf->dol_no_mouse_hover)) {
+            $notooltip=1;
+        }
+        // Force disable tooltips
 
         $result = '';
         $companylink = '';
@@ -368,8 +381,12 @@ 
         {
 	        // Add param to save lastsearch_values or not
 	        $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-	        if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) {
+	            $add_save_lastsearch_values=1;
+	        }
+	        if ($add_save_lastsearch_values) {
+	            $url.='&save_lastsearch_values=1';
+	        }
         }
 
         $linkclose='';
@@ -382,16 +399,21 @@ 
             }
             $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+        } else {
+            $linkclose = ($morecss?' class="'.$morecss.'"':'');
         }
-        else $linkclose = ($morecss?' class="'.$morecss.'"':'');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= $this->ref;
+		if ($withpicto) {
+		    $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+		}
+		if ($withpicto != 2) {
+		    $result.= $this->ref;
+		}
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
@@ -417,25 +439,30 @@ 
 			if ($this->db->num_rows($result1) == 0)
 			{
 				return 0;
-			}
-			else
+			} else
 			{
 				$obj = $this->db->fetch_object($result1);
 
 				$type = '';
-				if (empty($alltypes)) $type = $obj->type;
+				if (empty($alltypes)) {
+				    $type = $obj->type;
+				}
 
 				$this->db->begin();
 
 				$sql2 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 0";
 				$sql2.= " WHERE default_rib <> 0 AND fk_soc = ".$obj->fk_soc;
-				if ($type) $sql2.= " AND type = '".$this->db->escape($type)."'";
+				if ($type) {
+				    $sql2.= " AND type = '".$this->db->escape($type)."'";
+				}
 				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 				$result2 = $this->db->query($sql2);
 
 				$sql3 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 1";
 				$sql3.= " WHERE rowid = ".$obj->id;
-				if ($type) $sql3.= " AND type = '".$this->db->escape($type)."'";
+				if ($type) {
+				    $sql3.= " AND type = '".$this->db->escape($type)."'";
+				}
 				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 				$result3 = $this->db->query($sql3);
 
@@ -444,15 +471,13 @@ 
 					dol_print_error($this->db);
 					$this->db->rollback();
 					return -1;
-				}
-				else
+				} else
 				{
 					$this->db->commit();
 					return 1;
 				}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -485,33 +510,52 @@ 
 
 		if ($mode == 0 || $mode == 1)
 		{
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
+			if ($status == 1) {
+			    return $langs->trans('Enabled');
+			}
+			if ($status == 0) {
+			    return $langs->trans('Disabled');
+			}
+		} elseif ($mode == 2)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
+			if ($status == 1) {
+			    return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			}
+			if ($status == 0) {
+			    return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			}
+		} elseif ($mode == 3)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
-		}
-		elseif ($mode == 4)
+			if ($status == 1) {
+			    return img_picto($langs->trans('Enabled'),'statut4');
+			}
+			if ($status == 0) {
+			    return img_picto($langs->trans('Disabled'),'statut5');
+			}
+		} elseif ($mode == 4)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
+			if ($status == 1) {
+			    return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			}
+			if ($status == 0) {
+			    return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			}
+		} elseif ($mode == 5)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-		elseif ($mode == 6)
+			if ($status == 1) {
+			    return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+			}
+			if ($status == 0) {
+			    return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			}
+		} elseif ($mode == 6)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) {
+			    return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+			}
+			if ($status == 0) {
+			    return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			}
 		}
 	}
 
@@ -561,8 +605,7 @@ 
 			}
 
 			$this->db->free($result);
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}

dolibarr/htdocs/societe/class/societe.class.php

Indentation +3920 added lines, -3920 removed lines

@@ -42,313 +42,313 @@ 
  */
 class Societe extends CommonObject
 {
-	/**
-	 * @var string ID to identify managed object
-	 */
-	public $element='societe';
-
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element = 'societe';
-
-	/**
-	 * @var int Field with ID of parent key if this field has a parent
-	 */
-	public $fk_element='fk_soc';
-
-	public $fieldsforcombobox='nom,name_alias';
-	protected $childtables=array("supplier_proposal"=>'SupplierProposal',"propal"=>'Proposal',"commande"=>'Order',"facture"=>'Invoice',"facture_rec"=>'RecurringInvoiceTemplate',"contrat"=>'Contract',"fichinter"=>'Fichinter',"facture_fourn"=>'SupplierInvoice',"commande_fournisseur"=>'SupplierOrder',"projet"=>'Project',"expedition"=>'Shipment',"prelevement_lignes"=>'DirectDebitRecord');    // To test if we can delete object
-	protected $childtablesoncascade=array("societe_prices", "societe_log", "societe_address", "product_fournisseur_price", "product_customer_price_log", "product_customer_price", "socpeople", "adherent", "societe_rib", "societe_remise", "societe_remise_except", "societe_commerciaux", "categorie", "notify", "notify_def", "actioncomm");
-	public $picto = 'company';
-
-	/**
-	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	 * @var int
-	 */
-	public $ismultientitymanaged = 1;
-
-	/**
-	 * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
-	 * @var integer
-	 */
-	public $restrictiononfksoc = 1;
-
-
-	// BEGIN MODULEBUILDER PROPERTIES
-	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
-	 */
-	public $fields=array(
-		'rowid'         =>array('type'=>'integer',      'label'=>'TechnicalID',      'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'index'=>1, 'position'=>1, 'comment'=>'Id'),
-		'nom'           =>array('type'=>'varchar(128)', 'label'=>'Name',             'enabled'=>1, 'visible'=>1,  'notnull'=>1,  'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
-		'name_alias'    =>array('type'=>'varchar(128)', 'label'=>'Name',             'enabled'=>1, 'visible'=>1,  'notnull'=>1,  'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
-		'entity'        =>array('type'=>'integer',      'label'=>'Entity',           'enabled'=>1, 'visible'=>0,  'default'=>1,  'notnull'=>1,  'index'=>1, 'position'=>20),
-		'note_public'   =>array('type'=>'text',			'label'=>'NotePublic',		 'enabled'=>1, 'visible'=>0,  'position'=>60),
-		'note_private'  =>array('type'=>'text',			'label'=>'NotePrivate',		 'enabled'=>1, 'visible'=>0,  'position'=>61),
-		'datec'			=>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>500),
-		'tms'           =>array('type'=>'timestamp',    'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>501),
-		//'date_valid'    =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'position'=>502),
-		'fk_user_creat' =>array('type'=>'integer',      'label'=>'UserAuthor',       'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>510),
-		'fk_user_modif' =>array('type'=>'integer',      'label'=>'UserModif',        'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
-		//'fk_user_valid' =>array('type'=>'integer',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
-		'import_key'    =>array('type'=>'varchar(14)',  'label'=>'ImportId',         'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>1,  'position'=>1000),
-	);
-
-
-	/**
-	 * @var int Entity
-	 */
-	public $entity;
-
-	/**
-	 * Thirdparty name
-	 * @var string
-	 * @deprecated Use $name instead
-	 * @see $name
-	 */
-	public $nom;
-
-	/**
-	 * @var string name
-	 */
-	public $name;
-
-	/**
-	 * Alias names (commercial, trademark or alias names)
-	 * @var string
-	 */
-	public $name_alias;
-
-	public $particulier;
-
-	/**
-	 * @var string Address
-	 */
-	public $address;
-
-	public $zip;
-	public $town;
-
-	/**
-	 * Thirdparty status : 0=activity ceased, 1= in activity
-	 * @var int
-	 */
-	public $status=1;
-
-	/**
-	 * Id of department
-	 * @var int
-	 */
-	public $state_id;
-	public $state_code;
-	public $state;
-
-	/**
-	 * Id of region
-	 * @var int
-	 */
-	public $region_code;
-	public $region;
-
-	/**
-	 * State code
-	 * @var string
-	 * @deprecated Use state_code instead
-	 * @see $state_code
-	 */
-	public $departement_code;
-
-	/**
-	 * @var string
-	 * @deprecated Use state instead
-	 * @see $state
-	 */
-	public $departement;
-
-	/**
-	 * @var string
-	 * @deprecated Use country instead
-	 * @see $country
-	 */
-	public $pays;
-
-	/**
-	 * Phone number
-	 * @var string
-	 */
-	public $phone;
-	/**
-	 * Fax number
-	 * @var string
-	 */
-	public $fax;
-	/**
-	 * Email
-	 * @var string
-	 */
-	public $email;
-	/**
-	 * Skype username
-	 * @var string
-	 */
-	public $skype;
-	/**
-	 * Twitter username
-	 * @var string
-	 */
-	public $twitter;
-	/**
-	 * Facebook username
-	 * @var string
-	 */
-	public $facebook;
-	/**
-	 * Webpage
-	 * @var string
-	 */
-	public $url;
-
-	//! barcode
-	/**
-	 * Barcode value
-	 * @var string
-	 */
-	public $barcode;
-
-	// 6 professional id (usage depends on country)
-
-	/**
-	 * Professional ID 1 (Ex: Siren in France)
-	 * @var string
-	 */
-	public $idprof1;
-
-	/**
-	 * Professional ID 2 (Ex: Siret in France)
-	 * @var string
-	 */
-	public $idprof2;
-
-	/**
-	 * Professional ID 3 (Ex: Ape in France)
-	 * @var string
-	 */
-	public $idprof3;
-
-	/**
-	 * Professional ID 4 (Ex: RCS in France)
-	 * @var string
-	 */
-	public $idprof4;
-
-	/**
-	 * Professional ID 5
-	 * @var string
-	 */
-	public $idprof5;
-
-	/**
-	 * Professional ID 6
-	 * @var string
-	 */
-	public $idprof6;
-
-	public $prefix_comm;
-
-	public $tva_assuj=1;
-	/**
-	 * Intracommunitary VAT ID
-	 * @var string
-	 */
-	public $tva_intra;
-
-	// Local taxes
-	public $localtax1_assuj;
-	public $localtax1_value;
-	public $localtax2_assuj;
-	public $localtax2_value;
-
-	public $managers;
-	public $capital;
-	public $typent_id=0;
-	public $typent_code;
-	public $effectif;
-	public $effectif_id=0;
-	public $forme_juridique_code;
-	public $forme_juridique=0;
-
-	public $remise_percent;
-	public $remise_supplier_percent;
-	public $mode_reglement_supplier_id;
-	public $cond_reglement_supplier_id;
-
-	/**
+    /**
+     * @var string ID to identify managed object
+     */
+    public $element='societe';
+
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element = 'societe';
+
+    /**
+     * @var int Field with ID of parent key if this field has a parent
+     */
+    public $fk_element='fk_soc';
+
+    public $fieldsforcombobox='nom,name_alias';
+    protected $childtables=array("supplier_proposal"=>'SupplierProposal',"propal"=>'Proposal',"commande"=>'Order',"facture"=>'Invoice',"facture_rec"=>'RecurringInvoiceTemplate',"contrat"=>'Contract',"fichinter"=>'Fichinter',"facture_fourn"=>'SupplierInvoice',"commande_fournisseur"=>'SupplierOrder',"projet"=>'Project',"expedition"=>'Shipment',"prelevement_lignes"=>'DirectDebitRecord');    // To test if we can delete object
+    protected $childtablesoncascade=array("societe_prices", "societe_log", "societe_address", "product_fournisseur_price", "product_customer_price_log", "product_customer_price", "socpeople", "adherent", "societe_rib", "societe_remise", "societe_remise_except", "societe_commerciaux", "categorie", "notify", "notify_def", "actioncomm");
+    public $picto = 'company';
+
+    /**
+     * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+     * @var int
+     */
+    public $ismultientitymanaged = 1;
+
+    /**
+     * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
+     * @var integer
+     */
+    public $restrictiononfksoc = 1;
+
+
+    // BEGIN MODULEBUILDER PROPERTIES
+    /**
+     * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+     */
+    public $fields=array(
+        'rowid'         =>array('type'=>'integer',      'label'=>'TechnicalID',      'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'index'=>1, 'position'=>1, 'comment'=>'Id'),
+        'nom'           =>array('type'=>'varchar(128)', 'label'=>'Name',             'enabled'=>1, 'visible'=>1,  'notnull'=>1,  'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
+        'name_alias'    =>array('type'=>'varchar(128)', 'label'=>'Name',             'enabled'=>1, 'visible'=>1,  'notnull'=>1,  'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
+        'entity'        =>array('type'=>'integer',      'label'=>'Entity',           'enabled'=>1, 'visible'=>0,  'default'=>1,  'notnull'=>1,  'index'=>1, 'position'=>20),
+        'note_public'   =>array('type'=>'text',			'label'=>'NotePublic',		 'enabled'=>1, 'visible'=>0,  'position'=>60),
+        'note_private'  =>array('type'=>'text',			'label'=>'NotePrivate',		 'enabled'=>1, 'visible'=>0,  'position'=>61),
+        'datec'			=>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>500),
+        'tms'           =>array('type'=>'timestamp',    'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>501),
+        //'date_valid'    =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'position'=>502),
+        'fk_user_creat' =>array('type'=>'integer',      'label'=>'UserAuthor',       'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>510),
+        'fk_user_modif' =>array('type'=>'integer',      'label'=>'UserModif',        'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
+        //'fk_user_valid' =>array('type'=>'integer',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
+        'import_key'    =>array('type'=>'varchar(14)',  'label'=>'ImportId',         'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>1,  'position'=>1000),
+    );
+
+
+    /**
+     * @var int Entity
+     */
+    public $entity;
+
+    /**
+     * Thirdparty name
+     * @var string
+     * @deprecated Use $name instead
+     * @see $name
+     */
+    public $nom;
+
+    /**
+     * @var string name
+     */
+    public $name;
+
+    /**
+     * Alias names (commercial, trademark or alias names)
+     * @var string
+     */
+    public $name_alias;
+
+    public $particulier;
+
+    /**
+     * @var string Address
+     */
+    public $address;
+
+    public $zip;
+    public $town;
+
+    /**
+     * Thirdparty status : 0=activity ceased, 1= in activity
+     * @var int
+     */
+    public $status=1;
+
+    /**
+     * Id of department
+     * @var int
+     */
+    public $state_id;
+    public $state_code;
+    public $state;
+
+    /**
+     * Id of region
+     * @var int
+     */
+    public $region_code;
+    public $region;
+
+    /**
+     * State code
+     * @var string
+     * @deprecated Use state_code instead
+     * @see $state_code
+     */
+    public $departement_code;
+
+    /**
+     * @var string
+     * @deprecated Use state instead
+     * @see $state
+     */
+    public $departement;
+
+    /**
+     * @var string
+     * @deprecated Use country instead
+     * @see $country
+     */
+    public $pays;
+
+    /**
+     * Phone number
+     * @var string
+     */
+    public $phone;
+    /**
+     * Fax number
+     * @var string
+     */
+    public $fax;
+    /**
+     * Email
+     * @var string
+     */
+    public $email;
+    /**
+     * Skype username
+     * @var string
+     */
+    public $skype;
+    /**
+     * Twitter username
+     * @var string
+     */
+    public $twitter;
+    /**
+     * Facebook username
+     * @var string
+     */
+    public $facebook;
+    /**
+     * Webpage
+     * @var string
+     */
+    public $url;
+
+    //! barcode
+    /**
+     * Barcode value
+     * @var string
+     */
+    public $barcode;
+
+    // 6 professional id (usage depends on country)
+
+    /**
+     * Professional ID 1 (Ex: Siren in France)
+     * @var string
+     */
+    public $idprof1;
+
+    /**
+     * Professional ID 2 (Ex: Siret in France)
+     * @var string
+     */
+    public $idprof2;
+
+    /**
+     * Professional ID 3 (Ex: Ape in France)
+     * @var string
+     */
+    public $idprof3;
+
+    /**
+     * Professional ID 4 (Ex: RCS in France)
+     * @var string
+     */
+    public $idprof4;
+
+    /**
+     * Professional ID 5
+     * @var string
+     */
+    public $idprof5;
+
+    /**
+     * Professional ID 6
+     * @var string
+     */
+    public $idprof6;
+
+    public $prefix_comm;
+
+    public $tva_assuj=1;
+    /**
+     * Intracommunitary VAT ID
+     * @var string
+     */
+    public $tva_intra;
+
+    // Local taxes
+    public $localtax1_assuj;
+    public $localtax1_value;
+    public $localtax2_assuj;
+    public $localtax2_value;
+
+    public $managers;
+    public $capital;
+    public $typent_id=0;
+    public $typent_code;
+    public $effectif;
+    public $effectif_id=0;
+    public $forme_juridique_code;
+    public $forme_juridique=0;
+
+    public $remise_percent;
+    public $remise_supplier_percent;
+    public $mode_reglement_supplier_id;
+    public $cond_reglement_supplier_id;
+
+    /**
      * @var int ID
      */
-	public $fk_prospectlevel;
-
-	public $name_bis;
-
-	//Log data
-
-	/**
-	 * Date of last update
-	 * @var string
-	 */
-	public $date_modification;
-	/**
-	 * User that made last update
-	 * @var string
-	 */
-	public $user_modification;
-	/**
-	 * Date of creation
-	 * @var string
-	 */
-	public $date_creation;
-	/**
-	 * User that created the thirdparty
-	 * @var User
-	 */
-	public $user_creation;
-
-
-	public $specimen;
-
-	/**
-	 * 0=no customer, 1=customer, 2=prospect, 3=customer and prospect
-	 * @var int
-	 */
-	public $client=0;
-	/**
-	 * 0=no prospect, 1=prospect
-	 * @var int
-	 */
-	public $prospect=0;
-	/**
-	 * 0=no supplier, 1=supplier
-	 * @var int
-	 */
-	public $fournisseur;
-
-	/**
-	 * Client code. E.g: CU2014-003
-	 * @var string
-	 */
-	public $code_client;
-
-	/**
-	 * Supplier code. E.g: SU2014-003
-	 * @var string
-	 */
-	public $code_fournisseur;
-
-	/**
-	 * Accounting code for client
-	 * @var string
-	 */
-	public $code_compta;
+    public $fk_prospectlevel;
+
+    public $name_bis;
+
+    //Log data
+
+    /**
+     * Date of last update
+     * @var string
+     */
+    public $date_modification;
+    /**
+     * User that made last update
+     * @var string
+     */
+    public $user_modification;
+    /**
+     * Date of creation
+     * @var string
+     */
+    public $date_creation;
+    /**
+     * User that created the thirdparty
+     * @var User
+     */
+    public $user_creation;
+
+
+    public $specimen;
+
+    /**
+     * 0=no customer, 1=customer, 2=prospect, 3=customer and prospect
+     * @var int
+     */
+    public $client=0;
+    /**
+     * 0=no prospect, 1=prospect
+     * @var int
+     */
+    public $prospect=0;
+    /**
+     * 0=no supplier, 1=supplier
+     * @var int
+     */
+    public $fournisseur;
+
+    /**
+     * Client code. E.g: CU2014-003
+     * @var string
+     */
+    public $code_client;
+
+    /**
+     * Supplier code. E.g: SU2014-003
+     * @var string
+     */
+    public $code_fournisseur;
+
+    /**
+     * Accounting code for client
+     * @var string
+     */
+    public $code_compta;
 
     /**
      * Accounting code for client
@@ -356,3795 +356,3795 @@ 
      */
     public $code_compta_client;
 
-	/**
-	 * Accounting code for suppliers
-	 * @var string
-	 */
-	public $code_compta_fournisseur;
-
-	/**
-	 * @var string
-	 * @deprecated Note is split in public and private notes
-	 * @see $note_public, $note_private
-	 */
-	public $note;
-
-	/**
-	 * Private note
-	 * @var string
-	 */
-	public $note_private;
-
-	/**
-	 * Public note
-	 * @var string
-	 */
-	public $note_public;
-
-	//! code statut prospect
-	public $stcomm_id;
-	public $statut_commercial;
-
-	/**
-	 * Assigned price level
-	 * @var int
-	 */
-	public $price_level;
-	public $outstanding_limit;
-
-	/**
-	 * Min order amounts
-	 */
-	public $order_min_amount;
-	public $supplier_order_min_amount;
-
-	/**
-	 * Id of sales representative to link (used for thirdparty creation). Not filled by a fetch, because we can have several sales representatives.
-	 * @var int
-	 */
-	public $commercial_id;
-	/**
-	 * Id of parent thirdparty (if one)
-	 * @var int
-	 */
-	public $parent;
-	/**
-	 * Default language code of thirdparty (en_US, ...)
-	 * @var string
-	 */
-	public $default_lang;
-
-	/**
-	 * @var string Ref
-	 */
-	public $ref;
-
-	public $ref_int;
-	/**
-	 * External user reference.
-	 * This is to allow external systems to store their id and make self-developed synchronizing functions easier to
-	 * build.
-	 * @var string
-	 */
-	public $ref_ext;
-
-	/**
-	 * Import key.
-	 * Set when the thirdparty has been created through an import process. This is to relate those created thirdparties
-	 * to an import process
-	 * @var string
-	 */
-	public $import_key;
-
-	/**
-	 * Supplier WebServices URL
-	 * @var string
-	 */
-	public $webservices_url;
-
-	/**
-	 * Supplier WebServices Key
-	 * @var string
-	 */
-	public $webservices_key;
-
-	public $logo;
-	public $logo_small;
-	public $logo_mini;
-
-	public $array_options;
-
-	// Incoterms
-	/**
+    /**
+     * Accounting code for suppliers
+     * @var string
+     */
+    public $code_compta_fournisseur;
+
+    /**
+     * @var string
+     * @deprecated Note is split in public and private notes
+     * @see $note_public, $note_private
+     */
+    public $note;
+
+    /**
+     * Private note
+     * @var string
+     */
+    public $note_private;
+
+    /**
+     * Public note
+     * @var string
+     */
+    public $note_public;
+
+    //! code statut prospect
+    public $stcomm_id;
+    public $statut_commercial;
+
+    /**
+     * Assigned price level
+     * @var int
+     */
+    public $price_level;
+    public $outstanding_limit;
+
+    /**
+     * Min order amounts
+     */
+    public $order_min_amount;
+    public $supplier_order_min_amount;
+
+    /**
+     * Id of sales representative to link (used for thirdparty creation). Not filled by a fetch, because we can have several sales representatives.
+     * @var int
+     */
+    public $commercial_id;
+    /**
+     * Id of parent thirdparty (if one)
+     * @var int
+     */
+    public $parent;
+    /**
+     * Default language code of thirdparty (en_US, ...)
+     * @var string
+     */
+    public $default_lang;
+
+    /**
+     * @var string Ref
+     */
+    public $ref;
+
+    public $ref_int;
+    /**
+     * External user reference.
+     * This is to allow external systems to store their id and make self-developed synchronizing functions easier to
+     * build.
+     * @var string
+     */
+    public $ref_ext;
+
+    /**
+     * Import key.
+     * Set when the thirdparty has been created through an import process. This is to relate those created thirdparties
+     * to an import process
+     * @var string
+     */
+    public $import_key;
+
+    /**
+     * Supplier WebServices URL
+     * @var string
+     */
+    public $webservices_url;
+
+    /**
+     * Supplier WebServices Key
+     * @var string
+     */
+    public $webservices_key;
+
+    public $logo;
+    public $logo_small;
+    public $logo_mini;
+
+    public $array_options;
+
+    // Incoterms
+    /**
      * @var int ID
      */
-	public $fk_incoterms;
+    public $fk_incoterms;
 
-	public $location_incoterms;
-	public $libelle_incoterms;  //Used into tooltip
+    public $location_incoterms;
+    public $libelle_incoterms;  //Used into tooltip
 
-	// Multicurrency
-	/**
+    // Multicurrency
+    /**
      * @var int ID
      */
-	public $fk_multicurrency;
-
-	public $multicurrency_code;
-
-
-	// END MODULEBUILDER PROPERTIES
-
-
-	/**
-	 *    Constructor
-	 *
-	 *    @param	DoliDB		$db		Database handler
-	 */
-	public function __construct($db)
-	{
-		$this->db = $db;
-
-		$this->client = 0;
-		$this->prospect = 0;
-		$this->fournisseur = 0;
-		$this->typent_id  = 0;
-		$this->effectif_id  = 0;
-		$this->forme_juridique_code  = 0;
-		$this->tva_assuj = 1;
-		$this->status = 1;
-	}
-
-
-	/**
-	 *    Create third party in database.
-	 *    $this->code_client = -1 and $this->code_fournisseur = -1 means automatic assignement.
-	 *
-	 *    @param	User	$user       Object of user that ask creation
-	 *    @return   int         		>= 0 if OK, < 0 if KO
-	 */
-	function create(User $user)
-	{
-		global $langs,$conf,$mysoc;
-
-		$error=0;
-
-		// Clean parameters
-		if (empty($this->status)) $this->status=0;
-		$this->name=$this->name?trim($this->name):trim($this->nom);
-		if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name=ucwords($this->name);
-		$this->nom=$this->name; // For backward compatibility
-		if (empty($this->client))      $this->client=0;
-		if (empty($this->fournisseur)) $this->fournisseur=0;
-		$this->import_key = trim($this->import_key);
-
-		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
-		if (empty($this->fk_multicurrency))
-		{
-			$this->multicurrency_code = '';
-			$this->fk_multicurrency = 0;
-		}
-
-		dol_syslog(get_class($this)."::create ".$this->name);
-
-		$now=dol_now();
-
-		$this->db->begin();
-
-		// For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts)
-		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this,0);
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1);
-
-		// Check more parameters (including mandatory setup
-		// If error, this->errors[] is filled
-		$result = $this->verify();
-
-		if ($result >= 0)
-		{
-			$this->entity = ((isset($this->entity) && is_numeric($this->entity))?$this->entity:$conf->entity);
-
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_int, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)";
-			$sql.= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$this->db->escape($this->entity).", '".$this->db->idate($now)."'";
-			$sql.= ", ".(! empty($user->id) ? "'".$user->id."'":"null");
-			$sql.= ", ".(! empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'":"null");
-			$sql.= ", ".$this->status;
-			$sql.= ", ".(! empty($this->ref_int) ? "'".$this->db->escape($this->ref_int)."'":"null");
-			$sql.= ", ".(! empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'":"null");
-			$sql.= ", 0";
-			$sql.= ", ".(int) $this->fk_incoterms;
-			$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-			$sql.= ", ".(! empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'":"null");
-			$sql.= ", ".(int) $this->fk_multicurrency;
-			$sql.= ", '".$this->db->escape($this->multicurrency_code)."')";
-
-			dol_syslog(get_class($this)."::create", LOG_DEBUG);
-			$result=$this->db->query($sql);
-			if ($result)
-			{
-				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe");
-
-				$ret = $this->update($this->id,$user,0,1,1,'add');
-
-				// Ajout du commercial affecte
-				if ($this->commercial_id != '' && $this->commercial_id != -1)
-				{
-					$this->add_commercial($user, $this->commercial_id);
-				}
-				// si un commercial cree un client il lui est affecte automatiquement
-				elseif (empty($user->rights->societe->client->voir))
-				{
-					$this->add_commercial($user, $user->id);
-				}
-
-				if ($ret >= 0)
-				{
-					// Call trigger
-					$result=$this->call_trigger('COMPANY_CREATE',$user);
-					if ($result < 0) $error++;
-					// End call triggers
-				}
-				else $error++;
-
-				if (! $error)
-				{
-					dol_syslog(get_class($this)."::Create success id=".$this->id);
-					$this->db->commit();
-					return $this->id;
-				}
-				else
-				{
-					dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',',$this->errors), LOG_ERR);
-					$this->db->rollback();
-					return -4;
-				}
-			}
-			else
-			{
-				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-				{
-					$this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name);    // duplicate on a field (code or profid or ...)
-					$result=-1;
-				}
-				else
-				{
-					$this->error=$this->db->lasterror();
-					$result=-2;
-				}
-				$this->db->rollback();
-				return $result;
-			}
-		}
-		else
-		{
-			$this->db->rollback();
-			dol_syslog(get_class($this)."::Create fails verify ".join(',',$this->errors), LOG_WARNING);
-			return -3;
-		}
-	}
+    public $fk_multicurrency;
+
+    public $multicurrency_code;
+
+
+    // END MODULEBUILDER PROPERTIES
+
+
+    /**
+     *    Constructor
+     *
+     *    @param	DoliDB		$db		Database handler
+     */
+    public function __construct($db)
+    {
+        $this->db = $db;
+
+        $this->client = 0;
+        $this->prospect = 0;
+        $this->fournisseur = 0;
+        $this->typent_id  = 0;
+        $this->effectif_id  = 0;
+        $this->forme_juridique_code  = 0;
+        $this->tva_assuj = 1;
+        $this->status = 1;
+    }
+
+
+    /**
+     *    Create third party in database.
+     *    $this->code_client = -1 and $this->code_fournisseur = -1 means automatic assignement.
+     *
+     *    @param	User	$user       Object of user that ask creation
+     *    @return   int         		>= 0 if OK, < 0 if KO
+     */
+    function create(User $user)
+    {
+        global $langs,$conf,$mysoc;
+
+        $error=0;
+
+        // Clean parameters
+        if (empty($this->status)) $this->status=0;
+        $this->name=$this->name?trim($this->name):trim($this->nom);
+        if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name=ucwords($this->name);
+        $this->nom=$this->name; // For backward compatibility
+        if (empty($this->client))      $this->client=0;
+        if (empty($this->fournisseur)) $this->fournisseur=0;
+        $this->import_key = trim($this->import_key);
+
+        if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+        if (empty($this->fk_multicurrency))
+        {
+            $this->multicurrency_code = '';
+            $this->fk_multicurrency = 0;
+        }
+
+        dol_syslog(get_class($this)."::create ".$this->name);
+
+        $now=dol_now();
+
+        $this->db->begin();
+
+        // For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts)
+        if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this,0);
+        if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1);
+
+        // Check more parameters (including mandatory setup
+        // If error, this->errors[] is filled
+        $result = $this->verify();
+
+        if ($result >= 0)
+        {
+            $this->entity = ((isset($this->entity) && is_numeric($this->entity))?$this->entity:$conf->entity);
+
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_int, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)";
+            $sql.= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$this->db->escape($this->entity).", '".$this->db->idate($now)."'";
+            $sql.= ", ".(! empty($user->id) ? "'".$user->id."'":"null");
+            $sql.= ", ".(! empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'":"null");
+            $sql.= ", ".$this->status;
+            $sql.= ", ".(! empty($this->ref_int) ? "'".$this->db->escape($this->ref_int)."'":"null");
+            $sql.= ", ".(! empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'":"null");
+            $sql.= ", 0";
+            $sql.= ", ".(int) $this->fk_incoterms;
+            $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
+            $sql.= ", ".(! empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'":"null");
+            $sql.= ", ".(int) $this->fk_multicurrency;
+            $sql.= ", '".$this->db->escape($this->multicurrency_code)."')";
+
+            dol_syslog(get_class($this)."::create", LOG_DEBUG);
+            $result=$this->db->query($sql);
+            if ($result)
+            {
+                $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe");
+
+                $ret = $this->update($this->id,$user,0,1,1,'add');
+
+                // Ajout du commercial affecte
+                if ($this->commercial_id != '' && $this->commercial_id != -1)
+                {
+                    $this->add_commercial($user, $this->commercial_id);
+                }
+                // si un commercial cree un client il lui est affecte automatiquement
+                elseif (empty($user->rights->societe->client->voir))
+                {
+                    $this->add_commercial($user, $user->id);
+                }
+
+                if ($ret >= 0)
+                {
+                    // Call trigger
+                    $result=$this->call_trigger('COMPANY_CREATE',$user);
+                    if ($result < 0) $error++;
+                    // End call triggers
+                }
+                else $error++;
+
+                if (! $error)
+                {
+                    dol_syslog(get_class($this)."::Create success id=".$this->id);
+                    $this->db->commit();
+                    return $this->id;
+                }
+                else
+                {
+                    dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',',$this->errors), LOG_ERR);
+                    $this->db->rollback();
+                    return -4;
+                }
+            }
+            else
+            {
+                if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+                {
+                    $this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name);    // duplicate on a field (code or profid or ...)
+                    $result=-1;
+                }
+                else
+                {
+                    $this->error=$this->db->lasterror();
+                    $result=-2;
+                }
+                $this->db->rollback();
+                return $result;
+            }
+        }
+        else
+        {
+            $this->db->rollback();
+            dol_syslog(get_class($this)."::Create fails verify ".join(',',$this->errors), LOG_WARNING);
+            return -3;
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Create a contact/address from thirdparty
-	 *
-	 * @param 	User	$user		Object user
-	 * @return 	int					<0 if KO, >0 if OK
-	 */
-	function create_individual(User $user)
-	{
+    /**
+     * Create a contact/address from thirdparty
+     *
+     * @param 	User	$user		Object user
+     * @return 	int					<0 if KO, >0 if OK
+     */
+    function create_individual(User $user)
+    {
         // phpcs:enable
-		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-		$contact=new Contact($this->db);
-
-		$contact->name              = $this->name_bis;
-		$contact->firstname         = $this->firstname;
-		$contact->civility_id       = $this->civility_id;
-		$contact->socid             = $this->id;	// fk_soc
-		$contact->statut            = 1;
-		$contact->priv              = 0;
-		$contact->country_id        = $this->country_id;
-		$contact->state_id          = $this->state_id;
-		$contact->address           = $this->address;
-		$contact->email             = $this->email;
-		$contact->zip               = $this->zip;
-		$contact->town              = $this->town;
-		$contact->phone_pro         = $this->phone;
-
-		$result = $contact->create($user);
-		if ($result < 0)
-		{
-			$this->error = $contact->error;
-			$this->errors = $contact->errors;
-			dol_syslog(get_class($this)."::create_individual ERROR:" . $this->error, LOG_ERR);
-		}
-
-		return $result;
-	}
-
-	/**
-	 *    Check properties of third party are ok (like name, third party codes, ...)
-	 *    Used before an add or update.
-	 *
-	 *    @return     int		0 if OK, <0 if KO
-	 */
-	function verify()
-	{
-		global $conf, $langs, $mysoc;
-
-		$error = 0;
-		$this->errors=array();
-
-		$result = 0;
-		$this->name	= trim($this->name);
-		$this->nom=$this->name; // For backward compatibility
-
-		if (! $this->name)
-		{
-			$this->errors[] = 'ErrorBadThirdPartyName';
-			$result = -2;
-		}
-
-		if ($this->client)
-		{
-			$rescode = $this->check_codeclient();
-			if ($rescode <> 0)
-			{
-				if ($rescode == -1)
-				{
-					$this->errors[] = 'ErrorBadCustomerCodeSyntax';
-				}
-				elseif ($rescode == -2)
-				{
-					$this->errors[] = 'ErrorCustomerCodeRequired';
-				}
-				elseif ($rescode == -3)
-				{
-					$this->errors[] = 'ErrorCustomerCodeAlreadyUsed';
-				}
-				elseif ($rescode == -4)
-				{
-					$this->errors[] = 'ErrorPrefixRequired';
-				}
-				$result = -3;
-			}
-		}
-
-		if ($this->fournisseur)
-		{
-			$rescode = $this->check_codefournisseur();
-			if ($rescode <> 0)
-			{
-				if ($rescode == -1)
-				{
-					$this->errors[] = 'ErrorBadSupplierCodeSyntax';
-				}
-				elseif ($rescode == -2)
-				{
-					$this->errors[] = 'ErrorSupplierCodeRequired';
-				}
-				elseif ($rescode == -3)
-				{
-					$this->errors[] = 'ErrorSupplierCodeAlreadyUsed';
-				}
-				elseif ($rescode == -5)
-				{
-					$this->errors[] = 'ErrorprefixRequired';
-				}
-				$result = -3;
-			}
-		}
-
-		// Check for duplicate or mandatory fields defined into setup
-		$array_to_check=array('IDPROF1','IDPROF2','IDPROF3','IDPROF4','IDPROF5','IDPROF6','EMAIL');
-		foreach($array_to_check as $key)
-		{
-			$keymin=strtolower($key);
-			$i=(int) preg_replace('/[^0-9]/','',$key);
-			$vallabel=$this->$keymin;
-
-			if ($i > 0)
-			{
-				if ($this->isACompany())
-				{
-					// Check for unicity
-					if ($vallabel && $this->id_prof_verifiable($i))
-					{
-						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0)))
-						{
-							$langs->load("errors");
-							$error++; $this->errors[] = $langs->transcountry('ProfId'.$i, $this->country_code)." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
-						}
-					}
-
-					// Check for mandatory prof id (but only if country is other than ours)
-					if ($mysoc->country_id > 0 && $this->country_id == $mysoc->country_id)
-					{
-						$idprof_mandatory ='SOCIETE_'.$key.'_MANDATORY';
-						if (! $vallabel && ! empty($conf->global->$idprof_mandatory))
-						{
-							$langs->load("errors");
-							$error++;
-							$this->errors[] = $langs->trans("ErrorProdIdIsMandatory", $langs->transcountry('ProfId'.$i, $this->country_code)).' ('.$langs->trans("ForbiddenBySetupRules").')';
-						}
-					}
-				}
-			}
-			else
-			{
-				//var_dump($conf->global->SOCIETE_EMAIL_UNIQUE);
-				//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
-				if ($key == 'EMAIL')
-				{
-					// Check for unicity
-					if ($vallabel && ! empty($conf->global->SOCIETE_EMAIL_UNIQUE))
-					{
-						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0)))
-						{
-							$langs->load("errors");
-							$error++; $this->errors[] = $langs->trans('Email')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
-						}
-					}
-
-					// Check for mandatory
-					if (! empty($conf->global->SOCIETE_EMAIL_MANDATORY) && ! isValidEMail($this->email))
-					{
-						$langs->load("errors");
-						$error++;
-						$this->errors[] = $langs->trans("ErrorBadEMail", $this->email).' ('.$langs->trans("ForbiddenBySetupRules").')';
-					}
-				}
-			}
-		}
-
-		if ($error) $result = -4;
-
-		return $result;
-	}
-
-	/**
-	 *      Update parameters of third party
-	 *
-	 *      @param	int		$id              			Id of company (deprecated, use 0 here and call update on an object loaded by a fetch)
-	 *      @param  User	$user            			Utilisateur qui demande la mise a jour
-	 *      @param  int		$call_trigger    			0=no, 1=yes
-	 *		@param	int		$allowmodcodeclient			Inclut modif code client et code compta
-	 *		@param	int		$allowmodcodefournisseur	Inclut modif code fournisseur et code compta fournisseur
-	 *		@param	string	$action						'add' or 'update' or 'merge'
-	 *		@param	int		$nosyncmember				Do not synchronize info of linked member
-	 *      @return int  			           			<0 if KO, >=0 if OK
-	 */
-	function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0, $action='update', $nosyncmember=1)
-	{
-		global $langs,$conf,$hookmanager;
-
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-
-		if (empty($id)) $id = $this->id;
-
-		$error=0;
-
-		dol_syslog(get_class($this)."::Update id=".$id." call_trigger=".$call_trigger." allowmodcodeclient=".$allowmodcodeclient." allowmodcodefournisseur=".$allowmodcodefournisseur);
-
-		$now=dol_now();
-
-		// Clean parameters
-		$this->id			= $id;
-		$this->entity		= ((isset($this->entity) && is_numeric($this->entity))?$this->entity:$conf->entity);
-		$this->name			= $this->name?trim($this->name):trim($this->nom);
-		$this->nom			= $this->name;	// For backward compatibility
-		$this->name_alias	= trim($this->name_alias);
-		$this->ref_ext		= trim($this->ref_ext);
-		$this->address		= $this->address?trim($this->address):trim($this->address);
-		$this->zip			= $this->zip?trim($this->zip):trim($this->zip);
-		$this->town			= $this->town?trim($this->town):trim($this->town);
-		$this->state_id		= trim($this->state_id);
-		$this->country_id	= ($this->country_id > 0)?$this->country_id:0;
-		$this->phone		= trim($this->phone);
-		$this->phone		= preg_replace("/\s/","",$this->phone);
-		$this->phone		= preg_replace("/\./","",$this->phone);
-		$this->fax			= trim($this->fax);
-		$this->fax			= preg_replace("/\s/","",$this->fax);
-		$this->fax			= preg_replace("/\./","",$this->fax);
-		$this->email		= trim($this->email);
-		$this->skype		= trim($this->skype);
-		$this->twitter		= trim($this->twitter);
-		$this->facebook		= trim($this->facebook);
-		$this->url			= $this->url?clean_url($this->url,0):'';
-		$this->note_private = trim($this->note_private);
-		$this->note_public  = trim($this->note_public);
-		$this->idprof1		= trim($this->idprof1);
-		$this->idprof2		= trim($this->idprof2);
-		$this->idprof3		= trim($this->idprof3);
-		$this->idprof4		= trim($this->idprof4);
-		$this->idprof5		= (! empty($this->idprof5)?trim($this->idprof5):'');
-		$this->idprof6		= (! empty($this->idprof6)?trim($this->idprof6):'');
-		$this->prefix_comm	= trim($this->prefix_comm);
-		$this->outstanding_limit = price2num($this->outstanding_limit);
-		$this->order_min_amount = price2num($this->order_min_amount);
-		$this->supplier_order_min_amount = price2num($this->supplier_order_min_amount);
-
-		$this->tva_assuj	= trim($this->tva_assuj);
-		$this->tva_intra	= dol_sanitizeFileName($this->tva_intra,'');
-		if (empty($this->status)) $this->status = 0;
-
-		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
-		if (empty($this->fk_multicurrency))
-		{
-			$this->multicurrency_code = '';
-			$this->fk_multicurrency = 0;
-		}
-
-		// Local taxes
-		$this->localtax1_assuj=trim($this->localtax1_assuj);
-		$this->localtax2_assuj=trim($this->localtax2_assuj);
-
-		$this->localtax1_value=trim($this->localtax1_value);
-		$this->localtax2_value=trim($this->localtax2_value);
-
-		if ($this->capital != '') $this->capital=price2num(trim($this->capital));
-		if (! is_numeric($this->capital)) $this->capital = '';     // '' = undef
-
-		$this->effectif_id=trim($this->effectif_id);
-		$this->forme_juridique_code=trim($this->forme_juridique_code);
-
-		//Gencod
-		$this->barcode=trim($this->barcode);
-
-		// For automatic creation
-		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this,0);
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1);
-
-		$this->code_compta=trim($this->code_compta);
-		$this->code_compta_fournisseur=trim($this->code_compta_fournisseur);
-
-		// Check parameters. More tests are done later in the ->verify()
-		if (! is_numeric($this->client) && ! is_numeric($this->fournisseur))
-		{
-			$langs->load("errors");
-			$this->error = $langs->trans("BadValueForParameterClientOrSupplier");
-			return -1;
-		}
-
-		$customer=false;
-		if (! empty($allowmodcodeclient) && ! empty($this->client))
-		{
-			// Attention get_codecompta peut modifier le code suivant le module utilise
-			if (empty($this->code_compta))
-			{
-				$ret=$this->get_codecompta('customer');
-				if ($ret < 0) return -1;
-			}
-
-			$customer=true;
-		}
-
-		$supplier=false;
-		if (! empty($allowmodcodefournisseur) && ! empty($this->fournisseur))
-		{
-			// Attention get_codecompta peut modifier le code suivant le module utilise
-			if (empty($this->code_compta_fournisseur))
-			{
-				$ret=$this->get_codecompta('supplier');
-				if ($ret < 0) return -1;
-			}
-
-			$supplier=true;
-		}
-
-		//Web services
-		$this->webservices_url = $this->webservices_url?clean_url($this->webservices_url,0):'';
-		$this->webservices_key = trim($this->webservices_key);
-
-		//Incoterms
-		$this->fk_incoterms = (int) $this->fk_incoterms;
-		$this->location_incoterms = trim($this->location_incoterms);
-
-		$this->db->begin();
-
-		// Check name is required and codes are ok or unique.
-		// If error, this->errors[] is filled
-		$result = 0;
-		if ($action != 'add' && $action != 'merge')
-		{
-			// We don't check when update called during a create because verify was already done.
-			// For a merge, we suppose source data is clean and a customer code of a deleted thirdparty must be accepted into a target thirdparty with empty code without duplicate error
-			$result = $this->verify();
-
-			// If there is only one error and error is ErrorBadCustomerCodeSyntax and we don't change customer code, we allow the update
-			// So we can update record that were using and old numbering rule.
-			if (is_array($this->errors))
-			{
-				if (in_array('ErrorBadCustomerCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_client == $this->code_client)
-				{
-					if (($key = array_search('ErrorBadCustomerCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]);	// Remove error message
-				}
-				if (in_array('ErrorBadSupplierCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_fournisseur == $this->code_fournisseur)
-				{
-					if (($key = array_search('ErrorBadSupplierCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]);	// Remove error message
-				}
-				if (empty($this->errors))	// If there is no more error, we can make like if there is no error at all
-				{
-					$result = 0;
-				}
-			}
-		}
-
-		if ($result >= 0)
-		{
-			dol_syslog(get_class($this)."::update verify ok or not done");
-
-			$sql  = "UPDATE ".MAIN_DB_PREFIX."societe SET ";
-			$sql .= "entity = " . $this->db->escape($this->entity);
-			$sql .= ",nom = '" . $this->db->escape($this->name) ."'"; // Required
-			$sql .= ",name_alias = '" . $this->db->escape($this->name_alias) ."'";
-			$sql .= ",ref_ext = " .(! empty($this->ref_ext)?"'".$this->db->escape($this->ref_ext) ."'":"null");
-			$sql .= ",address = '" . $this->db->escape($this->address) ."'";
-
-			$sql .= ",zip = ".(! empty($this->zip)?"'".$this->db->escape($this->zip)."'":"null");
-			$sql .= ",town = ".(! empty($this->town)?"'".$this->db->escape($this->town)."'":"null");
-
-			$sql .= ",fk_departement = '" . (! empty($this->state_id)?$this->state_id:'0') ."'";
-			$sql .= ",fk_pays = '" . (! empty($this->country_id)?$this->country_id:'0') ."'";
-
-			$sql .= ",phone = ".(! empty($this->phone)?"'".$this->db->escape($this->phone)."'":"null");
-			$sql .= ",fax = ".(! empty($this->fax)?"'".$this->db->escape($this->fax)."'":"null");
-			$sql .= ",email = ".(! empty($this->email)?"'".$this->db->escape($this->email)."'":"null");
-			$sql .= ",skype = ".(! empty($this->skype)?"'".$this->db->escape($this->skype)."'":"null");
-			$sql .= ",twitter = ".(! empty($this->twitter)?"'".$this->db->escape($this->twitter)."'":"null");
-			$sql .= ",facebook = ".(! empty($this->facebook)?"'".$this->db->escape($this->facebook)."'":"null");
-			$sql .= ",url = ".(! empty($this->url)?"'".$this->db->escape($this->url)."'":"null");
-
-			$sql .= ",parent = " . ($this->parent > 0 ? $this->parent : "null");
-
-			$sql .= ",note_private = ".(! empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
-			$sql .= ",note_public = ".(! empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
-
-			$sql .= ",siren   = '". $this->db->escape($this->idprof1) ."'";
-			$sql .= ",siret   = '". $this->db->escape($this->idprof2) ."'";
-			$sql .= ",ape     = '". $this->db->escape($this->idprof3) ."'";
-			$sql .= ",idprof4 = '". $this->db->escape($this->idprof4) ."'";
-			$sql .= ",idprof5 = '". $this->db->escape($this->idprof5) ."'";
-			$sql .= ",idprof6 = '". $this->db->escape($this->idprof6) ."'";
-
-			$sql .= ",tva_assuj = ".($this->tva_assuj!=''?"'".$this->db->escape($this->tva_assuj)."'":"null");
-			$sql .= ",tva_intra = '" . $this->db->escape($this->tva_intra) ."'";
-			$sql .= ",status = " .$this->status;
-
-			// Local taxes
-			$sql .= ",localtax1_assuj = ".($this->localtax1_assuj!=''?"'".$this->db->escape($this->localtax1_assuj)."'":"null");
-			$sql .= ",localtax2_assuj = ".($this->localtax2_assuj!=''?"'".$this->db->escape($this->localtax2_assuj)."'":"null");
-			if($this->localtax1_assuj==1)
-			{
-				if($this->localtax1_value!='')
-				{
-					$sql .=",localtax1_value =".$this->localtax1_value;
-				}
-				else $sql .=",localtax1_value =0.000";
-			}
-			else $sql .=",localtax1_value =0.000";
-
-			if($this->localtax2_assuj==1)
-			{
-				if($this->localtax2_value!='')
-				{
-					$sql .=",localtax2_value =".$this->localtax2_value;
-				}
-				else $sql .=",localtax2_value =0.000";
-			}
-			else $sql .=",localtax2_value =0.000";
-
-			$sql .= ",capital = ".($this->capital == '' ? "null" : $this->capital);
-
-			$sql .= ",prefix_comm = ".(! empty($this->prefix_comm)?"'".$this->db->escape($this->prefix_comm)."'":"null");
-
-			$sql .= ",fk_effectif = ".(! empty($this->effectif_id)?"'".$this->db->escape($this->effectif_id)."'":"null");
-			if (isset($this->stcomm_id))
-			{
-				$sql .= ",fk_stcomm=".(!empty($this->stcomm_id)  ? $this->stcomm_id : "0");
-			}
-			$sql .= ",fk_typent = ".(! empty($this->typent_id)?"'".$this->db->escape($this->typent_id)."'":"0");
-
-			$sql .= ",fk_forme_juridique = ".(! empty($this->forme_juridique_code)?"'".$this->db->escape($this->forme_juridique_code)."'":"null");
-
-			$sql .= ",mode_reglement = ".(! empty($this->mode_reglement_id)?"'".$this->db->escape($this->mode_reglement_id)."'":"null");
-			$sql .= ",cond_reglement = ".(! empty($this->cond_reglement_id)?"'".$this->db->escape($this->cond_reglement_id)."'":"null");
-			$sql .= ",mode_reglement_supplier = ".(! empty($this->mode_reglement_supplier_id)?"'".$this->db->escape($this->mode_reglement_supplier_id)."'":"null");
-			$sql .= ",cond_reglement_supplier = ".(! empty($this->cond_reglement_supplier_id)?"'".$this->db->escape($this->cond_reglement_supplier_id)."'":"null");
-			$sql .= ",fk_shipping_method = ".(! empty($this->shipping_method_id)?"'".$this->db->escape($this->shipping_method_id)."'":"null");
-
-			$sql .= ",client = " . (! empty($this->client)?$this->client:0);
-			$sql .= ",fournisseur = " . (! empty($this->fournisseur)?$this->fournisseur:0);
-			$sql .= ",barcode = ".(! empty($this->barcode)?"'".$this->db->escape($this->barcode)."'":"null");
-			$sql .= ",default_lang = ".(! empty($this->default_lang)?"'".$this->db->escape($this->default_lang)."'":"null");
-			$sql .= ",logo = ".(! empty($this->logo)?"'".$this->db->escape($this->logo)."'":"null");
-			$sql .= ",outstanding_limit= ".($this->outstanding_limit!=''?$this->outstanding_limit:'null');
-			$sql .= ",order_min_amount= ".($this->order_min_amount!=''?$this->order_min_amount:'null');
-			$sql .= ",supplier_order_min_amount= ".($this->supplier_order_min_amount!=''?$this->supplier_order_min_amount:'null');
-			$sql .= ",fk_prospectlevel='".$this->db->escape($this->fk_prospectlevel)."'";
-
-			$sql .= ",webservices_url = ".(! empty($this->webservices_url)?"'".$this->db->escape($this->webservices_url)."'":"null");
-			$sql .= ",webservices_key = ".(! empty($this->webservices_key)?"'".$this->db->escape($this->webservices_key)."'":"null");
-
-			//Incoterms
-			$sql.= ", fk_incoterms = ".$this->fk_incoterms;
-			$sql.= ", location_incoterms = ".(! empty($this->location_incoterms)?"'".$this->db->escape($this->location_incoterms)."'":"null");
-
-			if ($customer)
-			{
-				$sql .= ", code_client = ".(! empty($this->code_client)?"'".$this->db->escape($this->code_client)."'":"null");
-				$sql .= ", code_compta = ".(! empty($this->code_compta)?"'".$this->db->escape($this->code_compta)."'":"null");
-			}
-
-			if ($supplier)
-			{
-				$sql .= ", code_fournisseur = ".(! empty($this->code_fournisseur)?"'".$this->db->escape($this->code_fournisseur)."'":"null");
-				$sql .= ", code_compta_fournisseur = ".(! empty($this->code_compta_fournisseur)?"'".$this->db->escape($this->code_compta_fournisseur)."'":"null");
-			}
-			$sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id:"null");
-			$sql .= ", fk_multicurrency = ".(int) $this->fk_multicurrency;
-			$sql .= ", multicurrency_code = '".$this->db->escape($this->multicurrency_code)."'";
-			$sql .= " WHERE rowid = " . (int) $id;
-
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				if (is_object($this->oldcopy))	// If we have information on old values
-				{
-					if ($this->oldcopy->country_id != $this->country_id)
-					{
-						unset($this->country_code);
-						unset($this->country);
-					}
-					if ($this->oldcopy->state_id != $this->state_id)
-					{
-						unset($this->state_code);
-						unset($this->state);
-					}
-				}
-				else
-				{
-					unset($this->country_code);	// We clean this, in the doubt, because it may have been changed after an update of country_id
-					unset($this->country);
-					unset($this->state_code);
-					unset($this->state);
-				}
-
-				$nbrowsaffected = $this->db->affected_rows($resql);
-
-				if (! $error && $nbrowsaffected)
-				{
-					// Update information on linked member if it is an update
-					if (! $nosyncmember && ! empty($conf->adherent->enabled))
-					{
-						require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-
-						dol_syslog(get_class($this)."::update update linked member");
-
-						$lmember=new Adherent($this->db);
-						$result=$lmember->fetch(0, 0, $this->id);
-
-						if ($result > 0)
-						{
-							$lmember->societe=$this->name;
-							//$lmember->firstname=$this->firstname?$this->firstname:$lmember->firstname;	// We keep firstname and lastname of member unchanged
-							//$lmember->lastname=$this->lastname?$this->lastname:$lmember->lastname;		// We keep firstname and lastname of member unchanged
-							$lmember->address=$this->address;
-							$lmember->email=$this->email;
-							$lmember->skype=$this->skype;
-							$lmember->twitter=$this->twitter;
-							$lmember->facebook=$this->facebook;
-							$lmember->phone=$this->phone;
-
-							$result=$lmember->update($user,0,1,1,1);	// Use nosync to 1 to avoid cyclic updates
-							if ($result < 0)
-							{
-								$this->error=$lmember->error;
-								dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
-								$error++;
-							}
-						}
-						elseif ($result < 0)
-						{
-							$this->error=$lmember->error;
-							$error++;
-						}
-					}
-				}
-
-				$action='update';
-
-				// Actions on extra fields
-				if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-				{
-					$result=$this->insertExtraFields();
-					if ($result < 0)
-					{
-						$error++;
-					}
-				}
-
-				if (! $error && $call_trigger)
-				{
-					// Call trigger
-					$result=$this->call_trigger('COMPANY_MODIFY',$user);
-					if ($result < 0) $error++;
-					// End call triggers
-				}
-
-				if (! $error)
-				{
-					dol_syslog(get_class($this)."::Update success");
-					$this->db->commit();
-					return 1;
-				}
-				else
-				{
-					$this->db->rollback();
-					return -1;
-				}
-			}
-			else
-			{
-				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-				{
-					// Doublon
-					$this->error = $langs->trans("ErrorDuplicateField");
-					$result = -1;
-				}
-				else
-				{
-					$this->error = $this->db->lasterror();
-					$result = -2;
-				}
-				$this->db->rollback();
-				return $result;
-			}
-		}
-		else
-	   {
-			$this->db->rollback();
-			dol_syslog(get_class($this)."::Update fails verify ".join(',',$this->errors), LOG_WARNING);
-			return -3;
-		}
-	}
-
-	/**
-	 *    Load a third party from database into memory
-	 *
-	 *    @param	int		$rowid			Id of third party to load
-	 *    @param    string	$ref			Reference of third party, name (Warning, this can return several records)
-	 *    @param    string	$ref_ext       	External reference of third party (Warning, this information is a free field not provided by Dolibarr)
-	 *    @param    string	$ref_int       	Internal reference of third party (not used by dolibarr)
-	 *    @param    string	$idprof1		Prof id 1 of third party (Warning, this can return several records)
-	 *    @param    string	$idprof2		Prof id 2 of third party (Warning, this can return several records)
-	 *    @param    string	$idprof3		Prof id 3 of third party (Warning, this can return several records)
-	 *    @param    string	$idprof4		Prof id 4 of third party (Warning, this can return several records)
-	 *    @param    string	$idprof5		Prof id 5 of third party (Warning, this can return several records)
-	 *    @param    string	$idprof6		Prof id 6 of third party (Warning, this can return several records)
-	 *    @param    string	$email   		Email of third party (Warning, this can return several records)
-	 *    @param    string	$ref_alias 		Name_alias of third party (Warning, this can return several records)
-	 *    @return   int						>0 if OK, <0 if KO or if two records found for same ref or idprof, 0 if not found.
-	 */
-	function fetch($rowid, $ref='', $ref_ext='', $ref_int='', $idprof1='',$idprof2='',$idprof3='',$idprof4='',$idprof5='',$idprof6='', $email='', $ref_alias='')
-	{
-		global $langs;
-		global $conf;
-
-		if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) return -1;
-
-		$sql = 'SELECT s.rowid, s.nom as name, s.name_alias, s.entity, s.ref_ext, s.ref_int, s.address, s.datec as date_creation, s.prefix_comm';
-		$sql .= ', s.status';
-		$sql .= ', s.price_level';
-		$sql .= ', s.tms as date_modification, s.fk_user_creat, s.fk_user_modif';
-		$sql .= ', s.phone, s.fax, s.email, s.skype, s.twitter, s.facebook, s.url, s.zip, s.town, s.note_private, s.note_public, s.model_pdf, s.client, s.fournisseur';
-		$sql .= ', s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6';
-		$sql .= ', s.capital, s.tva_intra';
-		$sql .= ', s.fk_typent as typent_id';
-		$sql .= ', s.fk_effectif as effectif_id';
-		$sql .= ', s.fk_forme_juridique as forme_juridique_code';
-		$sql .= ', s.webservices_url, s.webservices_key';
-		$sql .= ', s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur, s.parent, s.barcode';
-		$sql .= ', s.fk_departement, s.fk_pays as country_id, s.fk_stcomm, s.remise_client, s.remise_supplier, s.mode_reglement, s.cond_reglement, s.fk_account, s.tva_assuj';
-		$sql .= ', s.mode_reglement_supplier, s.cond_reglement_supplier, s.localtax1_assuj, s.localtax1_value, s.localtax2_assuj, s.localtax2_value, s.fk_prospectlevel, s.default_lang, s.logo';
-		$sql .= ', s.fk_shipping_method';
-		$sql .= ', s.outstanding_limit, s.import_key, s.canvas, s.fk_incoterms, s.location_incoterms';
-		$sql .= ', s.order_min_amount, s.supplier_order_min_amount';
-		$sql .= ', s.fk_multicurrency, s.multicurrency_code';
-		$sql .= ', fj.libelle as forme_juridique';
-		$sql .= ', e.libelle as effectif';
-		$sql .= ', c.code as country_code, c.label as country';
-		$sql .= ', d.code_departement as state_code, d.nom as state';
-		$sql .= ', st.libelle as stcomm';
-		$sql .= ', te.code as typent_code';
-		$sql .= ', i.libelle as libelle_incoterms';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as e ON s.fk_effectif = e.id';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_stcomm as st ON s.fk_stcomm = st.id';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as fj ON s.fk_forme_juridique = fj.code';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as te ON s.fk_typent = te.id';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON s.fk_incoterms = i.rowid';
-
-		$sql .= ' WHERE s.entity IN ('.getEntity($this->element).')';
-		if ($rowid)     $sql .= ' AND s.rowid = '.$rowid;
-		if ($ref)       $sql .= " AND s.nom = '".$this->db->escape($ref)."'";
-		if ($ref_alias) $sql .= " AND s.nom_alias = '".$this->db->escape($ref_alias)."'";
-		if ($ref_ext)   $sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
-		if ($ref_int)   $sql .= " AND s.ref_int = '".$this->db->escape($ref_int)."'";
-		if ($idprof1)   $sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
-		if ($idprof2)   $sql .= " AND s.siret = '".$this->db->escape($idprof2)."'";
-		if ($idprof3)   $sql .= " AND s.ape = '".$this->db->escape($idprof3)."'";
-		if ($idprof4)   $sql .= " AND s.idprof4 = '".$this->db->escape($idprof4)."'";
-		if ($idprof5)   $sql .= " AND s.idprof5 = '".$this->db->escape($idprof5)."'";
-		if ($idprof6)   $sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
-		if ($email)     $sql .= " AND s.email = '".$this->db->escape($email)."'";
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num=$this->db->num_rows($resql);
-			if ($num > 1)
-			{
-				$this->error='Fetch found several records. Rename one of tirdparties to avoid duplicate.';
-				dol_syslog($this->error, LOG_ERR);
-				$result = -2;
-			}
-			elseif ($num)   // $num = 1
-			{
-				$obj = $this->db->fetch_object($resql);
-
-				$this->id           = $obj->rowid;
-				$this->entity       = $obj->entity;
-				$this->canvas		= $obj->canvas;
-
-				$this->ref          = $obj->rowid;
-				$this->name 		= $obj->name;
-				$this->nom          = $obj->name;		// deprecated
-				$this->name_alias = $obj->name_alias;
-				$this->ref_ext      = $obj->ref_ext;
-				$this->ref_int      = $obj->ref_int;
-
-				$this->date_creation     = $this->db->jdate($obj->date_creation);
-				$this->date_modification = $this->db->jdate($obj->date_modification);
-				$this->user_creation     = $obj->fk_user_creat;
-				$this->user_modification = $obj->fk_user_modif;
-
-				$this->address 		= $obj->address;
-				$this->zip 			= $obj->zip;
-				$this->town 		= $obj->town;
-
-				$this->country_id   = $obj->country_id;
-				$this->country_code = $obj->country_id?$obj->country_code:'';
-				$this->country 		= $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):'';
-
-				$this->state_id     = $obj->fk_departement;
-				$this->state_code   = $obj->state_code;
-				$this->state        = ($obj->state!='-'?$obj->state:'');
-
-				$transcode=$langs->trans('StatusProspect'.$obj->fk_stcomm);
-				$libelle=($transcode!='StatusProspect'.$obj->fk_stcomm?$transcode:$obj->stcomm);
-				$this->stcomm_id = $obj->fk_stcomm;     // id statut commercial
-				$this->statut_commercial = $libelle;    // libelle statut commercial
-
-				$this->email = $obj->email;
-				$this->skype = $obj->skype;
-				$this->twitter = $obj->twitter;
-				$this->facebook = $obj->facebook;
-				$this->url = $obj->url;
-				$this->phone = $obj->phone;
-				$this->fax = $obj->fax;
-
-				$this->parent    = $obj->parent;
-
-				$this->idprof1		= $obj->idprof1;
-				$this->idprof2		= $obj->idprof2;
-				$this->idprof3		= $obj->idprof3;
-				$this->idprof4		= $obj->idprof4;
-				$this->idprof5		= $obj->idprof5;
-				$this->idprof6		= $obj->idprof6;
-
-				$this->capital   = $obj->capital;
-
-				$this->code_client = $obj->code_client;
-				$this->code_fournisseur = $obj->code_fournisseur;
-
-				$this->code_compta = $obj->code_compta;
-				$this->code_compta_fournisseur = $obj->code_compta_fournisseur;
-
-				$this->barcode = $obj->barcode;
-
-				$this->tva_assuj      = $obj->tva_assuj;
-				$this->tva_intra      = $obj->tva_intra;
-				$this->status = $obj->status;
-
-				// Local Taxes
-				$this->localtax1_assuj      = $obj->localtax1_assuj;
-				$this->localtax2_assuj      = $obj->localtax2_assuj;
-
-				$this->localtax1_value		= $obj->localtax1_value;
-				$this->localtax2_value		= $obj->localtax2_value;
-
-				$this->typent_id      = $obj->typent_id;
-				$this->typent_code    = $obj->typent_code;
-
-				$this->effectif_id    = $obj->effectif_id;
-				$this->effectif       = $obj->effectif_id?$obj->effectif:'';
-
-				$this->forme_juridique_code= $obj->forme_juridique_code;
-				$this->forme_juridique     = $obj->forme_juridique_code?$obj->forme_juridique:'';
-
-				$this->fk_prospectlevel = $obj->fk_prospectlevel;
-
-				$this->prefix_comm = $obj->prefix_comm;
-
-				$this->remise_percent		= $obj->remise_client;
-				$this->remise_supplier_percent		= $obj->remise_supplier;
-				$this->mode_reglement_id 	= $obj->mode_reglement;
-				$this->cond_reglement_id 	= $obj->cond_reglement;
-				$this->mode_reglement_supplier_id 	= $obj->mode_reglement_supplier;
-				$this->cond_reglement_supplier_id 	= $obj->cond_reglement_supplier;
-				$this->shipping_method_id   = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
-				$this->fk_account			= $obj->fk_account;
-
-				$this->client      = $obj->client;
-				$this->fournisseur = $obj->fournisseur;
-
-				$this->note = $obj->note_private; // TODO Deprecated for backward comtability
-				$this->note_private = $obj->note_private;
-				$this->note_public = $obj->note_public;
-				$this->modelpdf = $obj->model_pdf;
-				$this->default_lang = $obj->default_lang;
-				$this->logo = $obj->logo;
-
-				$this->webservices_url = $obj->webservices_url;
-				$this->webservices_key = $obj->webservices_key;
-
-				$this->outstanding_limit		= $obj->outstanding_limit;
-				$this->order_min_amount			= $obj->order_min_amount;
-				$this->supplier_order_min_amount	= $obj->supplier_order_min_amount;
-
-				// multiprix
-				$this->price_level = $obj->price_level;
-
-				$this->import_key = $obj->import_key;
-
-				//Incoterms
-				$this->fk_incoterms = $obj->fk_incoterms;
-				$this->location_incoterms = $obj->location_incoterms;
-				$this->libelle_incoterms = $obj->libelle_incoterms;
-
-				// multicurrency
-				$this->fk_multicurrency = $obj->fk_multicurrency;
-				$this->multicurrency_code = $obj->multicurrency_code;
-
-				$result = 1;
-
-				// fetch optionals attributes and labels
-				$this->fetch_optionals();
-			}
-			else
-			{
-				$result = 0;
-			}
-
-			$this->db->free($resql);
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			$result = -3;
-		}
-
-		// Use first price level if level not defined for third party
-		if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) $this->price_level=1;
-
-		return $result;
-	}
-
-	/**
-	 *    Delete a third party from database and all its dependencies (contacts, rib...)
-	 *
-	 *    @param	int		$id             Id of third party to delete
-	 *    @param    User    $fuser          User who ask to delete thirparty
-	 *    @param    int		$call_trigger   0=No, 1=yes
-	 *    @return	int						<0 if KO, 0 if nothing done, >0 if OK
-	 */
-	function delete($id, User $fuser=null, $call_trigger=1)
-	{
-		global $langs, $conf, $user;
-
-		if (empty($fuser)) $fuser=$user;
-
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		$entity=isset($this->entity)?$this->entity:$conf->entity;
-
-		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-		$error = 0;
-
-		// Test if child exists
-		$objectisused = $this->isObjectUsed($id);
-		if (empty($objectisused))
-		{
-			$this->db->begin();
-
-			// User is mandatory for trigger call
-			if (! $error && $call_trigger)
-			{
-				// Call trigger
-				$result=$this->call_trigger('COMPANY_DELETE',$fuser);
-				if ($result < 0) $error++;
-				// End call triggers
-			}
-
-			if (! $error)
-			{
-				require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-				$static_cat = new Categorie($this->db);
-				$toute_categs = array();
-
-				// Fill $toute_categs array with an array of (type => array of ("Categorie" instance))
-				if ($this->client || $this->prospect)
-				{
-					$toute_categs['customer'] = $static_cat->containing($this->id,Categorie::TYPE_CUSTOMER);
-				}
-				if ($this->fournisseur)
-				{
-					$toute_categs['supplier'] = $static_cat->containing($this->id,Categorie::TYPE_SUPPLIER);
-				}
-
-				// Remove each "Categorie"
-				foreach ($toute_categs as $type => $categs_type)
-				{
-					foreach ($categs_type as $cat)
-					{
-						$cat->del_type($this, $type);
-					}
-				}
-			}
-
-			foreach ($this->childtablesoncascade as $tabletodelete)
-			{
-				if (! $error)
-				{
-					$sql = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete;
-					$sql.= " WHERE fk_soc = " . $id;
-					if (! $this->db->query($sql))
-					{
-						$error++;
-						$this->errors[] = $this->db->lasterror();
-					}
-				}
-			}
-
-			// Removed extrafields
-			if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
-			{
-				$result=$this->deleteExtraFields();
-				if ($result < 0)
-				{
-					$error++;
-					dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR);
-				}
-			}
-
-			// Remove links to subsidiaries companies
-			if (! $error)
-			{
-				$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
-				$sql.= " SET parent = NULL";
-				$sql.= " WHERE parent = " . $id;
-				if (! $this->db->query($sql))
-				{
-					$error++;
-					$this->errors[] = $this->db->lasterror();
-				}
-			}
-
-			// Remove third party
-			if (! $error)
-			{
-				$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe";
-				$sql.= " WHERE rowid = " . $id;
-				if (! $this->db->query($sql))
-				{
-					$error++;
-					$this->errors[] = $this->db->lasterror();
-				}
-			}
-
-			if (! $error)
-			{
-				$this->db->commit();
-
-				// Delete directory
-				if (! empty($conf->societe->multidir_output[$entity]))
-				{
-					$docdir = $conf->societe->multidir_output[$entity] . "/" . $id;
-					if (dol_is_dir($docdir))
-					{
-						dol_delete_dir_recursive($docdir);
-					}
-				}
-
-				return 1;
-			}
-			else
-			{
-				dol_syslog($this->error, LOG_ERR);
-				$this->db->rollback();
-				return -1;
-			}
-		}
-		else dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
-		return 0;
-	}
+        require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+        $contact=new Contact($this->db);
+
+        $contact->name              = $this->name_bis;
+        $contact->firstname         = $this->firstname;
+        $contact->civility_id       = $this->civility_id;
+        $contact->socid             = $this->id;	// fk_soc
+        $contact->statut            = 1;
+        $contact->priv              = 0;
+        $contact->country_id        = $this->country_id;
+        $contact->state_id          = $this->state_id;
+        $contact->address           = $this->address;
+        $contact->email             = $this->email;
+        $contact->zip               = $this->zip;
+        $contact->town              = $this->town;
+        $contact->phone_pro         = $this->phone;
+
+        $result = $contact->create($user);
+        if ($result < 0)
+        {
+            $this->error = $contact->error;
+            $this->errors = $contact->errors;
+            dol_syslog(get_class($this)."::create_individual ERROR:" . $this->error, LOG_ERR);
+        }
+
+        return $result;
+    }
+
+    /**
+     *    Check properties of third party are ok (like name, third party codes, ...)
+     *    Used before an add or update.
+     *
+     *    @return     int		0 if OK, <0 if KO
+     */
+    function verify()
+    {
+        global $conf, $langs, $mysoc;
+
+        $error = 0;
+        $this->errors=array();
+
+        $result = 0;
+        $this->name	= trim($this->name);
+        $this->nom=$this->name; // For backward compatibility
+
+        if (! $this->name)
+        {
+            $this->errors[] = 'ErrorBadThirdPartyName';
+            $result = -2;
+        }
+
+        if ($this->client)
+        {
+            $rescode = $this->check_codeclient();
+            if ($rescode <> 0)
+            {
+                if ($rescode == -1)
+                {
+                    $this->errors[] = 'ErrorBadCustomerCodeSyntax';
+                }
+                elseif ($rescode == -2)
+                {
+                    $this->errors[] = 'ErrorCustomerCodeRequired';
+                }
+                elseif ($rescode == -3)
+                {
+                    $this->errors[] = 'ErrorCustomerCodeAlreadyUsed';
+                }
+                elseif ($rescode == -4)
+                {
+                    $this->errors[] = 'ErrorPrefixRequired';
+                }
+                $result = -3;
+            }
+        }
+
+        if ($this->fournisseur)
+        {
+            $rescode = $this->check_codefournisseur();
+            if ($rescode <> 0)
+            {
+                if ($rescode == -1)
+                {
+                    $this->errors[] = 'ErrorBadSupplierCodeSyntax';
+                }
+                elseif ($rescode == -2)
+                {
+                    $this->errors[] = 'ErrorSupplierCodeRequired';
+                }
+                elseif ($rescode == -3)
+                {
+                    $this->errors[] = 'ErrorSupplierCodeAlreadyUsed';
+                }
+                elseif ($rescode == -5)
+                {
+                    $this->errors[] = 'ErrorprefixRequired';
+                }
+                $result = -3;
+            }
+        }
+
+        // Check for duplicate or mandatory fields defined into setup
+        $array_to_check=array('IDPROF1','IDPROF2','IDPROF3','IDPROF4','IDPROF5','IDPROF6','EMAIL');
+        foreach($array_to_check as $key)
+        {
+            $keymin=strtolower($key);
+            $i=(int) preg_replace('/[^0-9]/','',$key);
+            $vallabel=$this->$keymin;
+
+            if ($i > 0)
+            {
+                if ($this->isACompany())
+                {
+                    // Check for unicity
+                    if ($vallabel && $this->id_prof_verifiable($i))
+                    {
+                        if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0)))
+                        {
+                            $langs->load("errors");
+                            $error++; $this->errors[] = $langs->transcountry('ProfId'.$i, $this->country_code)." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
+                        }
+                    }
+
+                    // Check for mandatory prof id (but only if country is other than ours)
+                    if ($mysoc->country_id > 0 && $this->country_id == $mysoc->country_id)
+                    {
+                        $idprof_mandatory ='SOCIETE_'.$key.'_MANDATORY';
+                        if (! $vallabel && ! empty($conf->global->$idprof_mandatory))
+                        {
+                            $langs->load("errors");
+                            $error++;
+                            $this->errors[] = $langs->trans("ErrorProdIdIsMandatory", $langs->transcountry('ProfId'.$i, $this->country_code)).' ('.$langs->trans("ForbiddenBySetupRules").')';
+                        }
+                    }
+                }
+            }
+            else
+            {
+                //var_dump($conf->global->SOCIETE_EMAIL_UNIQUE);
+                //var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
+                if ($key == 'EMAIL')
+                {
+                    // Check for unicity
+                    if ($vallabel && ! empty($conf->global->SOCIETE_EMAIL_UNIQUE))
+                    {
+                        if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0)))
+                        {
+                            $langs->load("errors");
+                            $error++; $this->errors[] = $langs->trans('Email')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
+                        }
+                    }
+
+                    // Check for mandatory
+                    if (! empty($conf->global->SOCIETE_EMAIL_MANDATORY) && ! isValidEMail($this->email))
+                    {
+                        $langs->load("errors");
+                        $error++;
+                        $this->errors[] = $langs->trans("ErrorBadEMail", $this->email).' ('.$langs->trans("ForbiddenBySetupRules").')';
+                    }
+                }
+            }
+        }
+
+        if ($error) $result = -4;
+
+        return $result;
+    }
+
+    /**
+     *      Update parameters of third party
+     *
+     *      @param	int		$id              			Id of company (deprecated, use 0 here and call update on an object loaded by a fetch)
+     *      @param  User	$user            			Utilisateur qui demande la mise a jour
+     *      @param  int		$call_trigger    			0=no, 1=yes
+     *		@param	int		$allowmodcodeclient			Inclut modif code client et code compta
+     *		@param	int		$allowmodcodefournisseur	Inclut modif code fournisseur et code compta fournisseur
+     *		@param	string	$action						'add' or 'update' or 'merge'
+     *		@param	int		$nosyncmember				Do not synchronize info of linked member
+     *      @return int  			           			<0 if KO, >=0 if OK
+     */
+    function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0, $action='update', $nosyncmember=1)
+    {
+        global $langs,$conf,$hookmanager;
+
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+        if (empty($id)) $id = $this->id;
+
+        $error=0;
+
+        dol_syslog(get_class($this)."::Update id=".$id." call_trigger=".$call_trigger." allowmodcodeclient=".$allowmodcodeclient." allowmodcodefournisseur=".$allowmodcodefournisseur);
+
+        $now=dol_now();
+
+        // Clean parameters
+        $this->id			= $id;
+        $this->entity		= ((isset($this->entity) && is_numeric($this->entity))?$this->entity:$conf->entity);
+        $this->name			= $this->name?trim($this->name):trim($this->nom);
+        $this->nom			= $this->name;	// For backward compatibility
+        $this->name_alias	= trim($this->name_alias);
+        $this->ref_ext		= trim($this->ref_ext);
+        $this->address		= $this->address?trim($this->address):trim($this->address);
+        $this->zip			= $this->zip?trim($this->zip):trim($this->zip);
+        $this->town			= $this->town?trim($this->town):trim($this->town);
+        $this->state_id		= trim($this->state_id);
+        $this->country_id	= ($this->country_id > 0)?$this->country_id:0;
+        $this->phone		= trim($this->phone);
+        $this->phone		= preg_replace("/\s/","",$this->phone);
+        $this->phone		= preg_replace("/\./","",$this->phone);
+        $this->fax			= trim($this->fax);
+        $this->fax			= preg_replace("/\s/","",$this->fax);
+        $this->fax			= preg_replace("/\./","",$this->fax);
+        $this->email		= trim($this->email);
+        $this->skype		= trim($this->skype);
+        $this->twitter		= trim($this->twitter);
+        $this->facebook		= trim($this->facebook);
+        $this->url			= $this->url?clean_url($this->url,0):'';
+        $this->note_private = trim($this->note_private);
+        $this->note_public  = trim($this->note_public);
+        $this->idprof1		= trim($this->idprof1);
+        $this->idprof2		= trim($this->idprof2);
+        $this->idprof3		= trim($this->idprof3);
+        $this->idprof4		= trim($this->idprof4);
+        $this->idprof5		= (! empty($this->idprof5)?trim($this->idprof5):'');
+        $this->idprof6		= (! empty($this->idprof6)?trim($this->idprof6):'');
+        $this->prefix_comm	= trim($this->prefix_comm);
+        $this->outstanding_limit = price2num($this->outstanding_limit);
+        $this->order_min_amount = price2num($this->order_min_amount);
+        $this->supplier_order_min_amount = price2num($this->supplier_order_min_amount);
+
+        $this->tva_assuj	= trim($this->tva_assuj);
+        $this->tva_intra	= dol_sanitizeFileName($this->tva_intra,'');
+        if (empty($this->status)) $this->status = 0;
+
+        if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+        if (empty($this->fk_multicurrency))
+        {
+            $this->multicurrency_code = '';
+            $this->fk_multicurrency = 0;
+        }
+
+        // Local taxes
+        $this->localtax1_assuj=trim($this->localtax1_assuj);
+        $this->localtax2_assuj=trim($this->localtax2_assuj);
+
+        $this->localtax1_value=trim($this->localtax1_value);
+        $this->localtax2_value=trim($this->localtax2_value);
+
+        if ($this->capital != '') $this->capital=price2num(trim($this->capital));
+        if (! is_numeric($this->capital)) $this->capital = '';     // '' = undef
+
+        $this->effectif_id=trim($this->effectif_id);
+        $this->forme_juridique_code=trim($this->forme_juridique_code);
+
+        //Gencod
+        $this->barcode=trim($this->barcode);
+
+        // For automatic creation
+        if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this,0);
+        if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1);
+
+        $this->code_compta=trim($this->code_compta);
+        $this->code_compta_fournisseur=trim($this->code_compta_fournisseur);
+
+        // Check parameters. More tests are done later in the ->verify()
+        if (! is_numeric($this->client) && ! is_numeric($this->fournisseur))
+        {
+            $langs->load("errors");
+            $this->error = $langs->trans("BadValueForParameterClientOrSupplier");
+            return -1;
+        }
+
+        $customer=false;
+        if (! empty($allowmodcodeclient) && ! empty($this->client))
+        {
+            // Attention get_codecompta peut modifier le code suivant le module utilise
+            if (empty($this->code_compta))
+            {
+                $ret=$this->get_codecompta('customer');
+                if ($ret < 0) return -1;
+            }
+
+            $customer=true;
+        }
+
+        $supplier=false;
+        if (! empty($allowmodcodefournisseur) && ! empty($this->fournisseur))
+        {
+            // Attention get_codecompta peut modifier le code suivant le module utilise
+            if (empty($this->code_compta_fournisseur))
+            {
+                $ret=$this->get_codecompta('supplier');
+                if ($ret < 0) return -1;
+            }
+
+            $supplier=true;
+        }
+
+        //Web services
+        $this->webservices_url = $this->webservices_url?clean_url($this->webservices_url,0):'';
+        $this->webservices_key = trim($this->webservices_key);
+
+        //Incoterms
+        $this->fk_incoterms = (int) $this->fk_incoterms;
+        $this->location_incoterms = trim($this->location_incoterms);
+
+        $this->db->begin();
+
+        // Check name is required and codes are ok or unique.
+        // If error, this->errors[] is filled
+        $result = 0;
+        if ($action != 'add' && $action != 'merge')
+        {
+            // We don't check when update called during a create because verify was already done.
+            // For a merge, we suppose source data is clean and a customer code of a deleted thirdparty must be accepted into a target thirdparty with empty code without duplicate error
+            $result = $this->verify();
+
+            // If there is only one error and error is ErrorBadCustomerCodeSyntax and we don't change customer code, we allow the update
+            // So we can update record that were using and old numbering rule.
+            if (is_array($this->errors))
+            {
+                if (in_array('ErrorBadCustomerCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_client == $this->code_client)
+                {
+                    if (($key = array_search('ErrorBadCustomerCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]);	// Remove error message
+                }
+                if (in_array('ErrorBadSupplierCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_fournisseur == $this->code_fournisseur)
+                {
+                    if (($key = array_search('ErrorBadSupplierCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]);	// Remove error message
+                }
+                if (empty($this->errors))	// If there is no more error, we can make like if there is no error at all
+                {
+                    $result = 0;
+                }
+            }
+        }
+
+        if ($result >= 0)
+        {
+            dol_syslog(get_class($this)."::update verify ok or not done");
+
+            $sql  = "UPDATE ".MAIN_DB_PREFIX."societe SET ";
+            $sql .= "entity = " . $this->db->escape($this->entity);
+            $sql .= ",nom = '" . $this->db->escape($this->name) ."'"; // Required
+            $sql .= ",name_alias = '" . $this->db->escape($this->name_alias) ."'";
+            $sql .= ",ref_ext = " .(! empty($this->ref_ext)?"'".$this->db->escape($this->ref_ext) ."'":"null");
+            $sql .= ",address = '" . $this->db->escape($this->address) ."'";
+
+            $sql .= ",zip = ".(! empty($this->zip)?"'".$this->db->escape($this->zip)."'":"null");
+            $sql .= ",town = ".(! empty($this->town)?"'".$this->db->escape($this->town)."'":"null");
+
+            $sql .= ",fk_departement = '" . (! empty($this->state_id)?$this->state_id:'0') ."'";
+            $sql .= ",fk_pays = '" . (! empty($this->country_id)?$this->country_id:'0') ."'";
+
+            $sql .= ",phone = ".(! empty($this->phone)?"'".$this->db->escape($this->phone)."'":"null");
+            $sql .= ",fax = ".(! empty($this->fax)?"'".$this->db->escape($this->fax)."'":"null");
+            $sql .= ",email = ".(! empty($this->email)?"'".$this->db->escape($this->email)."'":"null");
+            $sql .= ",skype = ".(! empty($this->skype)?"'".$this->db->escape($this->skype)."'":"null");
+            $sql .= ",twitter = ".(! empty($this->twitter)?"'".$this->db->escape($this->twitter)."'":"null");
+            $sql .= ",facebook = ".(! empty($this->facebook)?"'".$this->db->escape($this->facebook)."'":"null");
+            $sql .= ",url = ".(! empty($this->url)?"'".$this->db->escape($this->url)."'":"null");
+
+            $sql .= ",parent = " . ($this->parent > 0 ? $this->parent : "null");
+
+            $sql .= ",note_private = ".(! empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
+            $sql .= ",note_public = ".(! empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
+
+            $sql .= ",siren   = '". $this->db->escape($this->idprof1) ."'";
+            $sql .= ",siret   = '". $this->db->escape($this->idprof2) ."'";
+            $sql .= ",ape     = '". $this->db->escape($this->idprof3) ."'";
+            $sql .= ",idprof4 = '". $this->db->escape($this->idprof4) ."'";
+            $sql .= ",idprof5 = '". $this->db->escape($this->idprof5) ."'";
+            $sql .= ",idprof6 = '". $this->db->escape($this->idprof6) ."'";
+
+            $sql .= ",tva_assuj = ".($this->tva_assuj!=''?"'".$this->db->escape($this->tva_assuj)."'":"null");
+            $sql .= ",tva_intra = '" . $this->db->escape($this->tva_intra) ."'";
+            $sql .= ",status = " .$this->status;
+
+            // Local taxes
+            $sql .= ",localtax1_assuj = ".($this->localtax1_assuj!=''?"'".$this->db->escape($this->localtax1_assuj)."'":"null");
+            $sql .= ",localtax2_assuj = ".($this->localtax2_assuj!=''?"'".$this->db->escape($this->localtax2_assuj)."'":"null");
+            if($this->localtax1_assuj==1)
+            {
+                if($this->localtax1_value!='')
+                {
+                    $sql .=",localtax1_value =".$this->localtax1_value;
+                }
+                else $sql .=",localtax1_value =0.000";
+            }
+            else $sql .=",localtax1_value =0.000";
+
+            if($this->localtax2_assuj==1)
+            {
+                if($this->localtax2_value!='')
+                {
+                    $sql .=",localtax2_value =".$this->localtax2_value;
+                }
+                else $sql .=",localtax2_value =0.000";
+            }
+            else $sql .=",localtax2_value =0.000";
+
+            $sql .= ",capital = ".($this->capital == '' ? "null" : $this->capital);
+
+            $sql .= ",prefix_comm = ".(! empty($this->prefix_comm)?"'".$this->db->escape($this->prefix_comm)."'":"null");
+
+            $sql .= ",fk_effectif = ".(! empty($this->effectif_id)?"'".$this->db->escape($this->effectif_id)."'":"null");
+            if (isset($this->stcomm_id))
+            {
+                $sql .= ",fk_stcomm=".(!empty($this->stcomm_id)  ? $this->stcomm_id : "0");
+            }
+            $sql .= ",fk_typent = ".(! empty($this->typent_id)?"'".$this->db->escape($this->typent_id)."'":"0");
+
+            $sql .= ",fk_forme_juridique = ".(! empty($this->forme_juridique_code)?"'".$this->db->escape($this->forme_juridique_code)."'":"null");
+
+            $sql .= ",mode_reglement = ".(! empty($this->mode_reglement_id)?"'".$this->db->escape($this->mode_reglement_id)."'":"null");
+            $sql .= ",cond_reglement = ".(! empty($this->cond_reglement_id)?"'".$this->db->escape($this->cond_reglement_id)."'":"null");
+            $sql .= ",mode_reglement_supplier = ".(! empty($this->mode_reglement_supplier_id)?"'".$this->db->escape($this->mode_reglement_supplier_id)."'":"null");
+            $sql .= ",cond_reglement_supplier = ".(! empty($this->cond_reglement_supplier_id)?"'".$this->db->escape($this->cond_reglement_supplier_id)."'":"null");
+            $sql .= ",fk_shipping_method = ".(! empty($this->shipping_method_id)?"'".$this->db->escape($this->shipping_method_id)."'":"null");
+
+            $sql .= ",client = " . (! empty($this->client)?$this->client:0);
+            $sql .= ",fournisseur = " . (! empty($this->fournisseur)?$this->fournisseur:0);
+            $sql .= ",barcode = ".(! empty($this->barcode)?"'".$this->db->escape($this->barcode)."'":"null");
+            $sql .= ",default_lang = ".(! empty($this->default_lang)?"'".$this->db->escape($this->default_lang)."'":"null");
+            $sql .= ",logo = ".(! empty($this->logo)?"'".$this->db->escape($this->logo)."'":"null");
+            $sql .= ",outstanding_limit= ".($this->outstanding_limit!=''?$this->outstanding_limit:'null');
+            $sql .= ",order_min_amount= ".($this->order_min_amount!=''?$this->order_min_amount:'null');
+            $sql .= ",supplier_order_min_amount= ".($this->supplier_order_min_amount!=''?$this->supplier_order_min_amount:'null');
+            $sql .= ",fk_prospectlevel='".$this->db->escape($this->fk_prospectlevel)."'";
+
+            $sql .= ",webservices_url = ".(! empty($this->webservices_url)?"'".$this->db->escape($this->webservices_url)."'":"null");
+            $sql .= ",webservices_key = ".(! empty($this->webservices_key)?"'".$this->db->escape($this->webservices_key)."'":"null");
+
+            //Incoterms
+            $sql.= ", fk_incoterms = ".$this->fk_incoterms;
+            $sql.= ", location_incoterms = ".(! empty($this->location_incoterms)?"'".$this->db->escape($this->location_incoterms)."'":"null");
+
+            if ($customer)
+            {
+                $sql .= ", code_client = ".(! empty($this->code_client)?"'".$this->db->escape($this->code_client)."'":"null");
+                $sql .= ", code_compta = ".(! empty($this->code_compta)?"'".$this->db->escape($this->code_compta)."'":"null");
+            }
+
+            if ($supplier)
+            {
+                $sql .= ", code_fournisseur = ".(! empty($this->code_fournisseur)?"'".$this->db->escape($this->code_fournisseur)."'":"null");
+                $sql .= ", code_compta_fournisseur = ".(! empty($this->code_compta_fournisseur)?"'".$this->db->escape($this->code_compta_fournisseur)."'":"null");
+            }
+            $sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id:"null");
+            $sql .= ", fk_multicurrency = ".(int) $this->fk_multicurrency;
+            $sql .= ", multicurrency_code = '".$this->db->escape($this->multicurrency_code)."'";
+            $sql .= " WHERE rowid = " . (int) $id;
+
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                if (is_object($this->oldcopy))	// If we have information on old values
+                {
+                    if ($this->oldcopy->country_id != $this->country_id)
+                    {
+                        unset($this->country_code);
+                        unset($this->country);
+                    }
+                    if ($this->oldcopy->state_id != $this->state_id)
+                    {
+                        unset($this->state_code);
+                        unset($this->state);
+                    }
+                }
+                else
+                {
+                    unset($this->country_code);	// We clean this, in the doubt, because it may have been changed after an update of country_id
+                    unset($this->country);
+                    unset($this->state_code);
+                    unset($this->state);
+                }
+
+                $nbrowsaffected = $this->db->affected_rows($resql);
+
+                if (! $error && $nbrowsaffected)
+                {
+                    // Update information on linked member if it is an update
+                    if (! $nosyncmember && ! empty($conf->adherent->enabled))
+                    {
+                        require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+
+                        dol_syslog(get_class($this)."::update update linked member");
+
+                        $lmember=new Adherent($this->db);
+                        $result=$lmember->fetch(0, 0, $this->id);
+
+                        if ($result > 0)
+                        {
+                            $lmember->societe=$this->name;
+                            //$lmember->firstname=$this->firstname?$this->firstname:$lmember->firstname;	// We keep firstname and lastname of member unchanged
+                            //$lmember->lastname=$this->lastname?$this->lastname:$lmember->lastname;		// We keep firstname and lastname of member unchanged
+                            $lmember->address=$this->address;
+                            $lmember->email=$this->email;
+                            $lmember->skype=$this->skype;
+                            $lmember->twitter=$this->twitter;
+                            $lmember->facebook=$this->facebook;
+                            $lmember->phone=$this->phone;
+
+                            $result=$lmember->update($user,0,1,1,1);	// Use nosync to 1 to avoid cyclic updates
+                            if ($result < 0)
+                            {
+                                $this->error=$lmember->error;
+                                dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
+                                $error++;
+                            }
+                        }
+                        elseif ($result < 0)
+                        {
+                            $this->error=$lmember->error;
+                            $error++;
+                        }
+                    }
+                }
+
+                $action='update';
+
+                // Actions on extra fields
+                if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+                {
+                    $result=$this->insertExtraFields();
+                    if ($result < 0)
+                    {
+                        $error++;
+                    }
+                }
+
+                if (! $error && $call_trigger)
+                {
+                    // Call trigger
+                    $result=$this->call_trigger('COMPANY_MODIFY',$user);
+                    if ($result < 0) $error++;
+                    // End call triggers
+                }
+
+                if (! $error)
+                {
+                    dol_syslog(get_class($this)."::Update success");
+                    $this->db->commit();
+                    return 1;
+                }
+                else
+                {
+                    $this->db->rollback();
+                    return -1;
+                }
+            }
+            else
+            {
+                if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+                {
+                    // Doublon
+                    $this->error = $langs->trans("ErrorDuplicateField");
+                    $result = -1;
+                }
+                else
+                {
+                    $this->error = $this->db->lasterror();
+                    $result = -2;
+                }
+                $this->db->rollback();
+                return $result;
+            }
+        }
+        else
+        {
+            $this->db->rollback();
+            dol_syslog(get_class($this)."::Update fails verify ".join(',',$this->errors), LOG_WARNING);
+            return -3;
+        }
+    }
+
+    /**
+     *    Load a third party from database into memory
+     *
+     *    @param	int		$rowid			Id of third party to load
+     *    @param    string	$ref			Reference of third party, name (Warning, this can return several records)
+     *    @param    string	$ref_ext       	External reference of third party (Warning, this information is a free field not provided by Dolibarr)
+     *    @param    string	$ref_int       	Internal reference of third party (not used by dolibarr)
+     *    @param    string	$idprof1		Prof id 1 of third party (Warning, this can return several records)
+     *    @param    string	$idprof2		Prof id 2 of third party (Warning, this can return several records)
+     *    @param    string	$idprof3		Prof id 3 of third party (Warning, this can return several records)
+     *    @param    string	$idprof4		Prof id 4 of third party (Warning, this can return several records)
+     *    @param    string	$idprof5		Prof id 5 of third party (Warning, this can return several records)
+     *    @param    string	$idprof6		Prof id 6 of third party (Warning, this can return several records)
+     *    @param    string	$email   		Email of third party (Warning, this can return several records)
+     *    @param    string	$ref_alias 		Name_alias of third party (Warning, this can return several records)
+     *    @return   int						>0 if OK, <0 if KO or if two records found for same ref or idprof, 0 if not found.
+     */
+    function fetch($rowid, $ref='', $ref_ext='', $ref_int='', $idprof1='',$idprof2='',$idprof3='',$idprof4='',$idprof5='',$idprof6='', $email='', $ref_alias='')
+    {
+        global $langs;
+        global $conf;
+
+        if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) return -1;
+
+        $sql = 'SELECT s.rowid, s.nom as name, s.name_alias, s.entity, s.ref_ext, s.ref_int, s.address, s.datec as date_creation, s.prefix_comm';
+        $sql .= ', s.status';
+        $sql .= ', s.price_level';
+        $sql .= ', s.tms as date_modification, s.fk_user_creat, s.fk_user_modif';
+        $sql .= ', s.phone, s.fax, s.email, s.skype, s.twitter, s.facebook, s.url, s.zip, s.town, s.note_private, s.note_public, s.model_pdf, s.client, s.fournisseur';
+        $sql .= ', s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6';
+        $sql .= ', s.capital, s.tva_intra';
+        $sql .= ', s.fk_typent as typent_id';
+        $sql .= ', s.fk_effectif as effectif_id';
+        $sql .= ', s.fk_forme_juridique as forme_juridique_code';
+        $sql .= ', s.webservices_url, s.webservices_key';
+        $sql .= ', s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur, s.parent, s.barcode';
+        $sql .= ', s.fk_departement, s.fk_pays as country_id, s.fk_stcomm, s.remise_client, s.remise_supplier, s.mode_reglement, s.cond_reglement, s.fk_account, s.tva_assuj';
+        $sql .= ', s.mode_reglement_supplier, s.cond_reglement_supplier, s.localtax1_assuj, s.localtax1_value, s.localtax2_assuj, s.localtax2_value, s.fk_prospectlevel, s.default_lang, s.logo';
+        $sql .= ', s.fk_shipping_method';
+        $sql .= ', s.outstanding_limit, s.import_key, s.canvas, s.fk_incoterms, s.location_incoterms';
+        $sql .= ', s.order_min_amount, s.supplier_order_min_amount';
+        $sql .= ', s.fk_multicurrency, s.multicurrency_code';
+        $sql .= ', fj.libelle as forme_juridique';
+        $sql .= ', e.libelle as effectif';
+        $sql .= ', c.code as country_code, c.label as country';
+        $sql .= ', d.code_departement as state_code, d.nom as state';
+        $sql .= ', st.libelle as stcomm';
+        $sql .= ', te.code as typent_code';
+        $sql .= ', i.libelle as libelle_incoterms';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as e ON s.fk_effectif = e.id';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_stcomm as st ON s.fk_stcomm = st.id';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as fj ON s.fk_forme_juridique = fj.code';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as te ON s.fk_typent = te.id';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON s.fk_incoterms = i.rowid';
+
+        $sql .= ' WHERE s.entity IN ('.getEntity($this->element).')';
+        if ($rowid)     $sql .= ' AND s.rowid = '.$rowid;
+        if ($ref)       $sql .= " AND s.nom = '".$this->db->escape($ref)."'";
+        if ($ref_alias) $sql .= " AND s.nom_alias = '".$this->db->escape($ref_alias)."'";
+        if ($ref_ext)   $sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
+        if ($ref_int)   $sql .= " AND s.ref_int = '".$this->db->escape($ref_int)."'";
+        if ($idprof1)   $sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
+        if ($idprof2)   $sql .= " AND s.siret = '".$this->db->escape($idprof2)."'";
+        if ($idprof3)   $sql .= " AND s.ape = '".$this->db->escape($idprof3)."'";
+        if ($idprof4)   $sql .= " AND s.idprof4 = '".$this->db->escape($idprof4)."'";
+        if ($idprof5)   $sql .= " AND s.idprof5 = '".$this->db->escape($idprof5)."'";
+        if ($idprof6)   $sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
+        if ($email)     $sql .= " AND s.email = '".$this->db->escape($email)."'";
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num=$this->db->num_rows($resql);
+            if ($num > 1)
+            {
+                $this->error='Fetch found several records. Rename one of tirdparties to avoid duplicate.';
+                dol_syslog($this->error, LOG_ERR);
+                $result = -2;
+            }
+            elseif ($num)   // $num = 1
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                $this->id           = $obj->rowid;
+                $this->entity       = $obj->entity;
+                $this->canvas		= $obj->canvas;
+
+                $this->ref          = $obj->rowid;
+                $this->name 		= $obj->name;
+                $this->nom          = $obj->name;		// deprecated
+                $this->name_alias = $obj->name_alias;
+                $this->ref_ext      = $obj->ref_ext;
+                $this->ref_int      = $obj->ref_int;
+
+                $this->date_creation     = $this->db->jdate($obj->date_creation);
+                $this->date_modification = $this->db->jdate($obj->date_modification);
+                $this->user_creation     = $obj->fk_user_creat;
+                $this->user_modification = $obj->fk_user_modif;
+
+                $this->address 		= $obj->address;
+                $this->zip 			= $obj->zip;
+                $this->town 		= $obj->town;
+
+                $this->country_id   = $obj->country_id;
+                $this->country_code = $obj->country_id?$obj->country_code:'';
+                $this->country 		= $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):'';
+
+                $this->state_id     = $obj->fk_departement;
+                $this->state_code   = $obj->state_code;
+                $this->state        = ($obj->state!='-'?$obj->state:'');
+
+                $transcode=$langs->trans('StatusProspect'.$obj->fk_stcomm);
+                $libelle=($transcode!='StatusProspect'.$obj->fk_stcomm?$transcode:$obj->stcomm);
+                $this->stcomm_id = $obj->fk_stcomm;     // id statut commercial
+                $this->statut_commercial = $libelle;    // libelle statut commercial
+
+                $this->email = $obj->email;
+                $this->skype = $obj->skype;
+                $this->twitter = $obj->twitter;
+                $this->facebook = $obj->facebook;
+                $this->url = $obj->url;
+                $this->phone = $obj->phone;
+                $this->fax = $obj->fax;
+
+                $this->parent    = $obj->parent;
+
+                $this->idprof1		= $obj->idprof1;
+                $this->idprof2		= $obj->idprof2;
+                $this->idprof3		= $obj->idprof3;
+                $this->idprof4		= $obj->idprof4;
+                $this->idprof5		= $obj->idprof5;
+                $this->idprof6		= $obj->idprof6;
+
+                $this->capital   = $obj->capital;
+
+                $this->code_client = $obj->code_client;
+                $this->code_fournisseur = $obj->code_fournisseur;
+
+                $this->code_compta = $obj->code_compta;
+                $this->code_compta_fournisseur = $obj->code_compta_fournisseur;
+
+                $this->barcode = $obj->barcode;
+
+                $this->tva_assuj      = $obj->tva_assuj;
+                $this->tva_intra      = $obj->tva_intra;
+                $this->status = $obj->status;
+
+                // Local Taxes
+                $this->localtax1_assuj      = $obj->localtax1_assuj;
+                $this->localtax2_assuj      = $obj->localtax2_assuj;
+
+                $this->localtax1_value		= $obj->localtax1_value;
+                $this->localtax2_value		= $obj->localtax2_value;
+
+                $this->typent_id      = $obj->typent_id;
+                $this->typent_code    = $obj->typent_code;
+
+                $this->effectif_id    = $obj->effectif_id;
+                $this->effectif       = $obj->effectif_id?$obj->effectif:'';
+
+                $this->forme_juridique_code= $obj->forme_juridique_code;
+                $this->forme_juridique     = $obj->forme_juridique_code?$obj->forme_juridique:'';
+
+                $this->fk_prospectlevel = $obj->fk_prospectlevel;
+
+                $this->prefix_comm = $obj->prefix_comm;
+
+                $this->remise_percent		= $obj->remise_client;
+                $this->remise_supplier_percent		= $obj->remise_supplier;
+                $this->mode_reglement_id 	= $obj->mode_reglement;
+                $this->cond_reglement_id 	= $obj->cond_reglement;
+                $this->mode_reglement_supplier_id 	= $obj->mode_reglement_supplier;
+                $this->cond_reglement_supplier_id 	= $obj->cond_reglement_supplier;
+                $this->shipping_method_id   = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
+                $this->fk_account			= $obj->fk_account;
+
+                $this->client      = $obj->client;
+                $this->fournisseur = $obj->fournisseur;
+
+                $this->note = $obj->note_private; // TODO Deprecated for backward comtability
+                $this->note_private = $obj->note_private;
+                $this->note_public = $obj->note_public;
+                $this->modelpdf = $obj->model_pdf;
+                $this->default_lang = $obj->default_lang;
+                $this->logo = $obj->logo;
+
+                $this->webservices_url = $obj->webservices_url;
+                $this->webservices_key = $obj->webservices_key;
+
+                $this->outstanding_limit		= $obj->outstanding_limit;
+                $this->order_min_amount			= $obj->order_min_amount;
+                $this->supplier_order_min_amount	= $obj->supplier_order_min_amount;
+
+                // multiprix
+                $this->price_level = $obj->price_level;
+
+                $this->import_key = $obj->import_key;
+
+                //Incoterms
+                $this->fk_incoterms = $obj->fk_incoterms;
+                $this->location_incoterms = $obj->location_incoterms;
+                $this->libelle_incoterms = $obj->libelle_incoterms;
+
+                // multicurrency
+                $this->fk_multicurrency = $obj->fk_multicurrency;
+                $this->multicurrency_code = $obj->multicurrency_code;
+
+                $result = 1;
+
+                // fetch optionals attributes and labels
+                $this->fetch_optionals();
+            }
+            else
+            {
+                $result = 0;
+            }
+
+            $this->db->free($resql);
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            $result = -3;
+        }
+
+        // Use first price level if level not defined for third party
+        if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) $this->price_level=1;
+
+        return $result;
+    }
+
+    /**
+     *    Delete a third party from database and all its dependencies (contacts, rib...)
+     *
+     *    @param	int		$id             Id of third party to delete
+     *    @param    User    $fuser          User who ask to delete thirparty
+     *    @param    int		$call_trigger   0=No, 1=yes
+     *    @return	int						<0 if KO, 0 if nothing done, >0 if OK
+     */
+    function delete($id, User $fuser=null, $call_trigger=1)
+    {
+        global $langs, $conf, $user;
+
+        if (empty($fuser)) $fuser=$user;
+
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+        $entity=isset($this->entity)?$this->entity:$conf->entity;
+
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+        $error = 0;
+
+        // Test if child exists
+        $objectisused = $this->isObjectUsed($id);
+        if (empty($objectisused))
+        {
+            $this->db->begin();
+
+            // User is mandatory for trigger call
+            if (! $error && $call_trigger)
+            {
+                // Call trigger
+                $result=$this->call_trigger('COMPANY_DELETE',$fuser);
+                if ($result < 0) $error++;
+                // End call triggers
+            }
+
+            if (! $error)
+            {
+                require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+                $static_cat = new Categorie($this->db);
+                $toute_categs = array();
+
+                // Fill $toute_categs array with an array of (type => array of ("Categorie" instance))
+                if ($this->client || $this->prospect)
+                {
+                    $toute_categs['customer'] = $static_cat->containing($this->id,Categorie::TYPE_CUSTOMER);
+                }
+                if ($this->fournisseur)
+                {
+                    $toute_categs['supplier'] = $static_cat->containing($this->id,Categorie::TYPE_SUPPLIER);
+                }
+
+                // Remove each "Categorie"
+                foreach ($toute_categs as $type => $categs_type)
+                {
+                    foreach ($categs_type as $cat)
+                    {
+                        $cat->del_type($this, $type);
+                    }
+                }
+            }
+
+            foreach ($this->childtablesoncascade as $tabletodelete)
+            {
+                if (! $error)
+                {
+                    $sql = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete;
+                    $sql.= " WHERE fk_soc = " . $id;
+                    if (! $this->db->query($sql))
+                    {
+                        $error++;
+                        $this->errors[] = $this->db->lasterror();
+                    }
+                }
+            }
+
+            // Removed extrafields
+            if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+            {
+                $result=$this->deleteExtraFields();
+                if ($result < 0)
+                {
+                    $error++;
+                    dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR);
+                }
+            }
+
+            // Remove links to subsidiaries companies
+            if (! $error)
+            {
+                $sql = "UPDATE ".MAIN_DB_PREFIX."societe";
+                $sql.= " SET parent = NULL";
+                $sql.= " WHERE parent = " . $id;
+                if (! $this->db->query($sql))
+                {
+                    $error++;
+                    $this->errors[] = $this->db->lasterror();
+                }
+            }
+
+            // Remove third party
+            if (! $error)
+            {
+                $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe";
+                $sql.= " WHERE rowid = " . $id;
+                if (! $this->db->query($sql))
+                {
+                    $error++;
+                    $this->errors[] = $this->db->lasterror();
+                }
+            }
+
+            if (! $error)
+            {
+                $this->db->commit();
+
+                // Delete directory
+                if (! empty($conf->societe->multidir_output[$entity]))
+                {
+                    $docdir = $conf->societe->multidir_output[$entity] . "/" . $id;
+                    if (dol_is_dir($docdir))
+                    {
+                        dol_delete_dir_recursive($docdir);
+                    }
+                }
+
+                return 1;
+            }
+            else
+            {
+                dol_syslog($this->error, LOG_ERR);
+                $this->db->rollback();
+                return -1;
+            }
+        }
+        else dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
+        return 0;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Define third party as a customer
-	 *
-	 *	@return		int		<0 if KO, >0 if OK
-	 */
-	function set_as_client()
-	{
+    /**
+     *  Define third party as a customer
+     *
+     *	@return		int		<0 if KO, >0 if OK
+     */
+    function set_as_client()
+    {
         // phpcs:enable
-		if ($this->id)
-		{
-			$newclient=1;
-			if ($this->client == 2 || $this->client == 3) $newclient=3;	//If prospect, we keep prospect tag
-			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
-			$sql.= " SET client = ".$newclient;
-			$sql.= " WHERE rowid = " . $this->id;
-
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				$this->client = $newclient;
-				return 1;
-			}
-			else return -1;
-		}
-		return 0;
-	}
+        if ($this->id)
+        {
+            $newclient=1;
+            if ($this->client == 2 || $this->client == 3) $newclient=3;	//If prospect, we keep prospect tag
+            $sql = "UPDATE ".MAIN_DB_PREFIX."societe";
+            $sql.= " SET client = ".$newclient;
+            $sql.= " WHERE rowid = " . $this->id;
+
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                $this->client = $newclient;
+                return 1;
+            }
+            else return -1;
+        }
+        return 0;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Definit la societe comme un client
-	 *
-	 *  @param	float	$remise		Valeur en % de la remise
-	 *  @param  string	$note		Note/Motif de modification de la remise
-	 *  @param  User	$user		Utilisateur qui definie la remise
-	 *	@return	int					<0 if KO, >0 if OK
-	 */
-	function set_remise_client($remise, $note, User $user)
-	{
+    /**
+     *  Definit la societe comme un client
+     *
+     *  @param	float	$remise		Valeur en % de la remise
+     *  @param  string	$note		Note/Motif de modification de la remise
+     *  @param  User	$user		Utilisateur qui definie la remise
+     *	@return	int					<0 if KO, >0 if OK
+     */
+    function set_remise_client($remise, $note, User $user)
+    {
         // phpcs:enable
-		global $conf, $langs;
-
-		// Nettoyage parametres
-		$note=trim($note);
-		if (! $note)
-		{
-			$this->error=$langs->trans("ErrorFieldRequired",$langs->trans("NoteReason"));
-			return -2;
-		}
-
-		dol_syslog(get_class($this)."::set_remise_client ".$remise.", ".$note.", ".$user->id);
-
-		if ($this->id)
-		{
-			$this->db->begin();
-
-			$now=dol_now();
-
-			// Positionne remise courante
-			$sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
-			$sql.= " SET remise_client = '".$this->db->escape($remise)."'";
-			$sql.= " WHERE rowid = " . $this->id;
-			$resql=$this->db->query($sql);
-			if (! $resql)
-			{
-				$this->db->rollback();
-				$this->error=$this->db->error();
-				return -1;
-			}
-
-			// Ecrit trace dans historique des remises
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise";
-			$sql.= " (entity, datec, fk_soc, remise_client, note, fk_user_author)";
-			$sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
-			$sql.= " '".$this->db->escape($note)."',";
-			$sql.= " ".$user->id;
-			$sql.= ")";
-
-			$resql=$this->db->query($sql);
-			if (! $resql)
-			{
-				$this->db->rollback();
-				$this->error=$this->db->lasterror();
-				return -1;
-			}
-
-			$this->db->commit();
-			return 1;
-		}
-	}
+        global $conf, $langs;
+
+        // Nettoyage parametres
+        $note=trim($note);
+        if (! $note)
+        {
+            $this->error=$langs->trans("ErrorFieldRequired",$langs->trans("NoteReason"));
+            return -2;
+        }
+
+        dol_syslog(get_class($this)."::set_remise_client ".$remise.", ".$note.", ".$user->id);
+
+        if ($this->id)
+        {
+            $this->db->begin();
+
+            $now=dol_now();
+
+            // Positionne remise courante
+            $sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
+            $sql.= " SET remise_client = '".$this->db->escape($remise)."'";
+            $sql.= " WHERE rowid = " . $this->id;
+            $resql=$this->db->query($sql);
+            if (! $resql)
+            {
+                $this->db->rollback();
+                $this->error=$this->db->error();
+                return -1;
+            }
+
+            // Ecrit trace dans historique des remises
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise";
+            $sql.= " (entity, datec, fk_soc, remise_client, note, fk_user_author)";
+            $sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
+            $sql.= " '".$this->db->escape($note)."',";
+            $sql.= " ".$user->id;
+            $sql.= ")";
+
+            $resql=$this->db->query($sql);
+            if (! $resql)
+            {
+                $this->db->rollback();
+                $this->error=$this->db->lasterror();
+                return -1;
+            }
+
+            $this->db->commit();
+            return 1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Definit la societe comme un client
-	 *
-	 *  @param	float	$remise		Valeur en % de la remise
-	 *  @param  string	$note		Note/Motif de modification de la remise
-	 *  @param  User	$user		Utilisateur qui definie la remise
-	 *	@return	int					<0 if KO, >0 if OK
-	 */
-	function set_remise_supplier($remise, $note, User $user)
-	{
+    /**
+     *  Definit la societe comme un client
+     *
+     *  @param	float	$remise		Valeur en % de la remise
+     *  @param  string	$note		Note/Motif de modification de la remise
+     *  @param  User	$user		Utilisateur qui definie la remise
+     *	@return	int					<0 if KO, >0 if OK
+     */
+    function set_remise_supplier($remise, $note, User $user)
+    {
         // phpcs:enable
-		global $conf, $langs;
-
-		// Nettoyage parametres
-		$note=trim($note);
-		if (! $note)
-		{
-			$this->error=$langs->trans("ErrorFieldRequired",$langs->trans("NoteReason"));
-			return -2;
-		}
-
-		dol_syslog(get_class($this)."::set_remise_supplier ".$remise.", ".$note.", ".$user->id);
-
-		if ($this->id)
-		{
-			$this->db->begin();
-
-			$now=dol_now();
-
-			// Positionne remise courante
-			$sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
-			$sql.= " SET remise_supplier = '".$this->db->escape($remise)."'";
-			$sql.= " WHERE rowid = " . $this->id;
-			$resql=$this->db->query($sql);
-			if (! $resql)
-			{
-				$this->db->rollback();
-				$this->error=$this->db->error();
-				return -1;
-			}
-
-			// Ecrit trace dans historique des remises
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_supplier";
-			$sql.= " (entity, datec, fk_soc, remise_supplier, note, fk_user_author)";
-			$sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
-			$sql.= " '".$this->db->escape($note)."',";
-			$sql.= " ".$user->id;
-			$sql.= ")";
-
-			$resql=$this->db->query($sql);
-			if (! $resql)
-			{
-				$this->db->rollback();
-				$this->error=$this->db->lasterror();
-				return -1;
-			}
-
-			$this->db->commit();
-			return 1;
-		}
-	}
+        global $conf, $langs;
+
+        // Nettoyage parametres
+        $note=trim($note);
+        if (! $note)
+        {
+            $this->error=$langs->trans("ErrorFieldRequired",$langs->trans("NoteReason"));
+            return -2;
+        }
+
+        dol_syslog(get_class($this)."::set_remise_supplier ".$remise.", ".$note.", ".$user->id);
+
+        if ($this->id)
+        {
+            $this->db->begin();
+
+            $now=dol_now();
+
+            // Positionne remise courante
+            $sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
+            $sql.= " SET remise_supplier = '".$this->db->escape($remise)."'";
+            $sql.= " WHERE rowid = " . $this->id;
+            $resql=$this->db->query($sql);
+            if (! $resql)
+            {
+                $this->db->rollback();
+                $this->error=$this->db->error();
+                return -1;
+            }
+
+            // Ecrit trace dans historique des remises
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_supplier";
+            $sql.= " (entity, datec, fk_soc, remise_supplier, note, fk_user_author)";
+            $sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
+            $sql.= " '".$this->db->escape($note)."',";
+            $sql.= " ".$user->id;
+            $sql.= ")";
+
+            $resql=$this->db->query($sql);
+            if (! $resql)
+            {
+                $this->db->rollback();
+                $this->error=$this->db->lasterror();
+                return -1;
+            }
+
+            $this->db->commit();
+            return 1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    	Add a discount for third party
-	 *
-	 *    	@param	float	$remise     	Amount of discount
-	 *    	@param  User	$user       	User adding discount
-	 *    	@param  string	$desc			Reason of discount
-	 *      @param  float	$tva_tx     	VAT rate
-	 *      @param	int		$discount_type	0 => customer discount, 1 => supplier discount
-	 *		@return	int					<0 if KO, id of discount record if OK
-	 */
-	function set_remise_except($remise, User $user, $desc, $tva_tx=0, $discount_type=0)
-	{
+    /**
+     *    	Add a discount for third party
+     *
+     *    	@param	float	$remise     	Amount of discount
+     *    	@param  User	$user       	User adding discount
+     *    	@param  string	$desc			Reason of discount
+     *      @param  float	$tva_tx     	VAT rate
+     *      @param	int		$discount_type	0 => customer discount, 1 => supplier discount
+     *		@return	int					<0 if KO, id of discount record if OK
+     */
+    function set_remise_except($remise, User $user, $desc, $tva_tx=0, $discount_type=0)
+    {
         // phpcs:enable
-		global $langs;
-
-		// Clean parameters
-		$remise = price2num($remise);
-		$desc = trim($desc);
-
-		// Check parameters
-		if (! $remise > 0)
-		{
-			$this->error=$langs->trans("ErrorWrongValueForParameter","1");
-			return -1;
-		}
-		if (! $desc)
-		{
-			$this->error=$langs->trans("ErrorWrongValueForParameter","3");
-			return -2;
-		}
-
-		if ($this->id)
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-
-			$discount = new DiscountAbsolute($this->db);
-			$discount->fk_soc=$this->id;
-
-			$discount->discount_type=$discount_type;
-
-			$discount->amount_ht=$discount->multicurrency_amount_ht=price2num($remise,'MT');
-			$discount->amount_tva=$discount->multicurrency_amount_tva=price2num($remise*$tva_tx/100,'MT');
-			$discount->amount_ttc=$discount->multicurrency_amount_ttc=price2num($discount->amount_ht+$discount->amount_tva,'MT');
-
-			$discount->tva_tx=price2num($tva_tx,'MT');
-			$discount->description=$desc;
-
-			$result=$discount->create($user);
-			if ($result > 0)
-			{
-				return $result;
-			}
-			else
-			{
-				$this->error=$discount->error;
-				return -3;
-			}
-		}
-		else return 0;
-	}
-
-	/**
-	 *  Renvoie montant TTC des reductions/avoirs en cours disponibles de la societe
-	 *
-	 *	@param	User	$user			Filtre sur un user auteur des remises
-	 * 	@param	string	$filter			Filtre autre
-	 * 	@param	integer	$maxvalue		Filter on max value for discount
-	 * 	@param	int		$discount_type	0 => customer discount, 1 => supplier discount
-	 *	@return	int					<0 if KO, Credit note amount otherwise
-	 */
-	function getAvailableDiscounts($user='',$filter='',$maxvalue=0,$discount_type=0)
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-
-		$discountstatic=new DiscountAbsolute($this->db);
-		$result=$discountstatic->getAvailableDiscounts($this,$user,$filter,$maxvalue,$discount_type);
-		if ($result >= 0)
-		{
-			return $result;
-		}
-		else
-		{
-			$this->error=$discountstatic->error;
-			return -1;
-		}
-	}
-
-	/**
-	 *  Return array of sales representatives
-	 *
-	 *  @param	User	$user		Object user
-	 *  @param	int		$mode		0=Array with properties, 1=Array of id.
-	 *  @return array       		Array of sales representatives of third party
-	 */
-	function getSalesRepresentatives(User $user, $mode=0)
-	{
-		global $conf;
-
-		$reparray=array();
-
-		$sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
-		if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-		{
-			$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
-			$sql.= " WHERE ((ug.fk_user = sc.fk_user";
-			$sql.= " AND ug.entity = ".$conf->entity.")";
-			$sql.= " OR u.admin = 1)";
-		}
-		else
-			$sql.= " WHERE entity in (0, ".$conf->entity.")";
-
-		$sql.= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
-
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i=0;
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($resql);
-
-				if (empty($mode))
-				{
-					$reparray[$i]['id']=$obj->rowid;
-					$reparray[$i]['lastname']=$obj->lastname;
-					$reparray[$i]['firstname']=$obj->firstname;
-					$reparray[$i]['email']=$obj->email;
-					$reparray[$i]['statut']=$obj->statut;
-					$reparray[$i]['entity']=$obj->entity;
-					$reparray[$i]['login']=$obj->login;
-					$reparray[$i]['photo']=$obj->photo;
-				}
-				else
-				{
-					$reparray[]=$obj->rowid;
-				}
-				$i++;
-			}
-			return $reparray;
-		}
-		else {
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
+        global $langs;
+
+        // Clean parameters
+        $remise = price2num($remise);
+        $desc = trim($desc);
+
+        // Check parameters
+        if (! $remise > 0)
+        {
+            $this->error=$langs->trans("ErrorWrongValueForParameter","1");
+            return -1;
+        }
+        if (! $desc)
+        {
+            $this->error=$langs->trans("ErrorWrongValueForParameter","3");
+            return -2;
+        }
+
+        if ($this->id)
+        {
+            require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+
+            $discount = new DiscountAbsolute($this->db);
+            $discount->fk_soc=$this->id;
+
+            $discount->discount_type=$discount_type;
+
+            $discount->amount_ht=$discount->multicurrency_amount_ht=price2num($remise,'MT');
+            $discount->amount_tva=$discount->multicurrency_amount_tva=price2num($remise*$tva_tx/100,'MT');
+            $discount->amount_ttc=$discount->multicurrency_amount_ttc=price2num($discount->amount_ht+$discount->amount_tva,'MT');
+
+            $discount->tva_tx=price2num($tva_tx,'MT');
+            $discount->description=$desc;
+
+            $result=$discount->create($user);
+            if ($result > 0)
+            {
+                return $result;
+            }
+            else
+            {
+                $this->error=$discount->error;
+                return -3;
+            }
+        }
+        else return 0;
+    }
+
+    /**
+     *  Renvoie montant TTC des reductions/avoirs en cours disponibles de la societe
+     *
+     *	@param	User	$user			Filtre sur un user auteur des remises
+     * 	@param	string	$filter			Filtre autre
+     * 	@param	integer	$maxvalue		Filter on max value for discount
+     * 	@param	int		$discount_type	0 => customer discount, 1 => supplier discount
+     *	@return	int					<0 if KO, Credit note amount otherwise
+     */
+    function getAvailableDiscounts($user='',$filter='',$maxvalue=0,$discount_type=0)
+    {
+        require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+
+        $discountstatic=new DiscountAbsolute($this->db);
+        $result=$discountstatic->getAvailableDiscounts($this,$user,$filter,$maxvalue,$discount_type);
+        if ($result >= 0)
+        {
+            return $result;
+        }
+        else
+        {
+            $this->error=$discountstatic->error;
+            return -1;
+        }
+    }
+
+    /**
+     *  Return array of sales representatives
+     *
+     *  @param	User	$user		Object user
+     *  @param	int		$mode		0=Array with properties, 1=Array of id.
+     *  @return array       		Array of sales representatives of third party
+     */
+    function getSalesRepresentatives(User $user, $mode=0)
+    {
+        global $conf;
+
+        $reparray=array();
+
+        $sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
+        if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+        {
+            $sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
+            $sql.= " WHERE ((ug.fk_user = sc.fk_user";
+            $sql.= " AND ug.entity = ".$conf->entity.")";
+            $sql.= " OR u.admin = 1)";
+        }
+        else
+            $sql.= " WHERE entity in (0, ".$conf->entity.")";
+
+        $sql.= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
+
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i=0;
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                if (empty($mode))
+                {
+                    $reparray[$i]['id']=$obj->rowid;
+                    $reparray[$i]['lastname']=$obj->lastname;
+                    $reparray[$i]['firstname']=$obj->firstname;
+                    $reparray[$i]['email']=$obj->email;
+                    $reparray[$i]['statut']=$obj->statut;
+                    $reparray[$i]['entity']=$obj->entity;
+                    $reparray[$i]['login']=$obj->login;
+                    $reparray[$i]['photo']=$obj->photo;
+                }
+                else
+                {
+                    $reparray[]=$obj->rowid;
+                }
+                $i++;
+            }
+            return $reparray;
+        }
+        else {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set the price level
-	 *
-	 * @param 	int		$price_level	Level of price
-	 * @param 	User	$user			Use making change
-	 * @return	int						<0 if KO, >0 if OK
-	 */
-	function set_price_level($price_level, User $user)
-	{
+    /**
+     * Set the price level
+     *
+     * @param 	int		$price_level	Level of price
+     * @param 	User	$user			Use making change
+     * @return	int						<0 if KO, >0 if OK
+     */
+    function set_price_level($price_level, User $user)
+    {
         // phpcs:enable
-		if ($this->id)
-		{
-			$now=dol_now();
-
-			$sql  = "UPDATE ".MAIN_DB_PREFIX."societe";
-			$sql .= " SET price_level = '".$this->db->escape($price_level)."'";
-			$sql .= " WHERE rowid = " . $this->id;
-
-			if (! $this->db->query($sql))
-			{
-				dol_print_error($this->db);
-				return -1;
-			}
-
-			$sql  = "INSERT INTO ".MAIN_DB_PREFIX."societe_prices";
-			$sql .= " (datec, fk_soc, price_level, fk_user_author)";
-			$sql .= " VALUES ('".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($price_level)."', ".$user->id.")";
-
-			if (! $this->db->query($sql))
-			{
-				dol_print_error($this->db);
-				return -1;
-			}
-			return 1;
-		}
-		return -1;
-	}
+        if ($this->id)
+        {
+            $now=dol_now();
+
+            $sql  = "UPDATE ".MAIN_DB_PREFIX."societe";
+            $sql .= " SET price_level = '".$this->db->escape($price_level)."'";
+            $sql .= " WHERE rowid = " . $this->id;
+
+            if (! $this->db->query($sql))
+            {
+                dol_print_error($this->db);
+                return -1;
+            }
+
+            $sql  = "INSERT INTO ".MAIN_DB_PREFIX."societe_prices";
+            $sql .= " (datec, fk_soc, price_level, fk_user_author)";
+            $sql .= " VALUES ('".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($price_level)."', ".$user->id.")";
+
+            if (! $this->db->query($sql))
+            {
+                dol_print_error($this->db);
+                return -1;
+            }
+            return 1;
+        }
+        return -1;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Add link to sales representative
-	 *
-	 *	@param	User	$user		Object user
-	 *	@param	int		$commid		Id of user
-	 *	@return	void
-	 */
-	function add_commercial(User $user, $commid)
-	{
+    /**
+     *	Add link to sales representative
+     *
+     *	@param	User	$user		Object user
+     *	@param	int		$commid		Id of user
+     *	@return	void
+     */
+    function add_commercial(User $user, $commid)
+    {
         // phpcs:enable
-		$error=0;
+        $error=0;
 
 
-		if ($this->id > 0 && $commid > 0)
-		{
-			$sql = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux";
-			$sql.= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
+        if ($this->id > 0 && $commid > 0)
+        {
+            $sql = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux";
+            $sql.= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
 
-			$this->db->query($sql);
+            $this->db->query($sql);
 
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_commerciaux";
-			$sql.= " ( fk_soc, fk_user )";
-			$sql.= " VALUES (".$this->id.",".$commid.")";
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_commerciaux";
+            $sql.= " ( fk_soc, fk_user )";
+            $sql.= " VALUES (".$this->id.",".$commid.")";
 
-			if (! $this->db->query($sql) )
-			{
-				dol_syslog(get_class($this)."::add_commercial Erreur");
-			}
-			else {
-				$this->context=array('commercial_modified'=>$commid);
+            if (! $this->db->query($sql) )
+            {
+                dol_syslog(get_class($this)."::add_commercial Erreur");
+            }
+            else {
+                $this->context=array('commercial_modified'=>$commid);
 
-				$result=$this->call_trigger('COMPANY_LINK_SALE_REPRESENTATIVE',$user);
+                $result=$this->call_trigger('COMPANY_LINK_SALE_REPRESENTATIVE',$user);
                 if ($result < 0) $error++;
-			}
-		}
-	}
+            }
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Add link to sales representative
-	 *
-	 *	@param	User	$user		Object user
-	 *	@param	int		$commid		Id of user
-	 *	@return	void
-	 */
-	function del_commercial(User $user, $commid)
-	{
+    /**
+     *	Add link to sales representative
+     *
+     *	@param	User	$user		Object user
+     *	@param	int		$commid		Id of user
+     *	@return	void
+     */
+    function del_commercial(User $user, $commid)
+    {
         // phpcs:enable
-		$error=0;
-		$this->context=array('commercial_modified'=>$commid);
+        $error=0;
+        $this->context=array('commercial_modified'=>$commid);
 
-		$result=$this->call_trigger('COMPANY_UNLINK_SALE_REPRESENTATIVE',$user);
+        $result=$this->call_trigger('COMPANY_UNLINK_SALE_REPRESENTATIVE',$user);
         if ($result < 0) $error++;
 
-		if ($this->id > 0 && $commid > 0)
-		{
-			$sql  = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux ";
-			$sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
-
-			if (! $this->db->query($sql) )
-			{
-				dol_syslog(get_class($this)."::del_commercial Erreur");
-			}
-		}
-	}
-
-
-	/**
-	 *    	Return a link on thirdparty (with picto)
-	 *
-	 *		@param	int		$withpicto		          Add picto into link (0=No picto, 1=Include picto with link, 2=Picto only)
-	 *		@param	string	$option			          Target of link ('', 'customer', 'prospect', 'supplier', 'project')
-	 *		@param	int		$maxlen			          Max length of name
-	 *      @param	int  	$notooltip		          1=Disable tooltip
-	 *      @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-	 *		@return	string					          String with URL
-	 */
-	function getNomUrl($withpicto=0, $option='', $maxlen=0, $notooltip=0, $save_lastsearch_value=-1)
-	{
-		global $conf, $langs, $hookmanager;
-
-		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-
-		$name=$this->name?$this->name:$this->nom;
-
-		if(!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)){
-
-             if(empty($option) && $this->client > 0) $option = 'customer';
-             if(empty($option) && $this->fournisseur > 0) $option = 'supplier';
-         }
-
-
-		if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
-		{
-			$code = '';
-			if (($this->client) && (! empty ( $this->code_client ))
-				&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
-				|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
-				)
-			)
-			{
-				$code = $this->code_client . ' - ';
-			}
-
-			if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
-				&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
-				|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
-				)
-			)
-			{
-				$code .= $this->code_fournisseur . ' - ';
-			}
-
-			if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
-			{
-				$name =$code.' '.$name;
-			}
-			else
-			{
-				$name =$code;
-			}
-		}
-
-		if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
-
-		$result=''; $label='';
-		$linkstart=''; $linkend='';
-
-		if (! empty($this->logo) && class_exists('Form'))
-		{
-			$label.= '<div class="photointooltip">';
-			$label.= Form::showphoto('societe', $this, 0, 40, 0, 'photowithmargin', 'mini', 0);	// Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
-			$label.= '</div><div style="clear: both;"></div>';
-		}
-
-		$label.= '<div class="centpercent">';
-
-		if ($option == 'customer' || $option == 'compta' || $option == 'category' || $option == 'category_supplier')
-		{
-		   $label.= '<u>' . $langs->trans("ShowCustomer") . '</u>';
-		   $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-		}
-		elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
-		{
-			$label.= '<u>' . $langs->trans("ShowProspect") . '</u>';
-			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-		}
-		elseif ($option == 'supplier')
-		{
-			$label.= '<u>' . $langs->trans("ShowSupplier") . '</u>';
-			$linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
-		}
-		elseif ($option == 'agenda')
-		{
-			$label.= '<u>' . $langs->trans("ShowAgenda") . '</u>';
-			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
-		}
-		elseif ($option == 'project')
-		{
-			$label.= '<u>' . $langs->trans("ShowProject") . '</u>';
-			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
-		}
-		elseif ($option == 'margin')
-		{
-			$label.= '<u>' . $langs->trans("ShowMargin") . '</u>';
-			$linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
-		}
-		elseif ($option == 'contact')
-		{
-			$label.= '<u>' . $langs->trans("ShowContacts") . '</u>';
-			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
-		}
-		elseif ($option == 'ban')
-		{
-			$label.= '<u>' . $langs->trans("ShowBan") . '</u>';
-			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$this->id;
-		}
-
-		// By default
-		if (empty($linkstart))
-		{
-			$label.= '<u>' . $langs->trans("ShowCompany") . '</u>';
-			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$this->id;
-		}
-
-		if (! empty($this->name))
-		{
-			$label.= '<br><b>' . $langs->trans('Name') . ':</b> '. $this->name;
-			if (! empty($this->name_alias)) $label.=' ('.$this->name_alias.')';
-			$label.= '<br><b>' . $langs->trans('Email') . ':</b> '. $this->email;
-		}
-		if (! empty($this->country_code))
-			$label.= '<br><b>' . $langs->trans('Country') . ':</b> '. $this->country_code;
-		if (! empty($this->tva_intra) || (! empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false))
-			$label.= '<br><b>' . $langs->trans('VATIntra') . ':</b> '. $this->tva_intra;
-		if (! empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP))
-		{
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false) $label.= '<br><b>' . $langs->trans('ProfId1'.$this->country_code) . ':</b> '. $this->idprof1;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid2') !== false) $label.= '<br><b>' . $langs->trans('ProfId2'.$this->country_code) . ':</b> '. $this->idprof2;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid3') !== false) $label.= '<br><b>' . $langs->trans('ProfId3'.$this->country_code) . ':</b> '. $this->idprof3;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid4') !== false) $label.= '<br><b>' . $langs->trans('ProfId4'.$this->country_code) . ':</b> '. $this->idprof4;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid5') !== false) $label.= '<br><b>' . $langs->trans('ProfId5'.$this->country_code) . ':</b> '. $this->idprof5;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid6') !== false) $label.= '<br><b>' . $langs->trans('ProfId6'.$this->country_code) . ':</b> '. $this->idprof6;
-		}
-		if (! empty($this->code_client) && ($this->client == 1 || $this->client == 3))
-			$label.= '<br><b>' . $langs->trans('CustomerCode') . ':</b> '. $this->code_client;
-		if (! empty($this->code_fournisseur) && $this->fournisseur)
-			$label.= '<br><b>' . $langs->trans('SupplierCode') . ':</b> '. $this->code_fournisseur;
-		if (! empty($conf->accounting->enabled) && ($this->client == 1 || $this->client == 3))
-			$label.= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> '. ($this->code_compta ? $this->code_compta : $this->code_compta_client);
-		if (! empty($conf->accounting->enabled) && $this->fournisseur)
-			$label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
-
-		$label.= '</div>';
-
-		// Add type of canvas
-		$linkstart.=(!empty($this->canvas)?'&canvas='.$this->canvas:'');
-		// Add param to save lastsearch_values or not
-		$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-		if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-		if ($add_save_lastsearch_values) $linkstart.='&save_lastsearch_values=1';
-		$linkstart.='"';
-
-		$linkclose='';
-		if (empty($notooltip))
-		{
-			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
-				$label=$langs->trans("ShowCompany");
-				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-			}
-			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose.=' class="classfortooltip refurl"';
-
-		 	/*
+        if ($this->id > 0 && $commid > 0)
+        {
+            $sql  = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux ";
+            $sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
+
+            if (! $this->db->query($sql) )
+            {
+                dol_syslog(get_class($this)."::del_commercial Erreur");
+            }
+        }
+    }
+
+
+    /**
+     *    	Return a link on thirdparty (with picto)
+     *
+     *		@param	int		$withpicto		          Add picto into link (0=No picto, 1=Include picto with link, 2=Picto only)
+     *		@param	string	$option			          Target of link ('', 'customer', 'prospect', 'supplier', 'project')
+     *		@param	int		$maxlen			          Max length of name
+     *      @param	int  	$notooltip		          1=Disable tooltip
+     *      @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+     *		@return	string					          String with URL
+     */
+    function getNomUrl($withpicto=0, $option='', $maxlen=0, $notooltip=0, $save_lastsearch_value=-1)
+    {
+        global $conf, $langs, $hookmanager;
+
+        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+
+        $name=$this->name?$this->name:$this->nom;
+
+        if(!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)){
+
+                if(empty($option) && $this->client > 0) $option = 'customer';
+                if(empty($option) && $this->fournisseur > 0) $option = 'supplier';
+            }
+
+
+        if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
+        {
+            $code = '';
+            if (($this->client) && (! empty ( $this->code_client ))
+                && ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
+                || $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
+                )
+            )
+            {
+                $code = $this->code_client . ' - ';
+            }
+
+            if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
+                && ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
+                || $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
+                )
+            )
+            {
+                $code .= $this->code_fournisseur . ' - ';
+            }
+
+            if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
+            {
+                $name =$code.' '.$name;
+            }
+            else
+            {
+                $name =$code;
+            }
+        }
+
+        if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
+
+        $result=''; $label='';
+        $linkstart=''; $linkend='';
+
+        if (! empty($this->logo) && class_exists('Form'))
+        {
+            $label.= '<div class="photointooltip">';
+            $label.= Form::showphoto('societe', $this, 0, 40, 0, 'photowithmargin', 'mini', 0);	// Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
+            $label.= '</div><div style="clear: both;"></div>';
+        }
+
+        $label.= '<div class="centpercent">';
+
+        if ($option == 'customer' || $option == 'compta' || $option == 'category' || $option == 'category_supplier')
+        {
+            $label.= '<u>' . $langs->trans("ShowCustomer") . '</u>';
+            $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
+        }
+        elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
+        {
+            $label.= '<u>' . $langs->trans("ShowProspect") . '</u>';
+            $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
+        }
+        elseif ($option == 'supplier')
+        {
+            $label.= '<u>' . $langs->trans("ShowSupplier") . '</u>';
+            $linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
+        }
+        elseif ($option == 'agenda')
+        {
+            $label.= '<u>' . $langs->trans("ShowAgenda") . '</u>';
+            $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
+        }
+        elseif ($option == 'project')
+        {
+            $label.= '<u>' . $langs->trans("ShowProject") . '</u>';
+            $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
+        }
+        elseif ($option == 'margin')
+        {
+            $label.= '<u>' . $langs->trans("ShowMargin") . '</u>';
+            $linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
+        }
+        elseif ($option == 'contact')
+        {
+            $label.= '<u>' . $langs->trans("ShowContacts") . '</u>';
+            $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
+        }
+        elseif ($option == 'ban')
+        {
+            $label.= '<u>' . $langs->trans("ShowBan") . '</u>';
+            $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$this->id;
+        }
+
+        // By default
+        if (empty($linkstart))
+        {
+            $label.= '<u>' . $langs->trans("ShowCompany") . '</u>';
+            $linkstart = '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$this->id;
+        }
+
+        if (! empty($this->name))
+        {
+            $label.= '<br><b>' . $langs->trans('Name') . ':</b> '. $this->name;
+            if (! empty($this->name_alias)) $label.=' ('.$this->name_alias.')';
+            $label.= '<br><b>' . $langs->trans('Email') . ':</b> '. $this->email;
+        }
+        if (! empty($this->country_code))
+            $label.= '<br><b>' . $langs->trans('Country') . ':</b> '. $this->country_code;
+        if (! empty($this->tva_intra) || (! empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false))
+            $label.= '<br><b>' . $langs->trans('VATIntra') . ':</b> '. $this->tva_intra;
+        if (! empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP))
+        {
+            if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false) $label.= '<br><b>' . $langs->trans('ProfId1'.$this->country_code) . ':</b> '. $this->idprof1;
+            if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid2') !== false) $label.= '<br><b>' . $langs->trans('ProfId2'.$this->country_code) . ':</b> '. $this->idprof2;
+            if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid3') !== false) $label.= '<br><b>' . $langs->trans('ProfId3'.$this->country_code) . ':</b> '. $this->idprof3;
+            if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid4') !== false) $label.= '<br><b>' . $langs->trans('ProfId4'.$this->country_code) . ':</b> '. $this->idprof4;
+            if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid5') !== false) $label.= '<br><b>' . $langs->trans('ProfId5'.$this->country_code) . ':</b> '. $this->idprof5;
+            if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid6') !== false) $label.= '<br><b>' . $langs->trans('ProfId6'.$this->country_code) . ':</b> '. $this->idprof6;
+        }
+        if (! empty($this->code_client) && ($this->client == 1 || $this->client == 3))
+            $label.= '<br><b>' . $langs->trans('CustomerCode') . ':</b> '. $this->code_client;
+        if (! empty($this->code_fournisseur) && $this->fournisseur)
+            $label.= '<br><b>' . $langs->trans('SupplierCode') . ':</b> '. $this->code_fournisseur;
+        if (! empty($conf->accounting->enabled) && ($this->client == 1 || $this->client == 3))
+            $label.= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> '. ($this->code_compta ? $this->code_compta : $this->code_compta_client);
+        if (! empty($conf->accounting->enabled) && $this->fournisseur)
+            $label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
+
+        $label.= '</div>';
+
+        // Add type of canvas
+        $linkstart.=(!empty($this->canvas)?'&canvas='.$this->canvas:'');
+        // Add param to save lastsearch_values or not
+        $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+        if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+        if ($add_save_lastsearch_values) $linkstart.='&save_lastsearch_values=1';
+        $linkstart.='"';
+
+        $linkclose='';
+        if (empty($notooltip))
+        {
+            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            {
+                $label=$langs->trans("ShowCompany");
+                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+            }
+            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose.=' class="classfortooltip refurl"';
+
+                /*
 			$hookmanager->initHooks(array('thirdpartydao'));
 			$parameters=array('id'=>$this->id);
 			$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 			if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 			*/
-		}
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
-
-		global $user;
-		if (! $user->rights->societe->client->voir && $user->societe_id > 0 && $this->id != $user->societe_id)
-		{
-			$linkstart='';
-			$linkend='';
-		}
-
-		$result.=$linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.=($maxlen?dol_trunc($name,$maxlen):$name);
-		$result.=$linkend;
-
-		global $action;
-		$hookmanager->initHooks(array('thirdpartydao'));
-		$parameters=array('id'=>$this->id, 'getnomurl'=>$result);
-		$reshook=$hookmanager->executeHooks('getNomUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
-
-		return $result;
-	}
-
-	/**
-	 *    Return label of status (activity, closed)
-	 *
-	 *    @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *    @return   string        		Libelle
-	 */
-	function getLibStatut($mode=0)
-	{
-		return $this->LibStatut($this->status,$mode);
-	}
+        }
+        $linkstart.=$linkclose.'>';
+        $linkend='</a>';
+
+        global $user;
+        if (! $user->rights->societe->client->voir && $user->societe_id > 0 && $this->id != $user->societe_id)
+        {
+            $linkstart='';
+            $linkend='';
+        }
+
+        $result.=$linkstart;
+        if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1);
+        if ($withpicto != 2) $result.=($maxlen?dol_trunc($name,$maxlen):$name);
+        $result.=$linkend;
+
+        global $action;
+        $hookmanager->initHooks(array('thirdpartydao'));
+        $parameters=array('id'=>$this->id, 'getnomurl'=>$result);
+        $reshook=$hookmanager->executeHooks('getNomUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+        if ($reshook > 0) $result = $hookmanager->resPrint;
+        else $result .= $hookmanager->resPrint;
+
+        return $result;
+    }
+
+    /**
+     *    Return label of status (activity, closed)
+     *
+     *    @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+     *    @return   string        		Libelle
+     */
+    function getLibStatut($mode=0)
+    {
+        return $this->LibStatut($this->status,$mode);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Renvoi le libelle d'un statut donne
-	 *
-	 *  @param	int		$statut         Id statut
-	 *  @param	int		$mode           0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
-	 *  @return	string          		Libelle du statut
-	 */
-	function LibStatut($statut,$mode=0)
-	{
+    /**
+     *  Renvoi le libelle d'un statut donne
+     *
+     *  @param	int		$statut         Id statut
+     *  @param	int		$mode           0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
+     *  @return	string          		Libelle du statut
+     */
+    function LibStatut($statut,$mode=0)
+    {
         // phpcs:enable
-		global $langs;
-		$langs->load('companies');
-
-		if ($mode == 0)
-		{
-			if ($statut==0) return $langs->trans("ActivityCeased");
-			elseif ($statut==1) return $langs->trans("InActivity");
-		}
-		elseif ($mode == 1)
-		{
-			if ($statut==0) return $langs->trans("ActivityCeased");
-			elseif ($statut==1) return $langs->trans("InActivity");
-		}
-		elseif ($mode == 2)
-		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-			elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
-		}
-		elseif ($mode == 3)
-		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
-		}
-		elseif ($mode == 4)
-		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-			elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
-		}
-		elseif ($mode == 5)
-		{
-			if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			elseif ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
-		}
-		elseif ($mode == 6)
-		{
-			if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			elseif ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
-		}
-	}
+        global $langs;
+        $langs->load('companies');
+
+        if ($mode == 0)
+        {
+            if ($statut==0) return $langs->trans("ActivityCeased");
+            elseif ($statut==1) return $langs->trans("InActivity");
+        }
+        elseif ($mode == 1)
+        {
+            if ($statut==0) return $langs->trans("ActivityCeased");
+            elseif ($statut==1) return $langs->trans("InActivity");
+        }
+        elseif ($mode == 2)
+        {
+            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+            elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+        }
+        elseif ($mode == 3)
+        {
+            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+            elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+        }
+        elseif ($mode == 4)
+        {
+            if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+            elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+        }
+        elseif ($mode == 5)
+        {
+            if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+            elseif ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+        }
+        elseif ($mode == 6)
+        {
+            if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+            elseif ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Return list of contacts emails existing for third party
-	 *
-	 *	  @param	  int		$addthirdparty		1=Add also a record for thirdparty email
-	 *    @return     array       					Array of contacts emails
-	 */
-	function thirdparty_and_contact_email_array($addthirdparty=0)
-	{
+    /**
+     *    Return list of contacts emails existing for third party
+     *
+     *	  @param	  int		$addthirdparty		1=Add also a record for thirdparty email
+     *    @return     array       					Array of contacts emails
+     */
+    function thirdparty_and_contact_email_array($addthirdparty=0)
+    {
         // phpcs:enable
-		global $langs;
-
-		$contact_emails = $this->contact_property_array('email',1);
-		if ($this->email && $addthirdparty)
-		{
-			if (empty($this->name)) $this->name=$this->nom;
-			$contact_emails['thirdparty']=$langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->email.">";
-		}
-		//var_dump($contact_emails)
-		return $contact_emails;
-	}
+        global $langs;
+
+        $contact_emails = $this->contact_property_array('email',1);
+        if ($this->email && $addthirdparty)
+        {
+            if (empty($this->name)) $this->name=$this->nom;
+            $contact_emails['thirdparty']=$langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->email.">";
+        }
+        //var_dump($contact_emails)
+        return $contact_emails;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Return list of contacts mobile phone existing for third party
-	 *
-	 *    @return     array       Array of contacts emails
-	 */
-	function thirdparty_and_contact_phone_array()
-	{
+    /**
+     *    Return list of contacts mobile phone existing for third party
+     *
+     *    @return     array       Array of contacts emails
+     */
+    function thirdparty_and_contact_phone_array()
+    {
         // phpcs:enable
-		global $langs;
+        global $langs;
 
-		$contact_phone = $this->contact_property_array('mobile');
+        $contact_phone = $this->contact_property_array('mobile');
 
-		if (! empty($this->phone))	// If a phone of thirdparty is defined, we add it ot mobile of contacts
-		{
-			if (empty($this->name)) $this->name=$this->nom;
-			// TODO: Tester si tel non deja present dans tableau contact
-			$contact_phone['thirdparty']=$langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->phone.">";
-		}
-		return $contact_phone;
-	}
+        if (! empty($this->phone))	// If a phone of thirdparty is defined, we add it ot mobile of contacts
+        {
+            if (empty($this->name)) $this->name=$this->nom;
+            // TODO: Tester si tel non deja present dans tableau contact
+            $contact_phone['thirdparty']=$langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->phone.">";
+        }
+        return $contact_phone;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return list of contacts emails or mobile existing for third party
-	 *
-	 *  @param	string	$mode       		'email' or 'mobile'
-	 * 	@param	int		$hidedisabled		1=Hide contact if disabled
-	 *  @return array       				Array of contacts emails or mobile. Example: array(id=>'Name <email>')
-	 */
-	function contact_property_array($mode='email', $hidedisabled=0)
-	{
+    /**
+     *  Return list of contacts emails or mobile existing for third party
+     *
+     *  @param	string	$mode       		'email' or 'mobile'
+     * 	@param	int		$hidedisabled		1=Hide contact if disabled
+     *  @return array       				Array of contacts emails or mobile. Example: array(id=>'Name <email>')
+     */
+    function contact_property_array($mode='email', $hidedisabled=0)
+    {
         // phpcs:enable
-		global $langs;
-
-		$contact_property = array();
-
-
-		$sql = "SELECT rowid, email, statut, phone_mobile, lastname, poste, firstname";
-		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
-		$sql.= " WHERE fk_soc = ".$this->id;
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$nump = $this->db->num_rows($resql);
-			if ($nump)
-			{
-				$sepa="("; $sepb=")";
-				if ($mode == 'email')
-				{
-					//$sepa="&lt;"; $sepb="&gt;";
-					$sepa="<"; $sepb=">";
-				}
-				$i = 0;
-				while ($i < $nump)
-				{
-					$obj = $this->db->fetch_object($resql);
-					if ($mode == 'email') $property=$obj->email;
-					else if ($mode == 'mobile') $property=$obj->phone_mobile;
-					else $property=$obj->$mode;
-
-					// Show all contact. If hidedisabled is 1, showonly contacts with status = 1
-					if ($obj->statut == 1 || empty($hidedisabled))
-					{
-						if (empty($property))
-						{
-							if ($mode == 'email') $property=$langs->transnoentitiesnoconv("NoEMail");
-							else if ($mode == 'mobile') $property=$langs->transnoentitiesnoconv("NoMobilePhone");
-						}
-
-						if (!empty($obj->poste))
-						{
-							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).($obj->poste?" - ".$obj->poste:"").(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
-						}
-						else
-						{
-							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
-						}
-					}
-					$i++;
-				}
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-		return $contact_property;
-	}
+        global $langs;
+
+        $contact_property = array();
+
+
+        $sql = "SELECT rowid, email, statut, phone_mobile, lastname, poste, firstname";
+        $sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
+        $sql.= " WHERE fk_soc = ".$this->id;
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $nump = $this->db->num_rows($resql);
+            if ($nump)
+            {
+                $sepa="("; $sepb=")";
+                if ($mode == 'email')
+                {
+                    //$sepa="&lt;"; $sepb="&gt;";
+                    $sepa="<"; $sepb=">";
+                }
+                $i = 0;
+                while ($i < $nump)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    if ($mode == 'email') $property=$obj->email;
+                    else if ($mode == 'mobile') $property=$obj->phone_mobile;
+                    else $property=$obj->$mode;
+
+                    // Show all contact. If hidedisabled is 1, showonly contacts with status = 1
+                    if ($obj->statut == 1 || empty($hidedisabled))
+                    {
+                        if (empty($property))
+                        {
+                            if ($mode == 'email') $property=$langs->transnoentitiesnoconv("NoEMail");
+                            else if ($mode == 'mobile') $property=$langs->transnoentitiesnoconv("NoMobilePhone");
+                        }
+
+                        if (!empty($obj->poste))
+                        {
+                            $contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).($obj->poste?" - ".$obj->poste:"").(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
+                        }
+                        else
+                        {
+                            $contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
+                        }
+                    }
+                    $i++;
+                }
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+        return $contact_property;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Renvoie la liste des contacts de cette societe
-	 *
-	 *    @return     array      tableau des contacts
-	 */
-	function contact_array()
-	{
+    /**
+     *    Renvoie la liste des contacts de cette societe
+     *
+     *    @return     array      tableau des contacts
+     */
+    function contact_array()
+    {
         // phpcs:enable
-		$contacts = array();
-
-		$sql = "SELECT rowid, lastname, firstname FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$nump = $this->db->num_rows($resql);
-			if ($nump)
-			{
-				$i = 0;
-				while ($i < $nump)
-				{
-					$obj = $this->db->fetch_object($resql);
-					$contacts[$obj->rowid] = dolGetFirstLastname($obj->firstname,$obj->lastname);
-					$i++;
-				}
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-		return $contacts;
-	}
+        $contacts = array();
+
+        $sql = "SELECT rowid, lastname, firstname FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $nump = $this->db->num_rows($resql);
+            if ($nump)
+            {
+                $i = 0;
+                while ($i < $nump)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    $contacts[$obj->rowid] = dolGetFirstLastname($obj->firstname,$obj->lastname);
+                    $i++;
+                }
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+        return $contacts;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Renvoie la liste des contacts de cette societe
-	 *
-	 *    @return    array    $contacts    tableau des contacts
-	 */
-	function contact_array_objects()
-	{
+    /**
+     *    Renvoie la liste des contacts de cette societe
+     *
+     *    @return    array    $contacts    tableau des contacts
+     */
+    function contact_array_objects()
+    {
         // phpcs:enable
-		require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-		$contacts = array();
-
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$nump = $this->db->num_rows($resql);
-			if ($nump)
-			{
-				$i = 0;
-				while ($i < $nump)
-				{
-					$obj = $this->db->fetch_object($resql);
-					$contact = new Contact($this->db);
-					$contact->fetch($obj->rowid);
-					$contacts[] = $contact;
-					$i++;
-				}
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-		return $contacts;
-	}
+        require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+        $contacts = array();
+
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $nump = $this->db->num_rows($resql);
+            if ($nump)
+            {
+                $i = 0;
+                while ($i < $nump)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    $contact = new Contact($this->db);
+                    $contact->fetch($obj->rowid);
+                    $contacts[] = $contact;
+                    $i++;
+                }
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+        return $contacts;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return property of contact from its id
-	 *
-	 *  @param	int		$rowid      id of contact
-	 *  @param  string	$mode       'email' or 'mobile'
-	 *  @return string  			Email of contact with format: "Full name <email>"
-	 */
-	function contact_get_property($rowid,$mode)
-	{
+    /**
+     *  Return property of contact from its id
+     *
+     *  @param	int		$rowid      id of contact
+     *  @param  string	$mode       'email' or 'mobile'
+     *  @return string  			Email of contact with format: "Full name <email>"
+     */
+    function contact_get_property($rowid,$mode)
+    {
         // phpcs:enable
-		$contact_property='';
+        $contact_property='';
 
-		if (empty($rowid)) return '';
+        if (empty($rowid)) return '';
 
-		$sql = "SELECT rowid, email, phone_mobile, lastname, firstname";
-		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
-		$sql.= " WHERE rowid = '".$rowid."'";
+        $sql = "SELECT rowid, email, phone_mobile, lastname, firstname";
+        $sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
+        $sql.= " WHERE rowid = '".$rowid."'";
 
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$nump = $this->db->num_rows($resql);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $nump = $this->db->num_rows($resql);
 
-			if ($nump)
-			{
-				$obj = $this->db->fetch_object($resql);
+            if ($nump)
+            {
+                $obj = $this->db->fetch_object($resql);
 
-				if ($mode == 'email') $contact_property = dol_string_nospecial(dolGetFirstLastname($obj->firstname, $obj->lastname), ' ', array(","))." <".$obj->email.">";
-				else if ($mode == 'mobile') $contact_property = $obj->phone_mobile;
-			}
-			return $contact_property;
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-	}
+                if ($mode == 'email') $contact_property = dol_string_nospecial(dolGetFirstLastname($obj->firstname, $obj->lastname), ' ', array(","))." <".$obj->email.">";
+                else if ($mode == 'mobile') $contact_property = $obj->phone_mobile;
+            }
+            return $contact_property;
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return bank number property of thirdparty (label or rum)
-	 *
-	 *	@param	string	$mode	'label' or 'rum' or 'format'
-	 *  @return	string			Bank number
-	 */
-	function display_rib($mode='label')
-	{
+    /**
+     *  Return bank number property of thirdparty (label or rum)
+     *
+     *	@param	string	$mode	'label' or 'rum' or 'format'
+     *  @return	string			Bank number
+     */
+    function display_rib($mode='label')
+    {
         // phpcs:enable
-		require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
-
-		$bac = new CompanyBankAccount($this->db);
-		$bac->fetch(0,$this->id);
-
-		if ($mode == 'label')
-		{
-			return $bac->getRibLabel(true);
-		}
-		elseif ($mode == 'rum')
-		{
-			if (empty($bac->rum))
-			{
-				require_once DOL_DOCUMENT_ROOT . '/compta/prelevement/class/bonprelevement.class.php';
-				$prelevement = new BonPrelevement($this->db);
-				$bac->fetch_thirdparty();
-				$bac->rum = $prelevement->buildRumNumber($bac->thirdparty->code_client, $bac->datec, $bac->id);
-			}
-			return $bac->rum;
-		}
-		elseif ($mode == 'format')
-		{
-			return $bac->frstrecur;
-		}
-
-		return 'BadParameterToFunctionDisplayRib';
-	}
+        require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
+
+        $bac = new CompanyBankAccount($this->db);
+        $bac->fetch(0,$this->id);
+
+        if ($mode == 'label')
+        {
+            return $bac->getRibLabel(true);
+        }
+        elseif ($mode == 'rum')
+        {
+            if (empty($bac->rum))
+            {
+                require_once DOL_DOCUMENT_ROOT . '/compta/prelevement/class/bonprelevement.class.php';
+                $prelevement = new BonPrelevement($this->db);
+                $bac->fetch_thirdparty();
+                $bac->rum = $prelevement->buildRumNumber($bac->thirdparty->code_client, $bac->datec, $bac->id);
+            }
+            return $bac->rum;
+        }
+        elseif ($mode == 'format')
+        {
+            return $bac->frstrecur;
+        }
+
+        return 'BadParameterToFunctionDisplayRib';
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return Array of RIB
-	 *
-	 * @return     array|int        0 if KO, Array of CompanyBanckAccount if OK
-	 */
-	function get_all_rib()
-	{
+    /**
+     * Return Array of RIB
+     *
+     * @return     array|int        0 if KO, Array of CompanyBanckAccount if OK
+     */
+    function get_all_rib()
+    {
         // phpcs:enable
-		require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib WHERE type='ban' AND fk_soc = ".$this->id;
-		$result = $this->db->query($sql);
-		if (!$result) {
-			$this->error++;
-			$this->errors[] = $this->db->lasterror;
-			return 0;
-		} else {
-			$num_rows = $this->db->num_rows($result);
-			$rib_array = array();
-			if ($num_rows) {
-				while ($obj = $this->db->fetch_object($result)) {
-					$rib = new CompanyBankAccount($this->db);
-					$rib->fetch($obj->rowid);
-					$rib_array[] = $rib;
-				}
-			}
-			return $rib_array;
-		}
-	}
+        require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib WHERE type='ban' AND fk_soc = ".$this->id;
+        $result = $this->db->query($sql);
+        if (!$result) {
+            $this->error++;
+            $this->errors[] = $this->db->lasterror;
+            return 0;
+        } else {
+            $num_rows = $this->db->num_rows($result);
+            $rib_array = array();
+            if ($num_rows) {
+                while ($obj = $this->db->fetch_object($result)) {
+                    $rib = new CompanyBankAccount($this->db);
+                    $rib->fetch($obj->rowid);
+                    $rib_array[] = $rib;
+                }
+            }
+            return $rib_array;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Attribut un code client a partir du module de controle des codes.
-	 *  Return value is stored into this->code_client
-	 *
-	 *	@param	Societe		$objsoc		Object thirdparty
-	 *	@param	int			$type		Should be 0 to say customer
-	 *  @return void
-	 */
-	function get_codeclient($objsoc=0,$type=0)
-	{
+    /**
+     *  Attribut un code client a partir du module de controle des codes.
+     *  Return value is stored into this->code_client
+     *
+     *	@param	Societe		$objsoc		Object thirdparty
+     *	@param	int			$type		Should be 0 to say customer
+     *  @return void
+     */
+    function get_codeclient($objsoc=0,$type=0)
+    {
         // phpcs:enable
-		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
-
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
-				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
-			}
-			$mod = new $module();
-
-			$this->code_client = $mod->getNextValue($objsoc,$type);
-			$this->prefixCustomerIsRequired = $mod->prefixIsRequired;
-
-			dol_syslog(get_class($this)."::get_codeclient code_client=".$this->code_client." module=".$module);
-		}
-	}
+        global $conf;
+        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+        {
+            $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+
+            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            foreach ($dirsociete as $dirroot)
+            {
+                $res=dol_include_once($dirroot.$module.'.php');
+                if ($res) break;
+            }
+            $mod = new $module();
+
+            $this->code_client = $mod->getNextValue($objsoc,$type);
+            $this->prefixCustomerIsRequired = $mod->prefixIsRequired;
+
+            dol_syslog(get_class($this)."::get_codeclient code_client=".$this->code_client." module=".$module);
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Attribut un code fournisseur a partir du module de controle des codes.
-	 *  Return value is stored into this->code_fournisseur
-	 *
-	 *	@param	Societe		$objsoc		Object thirdparty
-	 *	@param	int			$type		Should be 1 to say supplier
-	 *  @return void
-	 */
-	function get_codefournisseur($objsoc=0,$type=1)
-	{
+    /**
+     *  Attribut un code fournisseur a partir du module de controle des codes.
+     *  Return value is stored into this->code_fournisseur
+     *
+     *	@param	Societe		$objsoc		Object thirdparty
+     *	@param	int			$type		Should be 1 to say supplier
+     *  @return void
+     */
+    function get_codefournisseur($objsoc=0,$type=1)
+    {
         // phpcs:enable
-		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+        global $conf;
+        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+        {
+            $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
 
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
-				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
-			}
-			$mod = new $module();
+            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            foreach ($dirsociete as $dirroot)
+            {
+                $res=dol_include_once($dirroot.$module.'.php');
+                if ($res) break;
+            }
+            $mod = new $module();
 
-			$this->code_fournisseur = $mod->getNextValue($objsoc,$type);
+            $this->code_fournisseur = $mod->getNextValue($objsoc,$type);
 
-			dol_syslog(get_class($this)."::get_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
-		}
-	}
+            dol_syslog(get_class($this)."::get_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Verifie si un code client est modifiable en fonction des parametres
-	 *    du module de controle des codes.
-	 *
-	 *    @return     int		0=No, 1=Yes
-	 */
-	function codeclient_modifiable()
-	{
+    /**
+     *    Verifie si un code client est modifiable en fonction des parametres
+     *    du module de controle des codes.
+     *
+     *    @return     int		0=No, 1=Yes
+     */
+    function codeclient_modifiable()
+    {
         // phpcs:enable
-		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
-
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
-				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
-			}
-
-			$mod = new $module();
-
-			dol_syslog(get_class($this)."::codeclient_modifiable code_client=".$this->code_client." module=".$module);
-			if ($mod->code_modifiable_null && ! $this->code_client) return 1;
-			if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) return 1;
-			if ($mod->code_modifiable) return 1;	// A mettre en dernier
-			return 0;
-		}
-		else
-		{
-			return 0;
-		}
-	}
+        global $conf;
+        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+        {
+            $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+
+            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            foreach ($dirsociete as $dirroot)
+            {
+                $res=dol_include_once($dirroot.$module.'.php');
+                if ($res) break;
+            }
+
+            $mod = new $module();
+
+            dol_syslog(get_class($this)."::codeclient_modifiable code_client=".$this->code_client." module=".$module);
+            if ($mod->code_modifiable_null && ! $this->code_client) return 1;
+            if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) return 1;
+            if ($mod->code_modifiable) return 1;	// A mettre en dernier
+            return 0;
+        }
+        else
+        {
+            return 0;
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Verifie si un code fournisseur est modifiable dans configuration du module de controle des codes
-	 *
-	 *    @return     int		0=No, 1=Yes
-	 */
-	function codefournisseur_modifiable()
-	{
+    /**
+     *    Verifie si un code fournisseur est modifiable dans configuration du module de controle des codes
+     *
+     *    @return     int		0=No, 1=Yes
+     */
+    function codefournisseur_modifiable()
+    {
         // phpcs:enable
-		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
-
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
-				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
-			}
-
-			$mod = new $module();
-
-			dol_syslog(get_class($this)."::codefournisseur_modifiable code_founisseur=".$this->code_fournisseur." module=".$module);
-			if ($mod->code_modifiable_null && ! $this->code_fournisseur) return 1;
-			if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) return 1;
-			if ($mod->code_modifiable) return 1;	// A mettre en dernier
-			return 0;
-		}
-		else
-		{
-			return 0;
-		}
-	}
+        global $conf;
+        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+        {
+            $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+
+            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            foreach ($dirsociete as $dirroot)
+            {
+                $res=dol_include_once($dirroot.$module.'.php');
+                if ($res) break;
+            }
+
+            $mod = new $module();
+
+            dol_syslog(get_class($this)."::codefournisseur_modifiable code_founisseur=".$this->code_fournisseur." module=".$module);
+            if ($mod->code_modifiable_null && ! $this->code_fournisseur) return 1;
+            if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) return 1;
+            if ($mod->code_modifiable) return 1;	// A mettre en dernier
+            return 0;
+        }
+        else
+        {
+            return 0;
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Check customer code
-	 *
-	 *  @return     int				0 if OK
-	 * 								-1 ErrorBadCustomerCodeSyntax
-	 * 								-2 ErrorCustomerCodeRequired
-	 * 								-3 ErrorCustomerCodeAlreadyUsed
-	 * 								-4 ErrorPrefixRequired
-	 */
-	function check_codeclient()
-	{
+    /**
+     *  Check customer code
+     *
+     *  @return     int				0 if OK
+     * 								-1 ErrorBadCustomerCodeSyntax
+     * 								-2 ErrorCustomerCodeRequired
+     * 								-3 ErrorCustomerCodeAlreadyUsed
+     * 								-4 ErrorPrefixRequired
+     */
+    function check_codeclient()
+    {
         // phpcs:enable
-		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
-
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
-				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
-			}
-
-			$mod = new $module();
-
-		   	dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
-		   	$result = $mod->verif($this->db, $this->code_client, $this, 0);
-			return $result;
-		}
-		else
-		{
-			return 0;
-		}
-	}
+        global $conf;
+        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+        {
+            $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+
+            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            foreach ($dirsociete as $dirroot)
+            {
+                $res=dol_include_once($dirroot.$module.'.php');
+                if ($res) break;
+            }
+
+            $mod = new $module();
+
+                dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
+                $result = $mod->verif($this->db, $this->code_client, $this, 0);
+            return $result;
+        }
+        else
+        {
+            return 0;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Check supplier code
-	 *
-	 *    @return     int		0 if OK
-	 * 							-1 ErrorBadCustomerCodeSyntax
-	 * 							-2 ErrorCustomerCodeRequired
-	 * 							-3 ErrorCustomerCodeAlreadyUsed
-	 * 							-4 ErrorPrefixRequired
-	 */
-	function check_codefournisseur()
-	{
+    /**
+     *    Check supplier code
+     *
+     *    @return     int		0 if OK
+     * 							-1 ErrorBadCustomerCodeSyntax
+     * 							-2 ErrorCustomerCodeRequired
+     * 							-3 ErrorCustomerCodeAlreadyUsed
+     * 							-4 ErrorPrefixRequired
+     */
+    function check_codefournisseur()
+    {
         // phpcs:enable
-		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
-		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
-
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
-				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
-			}
-
-			$mod = new $module();
-
-			dol_syslog(get_class($this)."::check_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
-			$result = $mod->verif($this->db, $this->code_fournisseur, $this, 1);
-			return $result;
-		}
-		else
-		{
-			return 0;
-		}
-	}
+        global $conf;
+        if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+        {
+            $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+
+            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            foreach ($dirsociete as $dirroot)
+            {
+                $res=dol_include_once($dirroot.$module.'.php');
+                if ($res) break;
+            }
+
+            $mod = new $module();
+
+            dol_syslog(get_class($this)."::check_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
+            $result = $mod->verif($this->db, $this->code_fournisseur, $this, 1);
+            return $result;
+        }
+        else
+        {
+            return 0;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    	Renvoie un code compta, suivant le module de code compta.
-	 *      Peut etre identique a celui saisit ou genere automatiquement.
-	 *      A ce jour seule la generation automatique est implementee
-	 *
-	 *    	@param	string	$type		Type of thirdparty ('customer' or 'supplier')
-	 *		@return	string				Code compta si ok, 0 si aucun, <0 si ko
-	 */
-	function get_codecompta($type)
-	{
+    /**
+     *    	Renvoie un code compta, suivant le module de code compta.
+     *      Peut etre identique a celui saisit ou genere automatiquement.
+     *      A ce jour seule la generation automatique est implementee
+     *
+     *    	@param	string	$type		Type of thirdparty ('customer' or 'supplier')
+     *		@return	string				Code compta si ok, 0 si aucun, <0 si ko
+     */
+    function get_codecompta($type)
+    {
         // phpcs:enable
-		global $conf;
-
-		if (! empty($conf->global->SOCIETE_CODECOMPTA_ADDON))
-		{
-			$res=false;
-			$dirsociete=array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
-				$res=dol_include_once($dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.'.php');
-				if ($res) break;
-			}
-
-			if ($res)
-			{
-				$classname = $conf->global->SOCIETE_CODECOMPTA_ADDON;
-				$mod = new $classname;
-
-				// Defini code compta dans $mod->code
-				$result = $mod->get_code($this->db, $this, $type);
-
-				if ($type == 'customer') $this->code_compta = $mod->code;
-				else if ($type == 'supplier') $this->code_compta_fournisseur = $mod->code;
-
-				return $result;
-			}
-			else
-			{
-				$this->error = 'ErrorAccountancyCodeNotDefined';
-				return -1;
-			}
-		}
-		else
-		{
-			if ($type == 'customer') $this->code_compta = '';
-			else if ($type == 'supplier') $this->code_compta_fournisseur = '';
-
-			return 0;
-		}
-	}
+        global $conf;
+
+        if (! empty($conf->global->SOCIETE_CODECOMPTA_ADDON))
+        {
+            $res=false;
+            $dirsociete=array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+            foreach ($dirsociete as $dirroot)
+            {
+                $res=dol_include_once($dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.'.php');
+                if ($res) break;
+            }
+
+            if ($res)
+            {
+                $classname = $conf->global->SOCIETE_CODECOMPTA_ADDON;
+                $mod = new $classname;
+
+                // Defini code compta dans $mod->code
+                $result = $mod->get_code($this->db, $this, $type);
+
+                if ($type == 'customer') $this->code_compta = $mod->code;
+                else if ($type == 'supplier') $this->code_compta_fournisseur = $mod->code;
+
+                return $result;
+            }
+            else
+            {
+                $this->error = 'ErrorAccountancyCodeNotDefined';
+                return -1;
+            }
+        }
+        else
+        {
+            if ($type == 'customer') $this->code_compta = '';
+            else if ($type == 'supplier') $this->code_compta_fournisseur = '';
+
+            return 0;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Define parent commany of current company
-	 *
-	 *    @param	int		$id     Id of thirdparty to set or '' to remove
-	 *    @return	int     		<0 if KO, >0 if OK
-	 */
-	function set_parent($id)
-	{
+    /**
+     *    Define parent commany of current company
+     *
+     *    @param	int		$id     Id of thirdparty to set or '' to remove
+     *    @return	int     		<0 if KO, >0 if OK
+     */
+    function set_parent($id)
+    {
         // phpcs:enable
-		if ($this->id)
-		{
-			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
-			$sql.= " SET parent = ".($id > 0 ? $id : "null");
-			$sql.= " WHERE rowid = " . $this->id;
-			dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				$this->parent = $id;
-				return 1;
-			}
-			else
-			{
-				return -1;
-			}
-		}
-		else return -1;
-	}
+        if ($this->id)
+        {
+            $sql = "UPDATE ".MAIN_DB_PREFIX."societe";
+            $sql.= " SET parent = ".($id > 0 ? $id : "null");
+            $sql.= " WHERE rowid = " . $this->id;
+            dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                $this->parent = $id;
+                return 1;
+            }
+            else
+            {
+                return -1;
+            }
+        }
+        else return -1;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Returns if a profid sould be verified
-	 *
-	 *  @param	int		$idprof		1,2,3,4,5,6 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm,5=idprof5,6=idprof6)
-	 *  @return boolean         	true , false
-	 */
-	function id_prof_verifiable($idprof)
-	{
+    /**
+     *  Returns if a profid sould be verified
+     *
+     *  @param	int		$idprof		1,2,3,4,5,6 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm,5=idprof5,6=idprof6)
+     *  @return boolean         	true , false
+     */
+    function id_prof_verifiable($idprof)
+    {
         // phpcs:enable
-		global $conf;
-
-	 	switch($idprof)
-		{
-			case 1:
-				$ret=(!$conf->global->SOCIETE_IDPROF1_UNIQUE?false:true);
-				break;
-			case 2:
-				$ret=(!$conf->global->SOCIETE_IDPROF2_UNIQUE?false:true);
-				break;
-			case 3:
-				$ret=(!$conf->global->SOCIETE_IDPROF3_UNIQUE?false:true);
-				break;
-			case 4:
-				$ret=(!$conf->global->SOCIETE_IDPROF4_UNIQUE?false:true);
-				break;
-			case 5:
-				$ret=(!$conf->global->SOCIETE_IDPROF5_UNIQUE?false:true);
-				break;
-			case 6:
-				$ret=(!$conf->global->SOCIETE_IDPROF6_UNIQUE?false:true);
-				break;
-			default:
-				$ret=false;
-		}
-
-		return $ret;
-	}
+        global $conf;
+
+            switch($idprof)
+        {
+            case 1:
+                $ret=(!$conf->global->SOCIETE_IDPROF1_UNIQUE?false:true);
+                break;
+            case 2:
+                $ret=(!$conf->global->SOCIETE_IDPROF2_UNIQUE?false:true);
+                break;
+            case 3:
+                $ret=(!$conf->global->SOCIETE_IDPROF3_UNIQUE?false:true);
+                break;
+            case 4:
+                $ret=(!$conf->global->SOCIETE_IDPROF4_UNIQUE?false:true);
+                break;
+            case 5:
+                $ret=(!$conf->global->SOCIETE_IDPROF5_UNIQUE?false:true);
+                break;
+            case 6:
+                $ret=(!$conf->global->SOCIETE_IDPROF6_UNIQUE?false:true);
+                break;
+            default:
+                $ret=false;
+        }
+
+        return $ret;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Verify if a profid exists into database for others thirds
-	 *
-	 *    @param	string	$idprof		'idprof1','idprof2','idprof3','idprof4','idprof5','idprof6','email' (Example: idprof1=siren, idprof2=siret, idprof3=naf, idprof4=rcs/rm)
-	 *    @param	string	$value		Value of profid
-	 *    @param	int		$socid		Id of thirdparty to exclude (if update)
-	 *    @return   boolean				True if exists, False if not
-	 */
-	function id_prof_exists($idprof, $value, $socid=0)
-	{
+    /**
+     *    Verify if a profid exists into database for others thirds
+     *
+     *    @param	string	$idprof		'idprof1','idprof2','idprof3','idprof4','idprof5','idprof6','email' (Example: idprof1=siren, idprof2=siret, idprof3=naf, idprof4=rcs/rm)
+     *    @param	string	$value		Value of profid
+     *    @param	int		$socid		Id of thirdparty to exclude (if update)
+     *    @return   boolean				True if exists, False if not
+     */
+    function id_prof_exists($idprof, $value, $socid=0)
+    {
         // phpcs:enable
-		$field = $idprof;
-
-	 	switch($idprof)	// For backward compatibility
-		{
-			case '1':
-			case 'idprof1':
-				$field="siren";
-				break;
-			case '2':
-			case 'idprof2':
-				$field="siret";
-				break;
-			case '3':
-			case 'idprof3':
-				$field="ape";
-				break;
-			case '4':
-			case 'idprof4':
-				$field="idprof4";
-				break;
-			case '5':
-				$field="idprof5";
-				break;
-			case '6':
-				$field="idprof6";
-				break;
-	 	}
-
-		 //Verify duplicate entries
-		$sql  = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
-		if($socid) $sql .= " AND rowid <> ".$socid;
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$obj = $this->db->fetch_object($resql);
-			$count = $obj->idprof;
-		}
-		else
-		{
-			$count = 0;
-			print $this->db->error();
-		}
-		$this->db->free($resql);
-
-		if ($count > 0) return true;
-		else return false;
-	}
+        $field = $idprof;
+
+            switch($idprof)	// For backward compatibility
+        {
+            case '1':
+            case 'idprof1':
+                $field="siren";
+                break;
+            case '2':
+            case 'idprof2':
+                $field="siret";
+                break;
+            case '3':
+            case 'idprof3':
+                $field="ape";
+                break;
+            case '4':
+            case 'idprof4':
+                $field="idprof4";
+                break;
+            case '5':
+                $field="idprof5";
+                break;
+            case '6':
+                $field="idprof6";
+                break;
+            }
+
+            //Verify duplicate entries
+        $sql  = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
+        if($socid) $sql .= " AND rowid <> ".$socid;
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $obj = $this->db->fetch_object($resql);
+            $count = $obj->idprof;
+        }
+        else
+        {
+            $count = 0;
+            print $this->db->error();
+        }
+        $this->db->free($resql);
+
+        if ($count > 0) return true;
+        else return false;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Verifie la validite d'un identifiant professionnel en fonction du pays de la societe (siren, siret, ...)
-	 *
-	 *  @param	int			$idprof         1,2,3,4 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm)
-	 *  @param  Societe		$soc            Objet societe
-	 *  @return int             			<=0 if KO, >0 if OK
-	 *  TODO better to have this in a lib than into a business class
-	 */
-	function id_prof_check($idprof,$soc)
-	{
+    /**
+     *  Verifie la validite d'un identifiant professionnel en fonction du pays de la societe (siren, siret, ...)
+     *
+     *  @param	int			$idprof         1,2,3,4 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm)
+     *  @param  Societe		$soc            Objet societe
+     *  @return int             			<=0 if KO, >0 if OK
+     *  TODO better to have this in a lib than into a business class
+     */
+    function id_prof_check($idprof,$soc)
+    {
         // phpcs:enable
-		global $conf;
-
-		$ok=1;
-
-		if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
-
-		// Verifie SIREN si pays FR
-		if ($idprof == 1 && $soc->country_code == 'FR')
-		{
-			$chaine=trim($this->idprof1);
-			$chaine=preg_replace('/(\s)/','',$chaine);
-
-			if (!is_numeric($chaine)) return -1;
-			if (dol_strlen($chaine) != 9) return -1;
-
-			// on prend chaque chiffre un par un
-			// si son index (position dans la chaîne en commence à 0 au premier caractère) est impair
-			// on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
-			// on ajoute cette valeur à la somme totale
-
-			for ($index = 0; $index < 9; $index ++)
-			{
-				$number = (int) $siren[$index];
-				if (($index % 2) != 0) { if (($number *= 2) > 9) $number -= 9; }
-				$sum += $number;
-			}
-
-			// le numéro est valide si la somme des chiffres est multiple de 10
-			if (($sum % 10) != 0) return -1;
-		}
-
-		// Verifie SIRET si pays FR
-		if ($idprof == 2 && $soc->country_code == 'FR')
-		{
-			$chaine=trim($this->idprof2);
-			$chaine=preg_replace('/(\s)/','',$chaine);
-
-			if (!is_numeric($chaine)) return -1;
-			if (dol_strlen($chaine) != 14) return -1;
-
-			// on prend chaque chiffre un par un
-			// si son index (position dans la chaîne en commence à 0 au premier caractère) est pair
-			// on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
-			// on ajoute cette valeur à la somme totale
-
-			for ($index = 0; $index < 14; $index ++)
-			{
-				$number = (int) $chaine[$index];
-				if (($index % 2) == 0) { if (($number *= 2) > 9) $number -= 9; }
-				$sum += $number;
-			}
-
-			// le numéro est valide si la somme des chiffres est multiple de 10
-			if (($sum % 10) != 0) return -1;
-		}
-
-		//Verify CIF/NIF/NIE if pays ES
-		//Returns: 1 if NIF ok, 2 if CIF ok, 3 if NIE ok, -1 if NIF bad, -2 if CIF bad, -3 if NIE bad, 0 if unexpected bad
-		if ($idprof == 1 && $soc->country_code == 'ES')
-		{
-			$string=trim($this->idprof1);
-			$string=preg_replace('/(\s)/','',$string);
-			$string = strtoupper($string);
-
-			for ($i = 0; $i < 9; $i ++)
-			$num[$i] = substr($string, $i, 1);
-
-			//Check format
-			if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string))
-			return 0;
-
-			//Check NIF
-			if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string))
-				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
-				return 1;
-				else
-				return -1;
-
-			//algorithm checking type code CIF
-			$sum = $num[2] + $num[4] + $num[6];
-			for ($i = 1; $i < 8; $i += 2)
-			$sum += intval(substr((2 * $num[$i]),0,1)) + intval(substr((2 * $num[$i]),1,1));
-			$n = 10 - substr($sum, strlen($sum) - 1, 1);
-
-			//Chek special NIF
-			if (preg_match('/^[KLM]{1}/', $string))
-				if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
-				return 1;
-				else
-				return -1;
-
-			//Check CIF
-			if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string))
-				if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
-				return 2;
-				else
-				return -2;
-
-			//Check NIE T
-			if (preg_match('/^[T]{1}/', $string))
-				if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
-				return 3;
-				else
-				return -3;
-
-			//Check NIE XYZ
-			if (preg_match('/^[XYZ]{1}/', $string))
-				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X','Y','Z'), array('0','1','2'), $string), 0, 8) % 23, 1))
-				return 3;
-				else
-				return -3;
-
-			//Can not be verified
-			return -4;
-		}
-
-		//Verify NIF if country is PT
-		//Returns: 1 if NIF ok, -1 if NIF bad, 0 if unexpected bad
-		if ($idprof == 1 && $soc->country_code == 'PT')
-		{
-			$string=trim($this->idprof1);
-			$string=preg_replace('/(\s)/','',$string);
-
-			for ($i = 0; $i < 9; $i ++) {
-				$num[$i] = substr($string, $i, 1);
-			}
-
-			//Check NIF
-			if (preg_match('/(^[0-9]{9}$)/', $string)) {
-				return 1;
-			}
-			else {
-				return -1;
-			}
-		}
-
-		return $ok;
-	}
+        global $conf;
+
+        $ok=1;
+
+        if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
+
+        // Verifie SIREN si pays FR
+        if ($idprof == 1 && $soc->country_code == 'FR')
+        {
+            $chaine=trim($this->idprof1);
+            $chaine=preg_replace('/(\s)/','',$chaine);
+
+            if (!is_numeric($chaine)) return -1;
+            if (dol_strlen($chaine) != 9) return -1;
+
+            // on prend chaque chiffre un par un
+            // si son index (position dans la chaîne en commence à 0 au premier caractère) est impair
+            // on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
+            // on ajoute cette valeur à la somme totale
+
+            for ($index = 0; $index < 9; $index ++)
+            {
+                $number = (int) $siren[$index];
+                if (($index % 2) != 0) { if (($number *= 2) > 9) $number -= 9; }
+                $sum += $number;
+            }
+
+            // le numéro est valide si la somme des chiffres est multiple de 10
+            if (($sum % 10) != 0) return -1;
+        }
+
+        // Verifie SIRET si pays FR
+        if ($idprof == 2 && $soc->country_code == 'FR')
+        {
+            $chaine=trim($this->idprof2);
+            $chaine=preg_replace('/(\s)/','',$chaine);
+
+            if (!is_numeric($chaine)) return -1;
+            if (dol_strlen($chaine) != 14) return -1;
+
+            // on prend chaque chiffre un par un
+            // si son index (position dans la chaîne en commence à 0 au premier caractère) est pair
+            // on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
+            // on ajoute cette valeur à la somme totale
+
+            for ($index = 0; $index < 14; $index ++)
+            {
+                $number = (int) $chaine[$index];
+                if (($index % 2) == 0) { if (($number *= 2) > 9) $number -= 9; }
+                $sum += $number;
+            }
+
+            // le numéro est valide si la somme des chiffres est multiple de 10
+            if (($sum % 10) != 0) return -1;
+        }
+
+        //Verify CIF/NIF/NIE if pays ES
+        //Returns: 1 if NIF ok, 2 if CIF ok, 3 if NIE ok, -1 if NIF bad, -2 if CIF bad, -3 if NIE bad, 0 if unexpected bad
+        if ($idprof == 1 && $soc->country_code == 'ES')
+        {
+            $string=trim($this->idprof1);
+            $string=preg_replace('/(\s)/','',$string);
+            $string = strtoupper($string);
+
+            for ($i = 0; $i < 9; $i ++)
+            $num[$i] = substr($string, $i, 1);
+
+            //Check format
+            if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string))
+            return 0;
+
+            //Check NIF
+            if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string))
+                if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
+                return 1;
+                else
+                return -1;
+
+            //algorithm checking type code CIF
+            $sum = $num[2] + $num[4] + $num[6];
+            for ($i = 1; $i < 8; $i += 2)
+            $sum += intval(substr((2 * $num[$i]),0,1)) + intval(substr((2 * $num[$i]),1,1));
+            $n = 10 - substr($sum, strlen($sum) - 1, 1);
+
+            //Chek special NIF
+            if (preg_match('/^[KLM]{1}/', $string))
+                if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
+                return 1;
+                else
+                return -1;
+
+            //Check CIF
+            if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string))
+                if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
+                return 2;
+                else
+                return -2;
+
+            //Check NIE T
+            if (preg_match('/^[T]{1}/', $string))
+                if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
+                return 3;
+                else
+                return -3;
+
+            //Check NIE XYZ
+            if (preg_match('/^[XYZ]{1}/', $string))
+                if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X','Y','Z'), array('0','1','2'), $string), 0, 8) % 23, 1))
+                return 3;
+                else
+                return -3;
+
+            //Can not be verified
+            return -4;
+        }
+
+        //Verify NIF if country is PT
+        //Returns: 1 if NIF ok, -1 if NIF bad, 0 if unexpected bad
+        if ($idprof == 1 && $soc->country_code == 'PT')
+        {
+            $string=trim($this->idprof1);
+            $string=preg_replace('/(\s)/','',$string);
+
+            for ($i = 0; $i < 9; $i ++) {
+                $num[$i] = substr($string, $i, 1);
+            }
+
+            //Check NIF
+            if (preg_match('/(^[0-9]{9}$)/', $string)) {
+                return 1;
+            }
+            else {
+                return -1;
+            }
+        }
+
+        return $ok;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *   Return an url to check online a professional id or empty string
-	 *
-	 *   @param		int		$idprof         1,2,3,4 (Example: 1=siren,2=siret,3=naf,4=rcs/rm)
-	 *   @param 	Societe	$thirdparty     Object thirdparty
-	 *   @return	string          		Url or empty string if no URL known
-	 *   TODO better in a lib than into business class
-	 */
-	function id_prof_url($idprof,$thirdparty)
-	{
+    /**
+     *   Return an url to check online a professional id or empty string
+     *
+     *   @param		int		$idprof         1,2,3,4 (Example: 1=siren,2=siret,3=naf,4=rcs/rm)
+     *   @param 	Societe	$thirdparty     Object thirdparty
+     *   @return	string          		Url or empty string if no URL known
+     *   TODO better in a lib than into business class
+     */
+    function id_prof_url($idprof,$thirdparty)
+    {
         // phpcs:enable
-		global $conf,$langs,$hookmanager;
+        global $conf,$langs,$hookmanager;
 
-		$url='';
-		$action = '';
+        $url='';
+        $action = '';
 
-		$hookmanager->initHooks(array('idprofurl'));
-		$parameters=array('idprof'=>$idprof, 'company'=>$thirdparty);
-		$reshook=$hookmanager->executeHooks('getIdProfUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-		if (empty($reshook)) {
-			if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
-				return '';
-			}
+        $hookmanager->initHooks(array('idprofurl'));
+        $parameters=array('idprof'=>$idprof, 'company'=>$thirdparty);
+        $reshook=$hookmanager->executeHooks('getIdProfUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+        if (empty($reshook)) {
+            if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+                return '';
+            }
 
-			// TODO Move links to validate professional ID into a dictionary table "country" + "link"
+            // TODO Move links to validate professional ID into a dictionary table "country" + "link"
             $strippedIdProf1 = str_replace(' ', '', $thirdparty->idprof1);
-			if ($idprof == 1 && $thirdparty->country_code == 'FR') {
-				$url='http://www.societe.com/cgi-bin/search?champs='.$strippedIdProf1;    // See also http://avis-situation-sirene.insee.fr/
-			}
-			if ($idprof == 1 && ($thirdparty->country_code == 'GB' || $thirdparty->country_code == 'UK')) {
-				$url='https://beta.companieshouse.gov.uk/company/'.$strippedIdProf1;
-			}
-			if ($idprof == 1 && $thirdparty->country_code == 'ES') {
-				$url='http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$strippedIdProf1;
-			}
-			if ($idprof == 1 && $thirdparty->country_code == 'IN') {
-				$url='http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$strippedIdProf1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
-			}
-			if ($idprof == 1 && $thirdparty->country_code == 'PT') {
-				$url='http://www.nif.pt/'.$strippedIdProf1;
-			}
-
-			if ($url) {
-				return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
-			}
-		}
-		else {
-			return $hookmanager->resPrint;
-		}
-
-		return '';
-	}
+            if ($idprof == 1 && $thirdparty->country_code == 'FR') {
+                $url='http://www.societe.com/cgi-bin/search?champs='.$strippedIdProf1;    // See also http://avis-situation-sirene.insee.fr/
+            }
+            if ($idprof == 1 && ($thirdparty->country_code == 'GB' || $thirdparty->country_code == 'UK')) {
+                $url='https://beta.companieshouse.gov.uk/company/'.$strippedIdProf1;
+            }
+            if ($idprof == 1 && $thirdparty->country_code == 'ES') {
+                $url='http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$strippedIdProf1;
+            }
+            if ($idprof == 1 && $thirdparty->country_code == 'IN') {
+                $url='http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$strippedIdProf1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
+            }
+            if ($idprof == 1 && $thirdparty->country_code == 'PT') {
+                $url='http://www.nif.pt/'.$strippedIdProf1;
+            }
+
+            if ($url) {
+                return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
+            }
+        }
+        else {
+            return $hookmanager->resPrint;
+        }
+
+        return '';
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *   Indique si la societe a des projets
-	 *
-	 *   @return     bool	   true si la societe a des projets, false sinon
-	 */
-	function has_projects()
-	{
+    /**
+     *   Indique si la societe a des projets
+     *
+     *   @return     bool	   true si la societe a des projets, false sinon
+     */
+    function has_projects()
+    {
         // phpcs:enable
-		$sql = 'SELECT COUNT(*) as numproj FROM '.MAIN_DB_PREFIX.'projet WHERE fk_soc = ' . $this->id;
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$obj = $this->db->fetch_object($resql);
-			$count = $obj->numproj;
-		}
-		else
-		{
-			$count = 0;
-			print $this->db->error();
-		}
-		$this->db->free($resql);
-		return ($count > 0);
-	}
-
-
-	/**
-	 *  Load information for tab info
-	 *
-	 *  @param  int		$id     Id of thirdparty to load
-	 *  @return	void
-	 */
-	function info($id)
-	{
-		$sql = "SELECT s.rowid, s.nom as name, s.datec as date_creation, tms as date_modification,";
-		$sql.= " fk_user_creat, fk_user_modif";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-		$sql.= " WHERE s.rowid = ".$id;
-
-		$result=$this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
-				$obj = $this->db->fetch_object($result);
-
-				$this->id = $obj->rowid;
-
-				if ($obj->fk_user_creat) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_creat);
-					$this->user_creation     = $cuser;
-				}
-
-				if ($obj->fk_user_modif) {
-					$muser = new User($this->db);
-					$muser->fetch($obj->fk_user_modif);
-					$this->user_modification = $muser;
-				}
-
-				$this->ref			     = $obj->name;
-				$this->date_creation     = $this->db->jdate($obj->date_creation);
-				$this->date_modification = $this->db->jdate($obj->date_modification);
-			}
-
-			$this->db->free($result);
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-	}
-
-	/**
-	 *  Return if third party is a company (Business) or an end user (Consumer)
-	 *
-	 *  @return    boolean     true=is a company, false=a and user
-	 */
-	function isACompany()
-	{
-		global $conf;
-
-		// Define if third party is treated as company (or not) when nature is unknown
-		$isacompany=empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES)?0:1; // 0 by default
-		if (! empty($this->tva_intra)) $isacompany=1;
-		else if (! empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN')
-		{
-			// TODO Add a field is_a_company into dictionary
-			if (preg_match('/^TE_PRIVATE/', $this->typent_code)) $isacompany=0;
-			else $isacompany=1;
-		}
-
-		return $isacompany;
-	}
-
-	/**
-	 *  Return if a company is inside the EEC (European Economic Community)
-	 *
-	 *  @return     boolean		true = country inside EEC, false = country outside EEC
-	 */
-	function isInEEC()
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-		return isInEEC($this);
-	}
+        $sql = 'SELECT COUNT(*) as numproj FROM '.MAIN_DB_PREFIX.'projet WHERE fk_soc = ' . $this->id;
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $obj = $this->db->fetch_object($resql);
+            $count = $obj->numproj;
+        }
+        else
+        {
+            $count = 0;
+            print $this->db->error();
+        }
+        $this->db->free($resql);
+        return ($count > 0);
+    }
+
+
+    /**
+     *  Load information for tab info
+     *
+     *  @param  int		$id     Id of thirdparty to load
+     *  @return	void
+     */
+    function info($id)
+    {
+        $sql = "SELECT s.rowid, s.nom as name, s.datec as date_creation, tms as date_modification,";
+        $sql.= " fk_user_creat, fk_user_modif";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+        $sql.= " WHERE s.rowid = ".$id;
+
+        $result=$this->db->query($sql);
+        if ($result)
+        {
+            if ($this->db->num_rows($result))
+            {
+                $obj = $this->db->fetch_object($result);
+
+                $this->id = $obj->rowid;
+
+                if ($obj->fk_user_creat) {
+                    $cuser = new User($this->db);
+                    $cuser->fetch($obj->fk_user_creat);
+                    $this->user_creation     = $cuser;
+                }
+
+                if ($obj->fk_user_modif) {
+                    $muser = new User($this->db);
+                    $muser->fetch($obj->fk_user_modif);
+                    $this->user_modification = $muser;
+                }
+
+                $this->ref			     = $obj->name;
+                $this->date_creation     = $this->db->jdate($obj->date_creation);
+                $this->date_modification = $this->db->jdate($obj->date_modification);
+            }
+
+            $this->db->free($result);
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+    }
+
+    /**
+     *  Return if third party is a company (Business) or an end user (Consumer)
+     *
+     *  @return    boolean     true=is a company, false=a and user
+     */
+    function isACompany()
+    {
+        global $conf;
+
+        // Define if third party is treated as company (or not) when nature is unknown
+        $isacompany=empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES)?0:1; // 0 by default
+        if (! empty($this->tva_intra)) $isacompany=1;
+        else if (! empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN')
+        {
+            // TODO Add a field is_a_company into dictionary
+            if (preg_match('/^TE_PRIVATE/', $this->typent_code)) $isacompany=0;
+            else $isacompany=1;
+        }
+
+        return $isacompany;
+    }
+
+    /**
+     *  Return if a company is inside the EEC (European Economic Community)
+     *
+     *  @return     boolean		true = country inside EEC, false = country outside EEC
+     */
+    function isInEEC()
+    {
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+        return isInEEC($this);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Charge la liste des categories fournisseurs
-	 *
-	 *  @return    int      0 if success, <> 0 if error
-	 */
-	function LoadSupplierCateg()
-	{
+    /**
+     *  Charge la liste des categories fournisseurs
+     *
+     *  @return    int      0 if success, <> 0 if error
+     */
+    function LoadSupplierCateg()
+    {
         // phpcs:enable
-		$this->SupplierCategories = array();
-		$sql = "SELECT rowid, label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
-		$sql.= " WHERE type = ".Categorie::TYPE_SUPPLIER;
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql) )
-			{
-				$this->SupplierCategories[$obj->rowid] = $obj->label;
-			}
-			return 0;
-		}
-		else
-		{
-			return -1;
-		}
-	}
+        $this->SupplierCategories = array();
+        $sql = "SELECT rowid, label";
+        $sql.= " FROM ".MAIN_DB_PREFIX."categorie";
+        $sql.= " WHERE type = ".Categorie::TYPE_SUPPLIER;
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            while ($obj = $this->db->fetch_object($resql) )
+            {
+                $this->SupplierCategories[$obj->rowid] = $obj->label;
+            }
+            return 0;
+        }
+        else
+        {
+            return -1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Insert link supplier - category
-	 *
-	 *	@param	int		$categorie_id		Id of category
-	 *  @return int      					0 if success, <> 0 if error
-	 */
-	function AddFournisseurInCategory($categorie_id)
-	{
+    /**
+     *  Insert link supplier - category
+     *
+     *	@param	int		$categorie_id		Id of category
+     *  @return int      					0 if success, <> 0 if error
+     */
+    function AddFournisseurInCategory($categorie_id)
+    {
         // phpcs:enable
-		if ($categorie_id > 0 && $this->id > 0)
-		{
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
-			$sql.= " VALUES (".$categorie_id.", ".$this->id.")";
+        if ($categorie_id > 0 && $this->id > 0)
+        {
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
+            $sql.= " VALUES (".$categorie_id.", ".$this->id.")";
 
-			if ($resql=$this->db->query($sql)) return 0;
-		}
-		else
-		{
-			return 0;
-		}
-		return -1;
-	}
+            if ($resql=$this->db->query($sql)) return 0;
+        }
+        else
+        {
+            return 0;
+        }
+        return -1;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Create a third party into database from a member object
-	 *
-	 *  @param	Adherent	$member			Object member
-	 * 	@param	string		$socname		Name of third party to force
-	 *	@param	string		$socalias		Alias name of third party to force
-	 *  @param	string		$customercode	Customer code
-	 *  @return int							<0 if KO, id of created account if OK
-	 */
-	function create_from_member(Adherent $member, $socname='', $socalias='', $customercode='')
-	{
+    /**
+     *  Create a third party into database from a member object
+     *
+     *  @param	Adherent	$member			Object member
+     * 	@param	string		$socname		Name of third party to force
+     *	@param	string		$socalias		Alias name of third party to force
+     *  @param	string		$customercode	Customer code
+     *  @return int							<0 if KO, id of created account if OK
+     */
+    function create_from_member(Adherent $member, $socname='', $socalias='', $customercode='')
+    {
         // phpcs:enable
-		global $user,$langs;
-
-		dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
-
-		$name = $socname?$socname:$member->societe;
-		if (empty($name)) $name=$member->getFullName($langs);
-
-		$alias = $socalias?$socalias:'';
-
-		// Positionne parametres
-		$this->nom=$name;				// TODO deprecated
-		$this->name=$name;
-		$this->name_alias=$alias;
-		$this->address=$member->address;
-		$this->zip=$member->zip;
-		$this->town=$member->town;
-		$this->country_code=$member->country_code;
-		$this->country_id=$member->country_id;
-		$this->phone=$member->phone;       // Prof phone
-		$this->email=$member->email;
-		$this->skype=$member->skype;
-		$this->twitter=$member->twitter;
-		$this->facebook=$member->facebook;
-
-		$this->client = 1;				// A member is a customer by default
-		$this->code_client = ($customercode?$customercode:-1);
-		$this->code_fournisseur = -1;
-
-		$this->db->begin();
-
-		// Cree et positionne $this->id
-		$result=$this->create($user);
-		if ($result >= 0)
-		{
-			$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
-			$sql.= " SET fk_soc=".$this->id;
-			$sql.= " WHERE rowid=".$member->id;
-
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				$this->db->commit();
-				return $this->id;
-			}
-			else
-			{
-				$this->error=$this->db->error();
-
-				$this->db->rollback();
-				return -1;
-			}
-		}
-		else
-		{
-			// $this->error deja positionne
-			dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',',$this->errors), LOG_ERR);
-
-			$this->db->rollback();
-			return $result;
-		}
-	}
-
-	/**
-	 * 	Set properties with value into $conf
-	 *
-	 * 	@param	Conf	$conf		Conf object (possibility to use another entity)
-	 * 	@return	void
-	 */
-	function setMysoc(Conf $conf)
-	{
-		global $langs;
-
-		$this->id=0;
-		$this->name=empty($conf->global->MAIN_INFO_SOCIETE_NOM)?'':$conf->global->MAIN_INFO_SOCIETE_NOM;
-		$this->address=empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS;
-		$this->zip=empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP;
-		$this->town=empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN;
-		$this->state_id=empty($conf->global->MAIN_INFO_SOCIETE_STATE)?'':$conf->global->MAIN_INFO_SOCIETE_STATE;
-		$this->region_code=empty($conf->global->MAIN_INFO_SOCIETE_REGION)?'':$conf->global->MAIN_INFO_SOCIETE_REGION;
-		$this->object=empty($conf->global->MAIN_INFO_SOCIETE_OBJECT)?'':$conf->global->MAIN_INFO_SOCIETE_OBJECT;
-
-		$this->note_private=empty($conf->global->MAIN_INFO_SOCIETE_NOTE)?'':$conf->global->MAIN_INFO_SOCIETE_NOTE;
-
-		$this->nom=$this->name; 									// deprecated
-
-		// We define country_id, country_code and country
-		$country_id=$country_code=$country_label='';
-		if (! empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
-		{
-			$tmp=explode(':',$conf->global->MAIN_INFO_SOCIETE_COUNTRY);
-			$country_id=$tmp[0];
-			if (! empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
-			{
-				$country_code=$tmp[1];
-				$country_label=$tmp[2];
-			}
-			else                    // For backward compatibility
-			{
-				dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_ERR);
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-				$country_code=getCountry($country_id,2,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
-				$country_label=getCountry($country_id,0,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
-			}
-		}
-		$this->country_id=$country_id;
-		$this->country_code=$country_code;
-		$this->country=$country_label;
-		if (is_object($langs)) $this->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
-
-		$this->phone=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL;
-		$this->fax=empty($conf->global->MAIN_INFO_SOCIETE_FAX)?'':$conf->global->MAIN_INFO_SOCIETE_FAX;
-		$this->url=empty($conf->global->MAIN_INFO_SOCIETE_WEB)?'':$conf->global->MAIN_INFO_SOCIETE_WEB;
-		// Id prof generiques
-		$this->idprof1=empty($conf->global->MAIN_INFO_SIREN)?'':$conf->global->MAIN_INFO_SIREN;
-		$this->idprof2=empty($conf->global->MAIN_INFO_SIRET)?'':$conf->global->MAIN_INFO_SIRET;
-		$this->idprof3=empty($conf->global->MAIN_INFO_APE)?'':$conf->global->MAIN_INFO_APE;
-		$this->idprof4=empty($conf->global->MAIN_INFO_RCS)?'':$conf->global->MAIN_INFO_RCS;
-		$this->idprof5=empty($conf->global->MAIN_INFO_PROFID5)?'':$conf->global->MAIN_INFO_PROFID5;
-		$this->idprof6=empty($conf->global->MAIN_INFO_PROFID6)?'':$conf->global->MAIN_INFO_PROFID6;
-		$this->tva_intra=empty($conf->global->MAIN_INFO_TVAINTRA)?'':$conf->global->MAIN_INFO_TVAINTRA;	// VAT number, not necessarly INTRA.
-		$this->managers=empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS)?'':$conf->global->MAIN_INFO_SOCIETE_MANAGERS;
-		$this->capital=empty($conf->global->MAIN_INFO_CAPITAL)?'':$conf->global->MAIN_INFO_CAPITAL;
-		$this->forme_juridique_code=empty($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE)?'':$conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE;
-		$this->email=empty($conf->global->MAIN_INFO_SOCIETE_MAIL)?'':$conf->global->MAIN_INFO_SOCIETE_MAIL;
-		$this->logo=empty($conf->global->MAIN_INFO_SOCIETE_LOGO)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO;
-		$this->logo_small=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL;
-		$this->logo_mini=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
-
-		// Define if company use vat or not
-		$this->tva_assuj=$conf->global->FACTURE_TVAOPTION;
-
-		// Define if company use local taxes
-		$this->localtax1_assuj=((isset($conf->global->FACTURE_LOCAL_TAX1_OPTION) && ($conf->global->FACTURE_LOCAL_TAX1_OPTION=='1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on'))?1:0);
-		$this->localtax2_assuj=((isset($conf->global->FACTURE_LOCAL_TAX2_OPTION) && ($conf->global->FACTURE_LOCAL_TAX2_OPTION=='1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on'))?1:0);
-	}
-
-	/**
-	 *  Initialise an instance with random values.
-	 *  Used to build previews or test instances.
-	 *	id must be 0 if object instance is a specimen.
-	 *
-	 *  @return	void
-	 */
-	function initAsSpecimen()
-	{
-		$now=dol_now();
-
-		// Initialize parameters
-		$this->id=0;
-		$this->name = 'THIRDPARTY SPECIMEN '.dol_print_date($now,'dayhourlog');
-		$this->nom = $this->name;   // For backward compatibility
-		$this->ref_ext = 'Ref ext';
-		$this->specimen=1;
-		$this->address='21 jump street';
-		$this->zip='99999';
-		$this->town='MyTown';
-		$this->state_id=1;
-		$this->state_code='AA';
-		$this->state='MyState';
-		$this->country_id=1;
-		$this->country_code='FR';
-		$this->email='specimen@specimen.com';
-		$this->skype='tom.hanson';
-		$this->twitter='tomhanson';
-		$this->facebook='tomhanson';
-		$this->url='http://www.specimen.com';
-
-		$this->phone='0909090901';
-		$this->fax='0909090909';
-
-		$this->code_client='CC-'.dol_print_date($now,'dayhourlog');
-		$this->code_fournisseur='SC-'.dol_print_date($now,'dayhourlog');
-		$this->capital=10000;
-		$this->client=1;
-		$this->prospect=1;
-		$this->fournisseur=1;
-		$this->tva_assuj=1;
-		$this->tva_intra='EU1234567';
-		$this->note_public='This is a comment (public)';
-		$this->note_private='This is a comment (private)';
-
-		$this->idprof1='idprof1';
-		$this->idprof2='idprof2';
-		$this->idprof3='idprof3';
-		$this->idprof4='idprof4';
-		$this->idprof5='idprof5';
-		$this->idprof6='idprof6';
-	}
-
-	/**
-	 *  Check if we must use localtax feature or not according to country (country of $mysoc in most cases).
-	 *
-	 *	@param		int		$localTaxNum	To get info for only localtax1 or localtax2
-	 *  @return		boolean					true or false
-	 */
-	function useLocalTax($localTaxNum=0)
-	{
-		$sql  = "SELECT t.localtax1, t.localtax2";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-		$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
-		$sql .= " AND t.active = 1";
-		if (empty($localTaxNum))   $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
-		elseif ($localTaxNum == 1) $sql .= " AND t.localtax1_type <> '0'";
-		elseif ($localTaxNum == 2) $sql .= " AND t.localtax2_type <> '0'";
-
-		dol_syslog("useLocalTax", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-   			return ($this->db->num_rows($resql) > 0);
-		}
-		else return false;
-	}
-
-	/**
-	 *  Check if we must use NPR Vat (french stupid rule) or not according to country (country of $mysoc in most cases).
-	 *
-	 *  @return		boolean					true or false
-	 */
-	function useNPR()
-	{
-		$sql  = "SELECT t.rowid";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-		$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
-		$sql .= " AND t.active = 1 AND t.recuperableonly = 1";
-
-		dol_syslog("useNPR", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			return ($this->db->num_rows($resql) > 0);
-		}
-		else return false;
-	}
-
-	/**
-	 *  Check if we must use revenue stamps feature or not according to country (country of $mysocin most cases).
-	 *
-	 *  @return		boolean			true or false
-	 */
-	function useRevenueStamp()
-	{
-		$sql  = "SELECT COUNT(*) as nb";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r, ".MAIN_DB_PREFIX."c_country as c";
-		$sql .= " WHERE r.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
-		$sql .= " AND r.active = 1";
-
-		dol_syslog("useRevenueStamp", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$obj=$this->db->fetch_object($resql);
-   			return (($obj->nb > 0)?true:false);
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return false;
-		}
-	}
-
-	/**
-	 *	Return prostect level
-	 *
-	 *  @return     string        Libelle
-	 */
-	function getLibProspLevel()
-	{
-		return $this->LibProspLevel($this->fk_prospectlevel);
-	}
+        global $user,$langs;
+
+        dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
+
+        $name = $socname?$socname:$member->societe;
+        if (empty($name)) $name=$member->getFullName($langs);
+
+        $alias = $socalias?$socalias:'';
+
+        // Positionne parametres
+        $this->nom=$name;				// TODO deprecated
+        $this->name=$name;
+        $this->name_alias=$alias;
+        $this->address=$member->address;
+        $this->zip=$member->zip;
+        $this->town=$member->town;
+        $this->country_code=$member->country_code;
+        $this->country_id=$member->country_id;
+        $this->phone=$member->phone;       // Prof phone
+        $this->email=$member->email;
+        $this->skype=$member->skype;
+        $this->twitter=$member->twitter;
+        $this->facebook=$member->facebook;
+
+        $this->client = 1;				// A member is a customer by default
+        $this->code_client = ($customercode?$customercode:-1);
+        $this->code_fournisseur = -1;
+
+        $this->db->begin();
+
+        // Cree et positionne $this->id
+        $result=$this->create($user);
+        if ($result >= 0)
+        {
+            $sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
+            $sql.= " SET fk_soc=".$this->id;
+            $sql.= " WHERE rowid=".$member->id;
+
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                $this->db->commit();
+                return $this->id;
+            }
+            else
+            {
+                $this->error=$this->db->error();
+
+                $this->db->rollback();
+                return -1;
+            }
+        }
+        else
+        {
+            // $this->error deja positionne
+            dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',',$this->errors), LOG_ERR);
+
+            $this->db->rollback();
+            return $result;
+        }
+    }
+
+    /**
+     * 	Set properties with value into $conf
+     *
+     * 	@param	Conf	$conf		Conf object (possibility to use another entity)
+     * 	@return	void
+     */
+    function setMysoc(Conf $conf)
+    {
+        global $langs;
+
+        $this->id=0;
+        $this->name=empty($conf->global->MAIN_INFO_SOCIETE_NOM)?'':$conf->global->MAIN_INFO_SOCIETE_NOM;
+        $this->address=empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS;
+        $this->zip=empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP;
+        $this->town=empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN;
+        $this->state_id=empty($conf->global->MAIN_INFO_SOCIETE_STATE)?'':$conf->global->MAIN_INFO_SOCIETE_STATE;
+        $this->region_code=empty($conf->global->MAIN_INFO_SOCIETE_REGION)?'':$conf->global->MAIN_INFO_SOCIETE_REGION;
+        $this->object=empty($conf->global->MAIN_INFO_SOCIETE_OBJECT)?'':$conf->global->MAIN_INFO_SOCIETE_OBJECT;
+
+        $this->note_private=empty($conf->global->MAIN_INFO_SOCIETE_NOTE)?'':$conf->global->MAIN_INFO_SOCIETE_NOTE;
+
+        $this->nom=$this->name; 									// deprecated
+
+        // We define country_id, country_code and country
+        $country_id=$country_code=$country_label='';
+        if (! empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
+        {
+            $tmp=explode(':',$conf->global->MAIN_INFO_SOCIETE_COUNTRY);
+            $country_id=$tmp[0];
+            if (! empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
+            {
+                $country_code=$tmp[1];
+                $country_label=$tmp[2];
+            }
+            else                    // For backward compatibility
+            {
+                dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_ERR);
+                include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+                $country_code=getCountry($country_id,2,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
+                $country_label=getCountry($country_id,0,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
+            }
+        }
+        $this->country_id=$country_id;
+        $this->country_code=$country_code;
+        $this->country=$country_label;
+        if (is_object($langs)) $this->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
+
+        $this->phone=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL;
+        $this->fax=empty($conf->global->MAIN_INFO_SOCIETE_FAX)?'':$conf->global->MAIN_INFO_SOCIETE_FAX;
+        $this->url=empty($conf->global->MAIN_INFO_SOCIETE_WEB)?'':$conf->global->MAIN_INFO_SOCIETE_WEB;
+        // Id prof generiques
+        $this->idprof1=empty($conf->global->MAIN_INFO_SIREN)?'':$conf->global->MAIN_INFO_SIREN;
+        $this->idprof2=empty($conf->global->MAIN_INFO_SIRET)?'':$conf->global->MAIN_INFO_SIRET;
+        $this->idprof3=empty($conf->global->MAIN_INFO_APE)?'':$conf->global->MAIN_INFO_APE;
+        $this->idprof4=empty($conf->global->MAIN_INFO_RCS)?'':$conf->global->MAIN_INFO_RCS;
+        $this->idprof5=empty($conf->global->MAIN_INFO_PROFID5)?'':$conf->global->MAIN_INFO_PROFID5;
+        $this->idprof6=empty($conf->global->MAIN_INFO_PROFID6)?'':$conf->global->MAIN_INFO_PROFID6;
+        $this->tva_intra=empty($conf->global->MAIN_INFO_TVAINTRA)?'':$conf->global->MAIN_INFO_TVAINTRA;	// VAT number, not necessarly INTRA.
+        $this->managers=empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS)?'':$conf->global->MAIN_INFO_SOCIETE_MANAGERS;
+        $this->capital=empty($conf->global->MAIN_INFO_CAPITAL)?'':$conf->global->MAIN_INFO_CAPITAL;
+        $this->forme_juridique_code=empty($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE)?'':$conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE;
+        $this->email=empty($conf->global->MAIN_INFO_SOCIETE_MAIL)?'':$conf->global->MAIN_INFO_SOCIETE_MAIL;
+        $this->logo=empty($conf->global->MAIN_INFO_SOCIETE_LOGO)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO;
+        $this->logo_small=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL;
+        $this->logo_mini=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
+
+        // Define if company use vat or not
+        $this->tva_assuj=$conf->global->FACTURE_TVAOPTION;
+
+        // Define if company use local taxes
+        $this->localtax1_assuj=((isset($conf->global->FACTURE_LOCAL_TAX1_OPTION) && ($conf->global->FACTURE_LOCAL_TAX1_OPTION=='1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on'))?1:0);
+        $this->localtax2_assuj=((isset($conf->global->FACTURE_LOCAL_TAX2_OPTION) && ($conf->global->FACTURE_LOCAL_TAX2_OPTION=='1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on'))?1:0);
+    }
+
+    /**
+     *  Initialise an instance with random values.
+     *  Used to build previews or test instances.
+     *	id must be 0 if object instance is a specimen.
+     *
+     *  @return	void
+     */
+    function initAsSpecimen()
+    {
+        $now=dol_now();
+
+        // Initialize parameters
+        $this->id=0;
+        $this->name = 'THIRDPARTY SPECIMEN '.dol_print_date($now,'dayhourlog');
+        $this->nom = $this->name;   // For backward compatibility
+        $this->ref_ext = 'Ref ext';
+        $this->specimen=1;
+        $this->address='21 jump street';
+        $this->zip='99999';
+        $this->town='MyTown';
+        $this->state_id=1;
+        $this->state_code='AA';
+        $this->state='MyState';
+        $this->country_id=1;
+        $this->country_code='FR';
+        $this->email='specimen@specimen.com';
+        $this->skype='tom.hanson';
+        $this->twitter='tomhanson';
+        $this->facebook='tomhanson';
+        $this->url='http://www.specimen.com';
+
+        $this->phone='0909090901';
+        $this->fax='0909090909';
+
+        $this->code_client='CC-'.dol_print_date($now,'dayhourlog');
+        $this->code_fournisseur='SC-'.dol_print_date($now,'dayhourlog');
+        $this->capital=10000;
+        $this->client=1;
+        $this->prospect=1;
+        $this->fournisseur=1;
+        $this->tva_assuj=1;
+        $this->tva_intra='EU1234567';
+        $this->note_public='This is a comment (public)';
+        $this->note_private='This is a comment (private)';
+
+        $this->idprof1='idprof1';
+        $this->idprof2='idprof2';
+        $this->idprof3='idprof3';
+        $this->idprof4='idprof4';
+        $this->idprof5='idprof5';
+        $this->idprof6='idprof6';
+    }
+
+    /**
+     *  Check if we must use localtax feature or not according to country (country of $mysoc in most cases).
+     *
+     *	@param		int		$localTaxNum	To get info for only localtax1 or localtax2
+     *  @return		boolean					true or false
+     */
+    function useLocalTax($localTaxNum=0)
+    {
+        $sql  = "SELECT t.localtax1, t.localtax2";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
+        $sql .= " AND t.active = 1";
+        if (empty($localTaxNum))   $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
+        elseif ($localTaxNum == 1) $sql .= " AND t.localtax1_type <> '0'";
+        elseif ($localTaxNum == 2) $sql .= " AND t.localtax2_type <> '0'";
+
+        dol_syslog("useLocalTax", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+                return ($this->db->num_rows($resql) > 0);
+        }
+        else return false;
+    }
+
+    /**
+     *  Check if we must use NPR Vat (french stupid rule) or not according to country (country of $mysoc in most cases).
+     *
+     *  @return		boolean					true or false
+     */
+    function useNPR()
+    {
+        $sql  = "SELECT t.rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
+        $sql .= " AND t.active = 1 AND t.recuperableonly = 1";
+
+        dol_syslog("useNPR", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            return ($this->db->num_rows($resql) > 0);
+        }
+        else return false;
+    }
+
+    /**
+     *  Check if we must use revenue stamps feature or not according to country (country of $mysocin most cases).
+     *
+     *  @return		boolean			true or false
+     */
+    function useRevenueStamp()
+    {
+        $sql  = "SELECT COUNT(*) as nb";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r, ".MAIN_DB_PREFIX."c_country as c";
+        $sql .= " WHERE r.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
+        $sql .= " AND r.active = 1";
+
+        dol_syslog("useRevenueStamp", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $obj=$this->db->fetch_object($resql);
+                return (($obj->nb > 0)?true:false);
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            return false;
+        }
+    }
+
+    /**
+     *	Return prostect level
+     *
+     *  @return     string        Libelle
+     */
+    function getLibProspLevel()
+    {
+        return $this->LibProspLevel($this->fk_prospectlevel);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return label of prospect level
-	 *
-	 *  @param	int		$fk_prospectlevel   	Prospect level
-	 *  @return string        					label of level
-	 */
-	function LibProspLevel($fk_prospectlevel)
-	{
+    /**
+     *  Return label of prospect level
+     *
+     *  @param	int		$fk_prospectlevel   	Prospect level
+     *  @return string        					label of level
+     */
+    function LibProspLevel($fk_prospectlevel)
+    {
         // phpcs:enable
-		global $langs;
+        global $langs;
 
-		$lib=$langs->trans("ProspectLevel".$fk_prospectlevel);
-		// If lib not found in language file, we get label from cache/databse
-		if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel))
-		{
-			$lib=$langs->getLabelFromKey($this->db,$fk_prospectlevel,'c_prospectlevel','code','label');
-		}
-		return $lib;
-	}
+        $lib=$langs->trans("ProspectLevel".$fk_prospectlevel);
+        // If lib not found in language file, we get label from cache/databse
+        if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel))
+        {
+            $lib=$langs->getLabelFromKey($this->db,$fk_prospectlevel,'c_prospectlevel','code','label');
+        }
+        return $lib;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Set prospect level
-	 *
-	 *  @param  User	$user		Utilisateur qui definie la remise
-	 *	@return	int					<0 if KO, >0 if OK
-	 * @deprecated Use update function instead
-	 */
-	function set_prospect_level(User $user)
-	{
+    /**
+     *  Set prospect level
+     *
+     *  @param  User	$user		Utilisateur qui definie la remise
+     *	@return	int					<0 if KO, >0 if OK
+     * @deprecated Use update function instead
+     */
+    function set_prospect_level(User $user)
+    {
         // phpcs:enable
-		return $this->update($this->id, $user);
-	}
-
-	/**
-	 *  Return status of prospect
-	 *
-	 *  @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
-	 *  @param	string	$label		Label to use for status for added status
-	 *  @return string        		Libelle
-	 */
-	function getLibProspCommStatut($mode=0, $label='')
-	{
-		return $this->LibProspCommStatut($this->stcomm_id, $mode, $label);
-	}
+        return $this->update($this->id, $user);
+    }
+
+    /**
+     *  Return status of prospect
+     *
+     *  @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
+     *  @param	string	$label		Label to use for status for added status
+     *  @return string        		Libelle
+     */
+    function getLibProspCommStatut($mode=0, $label='')
+    {
+        return $this->LibProspCommStatut($this->stcomm_id, $mode, $label);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return label of a given status
-	 *
-	 *  @param	int|string	$statut        	Id or code for prospection status
-	 *  @param  int			$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
-	 *  @param	string		$label			Label to use for status for added status
-	 *  @return string       	 			Libelle du statut
-	 */
-	function LibProspCommStatut($statut, $mode=0, $label='')
-	{
+    /**
+     *  Return label of a given status
+     *
+     *  @param	int|string	$statut        	Id or code for prospection status
+     *  @param  int			$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+     *  @param	string		$label			Label to use for status for added status
+     *  @return string       	 			Libelle du statut
+     */
+    function LibProspCommStatut($statut, $mode=0, $label='')
+    {
         // phpcs:enable
-		global $langs;
-		$langs->load('customers');
-
-		if ($mode == 2)
-		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
-			else
-			{
-				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
-			}
-		}
-		if ($mode == 3)
-		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1);
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0);
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1);
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2);
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3);
-			else
-			{
-				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0);
-			}
-		}
-		if ($mode == 4)
-		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
-			else
-			{
-				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
-			}
-		}
-
-		return "Error, mode/status not found";
-	}
+        global $langs;
+        $langs->load('customers');
+
+        if ($mode == 2)
+        {
+            if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
+            elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+            elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+            elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+            elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+            else
+            {
+                return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
+            }
+        }
+        if ($mode == 3)
+        {
+            if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1);
+            elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0);
+            elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1);
+            elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2);
+            elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3);
+            else
+            {
+                return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0);
+            }
+        }
+        if ($mode == 4)
+        {
+            if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
+            elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+            elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+            elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+            elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+            else
+            {
+                return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
+            }
+        }
+
+        return "Error, mode/status not found";
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Set outstanding value
-	 *
-	 *  @param  User	$user		User making change
-	 *	@return	int					<0 if KO, >0 if OK
-	 * @deprecated Use update function instead
-	 */
-	function set_OutstandingBill(User $user)
-	{
+    /**
+     *  Set outstanding value
+     *
+     *  @param  User	$user		User making change
+     *	@return	int					<0 if KO, >0 if OK
+     * @deprecated Use update function instead
+     */
+    function set_OutstandingBill(User $user)
+    {
         // phpcs:enable
-		return $this->update($this->id, $user);
-	}
-
-	/**
-	 *  Return amount of order not paid and total
-	 *
-	 *  @param     string      $mode    'customer' or 'supplier'
-	 *  @return    array				array('opened'=>Amount, 'total'=>Total amount)
-	 */
-	function getOutstandingProposals($mode='customer')
-	{
-		$table='propal';
-		if ($mode == 'supplier') $table = 'supplier_proposal';
-
-		$sql  = "SELECT rowid, total_ht, total as total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
-		if ($mode == 'supplier') {
-			$sql .= " AND entity IN (".getEntity('supplier_proposal').")";
-		} else {
-			$sql .= " AND entity IN (".getEntity('propal').")";
-		}
-
-		dol_syslog("getOutstandingProposals", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$outstandingOpened = 0;
-			$outstandingTotal = 0;
-			$outstandingTotalIncTax = 0;
-			while($obj=$this->db->fetch_object($resql)) {
-				$outstandingTotal+= $obj->total_ht;
-				$outstandingTotalIncTax+= $obj->total_ttc;
-				if ($obj->fk_statut != 0)    // Not a draft
-				{
-					$outstandingOpened+=$obj->total_ttc;
-				}
-			}
-			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
-		}
-		else
-			return array();
-	}
-
-	/**
-	 *  Return amount of order not paid and total
-	 *
-	 *  @param     string      $mode    'customer' or 'supplier'
-	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
-	 */
-	function getOutstandingOrders($mode='customer')
-	{
-		$table='commande';
-		if ($mode == 'supplier') $table = 'commande_fournisseur';
-
-		$sql  = "SELECT rowid, total_ht, total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
-		if ($mode == 'supplier') {
-			$sql .= " AND entity IN (".getEntity('supplier_order').")";
-		} else {
-			$sql .= " AND entity IN (".getEntity('commande').")";
-		}
-
-		dol_syslog("getOutstandingOrders", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$outstandingOpened = 0;
-			$outstandingTotal = 0;
-			$outstandingTotalIncTax = 0;
-			while($obj=$this->db->fetch_object($resql)) {
-				$outstandingTotal+= $obj->total_ht;
-				$outstandingTotalIncTax+= $obj->total_ttc;
-				if ($obj->fk_statut != 0)    // Not a draft
-				{
-					$outstandingOpened+=$obj->total_ttc;
-				}
-			}
-			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
-		}
-		else
-			return array();
-	}
-
-	/**
-	 *  Return amount of bill not paid and total
-	 *
-	 *  @param     string      $mode    'customer' or 'supplier'
-	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
-	 */
-	function getOutstandingBills($mode='customer')
-	{
-		$table='facture';
-		if ($mode == 'supplier') $table = 'facture_fourn';
-
-		/* Accurate value of remain to pay is to sum remaintopay for each invoice
+        return $this->update($this->id, $user);
+    }
+
+    /**
+     *  Return amount of order not paid and total
+     *
+     *  @param     string      $mode    'customer' or 'supplier'
+     *  @return    array				array('opened'=>Amount, 'total'=>Total amount)
+     */
+    function getOutstandingProposals($mode='customer')
+    {
+        $table='propal';
+        if ($mode == 'supplier') $table = 'supplier_proposal';
+
+        $sql  = "SELECT rowid, total_ht, total as total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
+        $sql .= " WHERE fk_soc = ". $this->id;
+        if ($mode == 'supplier') {
+            $sql .= " AND entity IN (".getEntity('supplier_proposal').")";
+        } else {
+            $sql .= " AND entity IN (".getEntity('propal').")";
+        }
+
+        dol_syslog("getOutstandingProposals", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $outstandingOpened = 0;
+            $outstandingTotal = 0;
+            $outstandingTotalIncTax = 0;
+            while($obj=$this->db->fetch_object($resql)) {
+                $outstandingTotal+= $obj->total_ht;
+                $outstandingTotalIncTax+= $obj->total_ttc;
+                if ($obj->fk_statut != 0)    // Not a draft
+                {
+                    $outstandingOpened+=$obj->total_ttc;
+                }
+            }
+            return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+        }
+        else
+            return array();
+    }
+
+    /**
+     *  Return amount of order not paid and total
+     *
+     *  @param     string      $mode    'customer' or 'supplier'
+     *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
+     */
+    function getOutstandingOrders($mode='customer')
+    {
+        $table='commande';
+        if ($mode == 'supplier') $table = 'commande_fournisseur';
+
+        $sql  = "SELECT rowid, total_ht, total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
+        $sql .= " WHERE fk_soc = ". $this->id;
+        if ($mode == 'supplier') {
+            $sql .= " AND entity IN (".getEntity('supplier_order').")";
+        } else {
+            $sql .= " AND entity IN (".getEntity('commande').")";
+        }
+
+        dol_syslog("getOutstandingOrders", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $outstandingOpened = 0;
+            $outstandingTotal = 0;
+            $outstandingTotalIncTax = 0;
+            while($obj=$this->db->fetch_object($resql)) {
+                $outstandingTotal+= $obj->total_ht;
+                $outstandingTotalIncTax+= $obj->total_ttc;
+                if ($obj->fk_statut != 0)    // Not a draft
+                {
+                    $outstandingOpened+=$obj->total_ttc;
+                }
+            }
+            return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+        }
+        else
+            return array();
+    }
+
+    /**
+     *  Return amount of bill not paid and total
+     *
+     *  @param     string      $mode    'customer' or 'supplier'
+     *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
+     */
+    function getOutstandingBills($mode='customer')
+    {
+        $table='facture';
+        if ($mode == 'supplier') $table = 'facture_fourn';
+
+        /* Accurate value of remain to pay is to sum remaintopay for each invoice
 		 $paiement = $invoice->getSommePaiement();
 		 $creditnotes=$invoice->getSumCreditNotesUsed();
 		 $deposits=$invoice->getSumDepositsUsed();
 		 $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
 		 $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 		 */
-		if ($mode == 'supplier') $sql  = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
-		else $sql  = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
-		if ($mode == 'supplier') {
-			$sql .= " AND entity IN (".getEntity('facture_fourn').")";
-		} else {
-			$sql .= " AND entity IN (".getEntity('invoice').")";
-		}
-
-		dol_syslog("getOutstandingBills", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$outstandingOpened = 0;
-			$outstandingTotal = 0;
-			$outstandingTotalIncTax = 0;
-			if ($mode == 'supplier')
-			{
-				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-				$tmpobject=new FactureFournisseur($this->db);
-			}
-			else
-			{
-				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-				$tmpobject=new Facture($this->db);
-			}
-			while($obj=$this->db->fetch_object($resql)) {
-				$tmpobject->id=$obj->rowid;
-				if ($obj->fk_statut != 0                                           // Not a draft
-					&& ! ($obj->fk_statut == 3 && $obj->close_code == 'replaced')  // Not a replaced invoice
-					)
-				{
-					$outstandingTotal+= $obj->total_ht;
-					$outstandingTotalIncTax+= $obj->total_ttc;
-				}
-				if ($obj->paye == 0
-					&& $obj->fk_statut != 0    // Not a draft
-					&& $obj->fk_statut != 3	   // Not abandonned
-					&& $obj->fk_statut != 2)   // Not classified as paid
-				//$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
-				{
-					$paiement = $tmpobject->getSommePaiement();
-					$creditnotes = $tmpobject->getSumCreditNotesUsed();
-					$deposits = $tmpobject->getSumDepositsUsed();
-					$outstandingOpened+=$obj->total_ttc - $paiement - $creditnotes - $deposits;
-				}
-			}
-			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
-		}
-		else
-		{
-			return array();
-		}
-	}
+        if ($mode == 'supplier') $sql  = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+        else $sql  = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+        $sql .= " WHERE fk_soc = ". $this->id;
+        if ($mode == 'supplier') {
+            $sql .= " AND entity IN (".getEntity('facture_fourn').")";
+        } else {
+            $sql .= " AND entity IN (".getEntity('invoice').")";
+        }
+
+        dol_syslog("getOutstandingBills", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $outstandingOpened = 0;
+            $outstandingTotal = 0;
+            $outstandingTotalIncTax = 0;
+            if ($mode == 'supplier')
+            {
+                require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+                $tmpobject=new FactureFournisseur($this->db);
+            }
+            else
+            {
+                require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+                $tmpobject=new Facture($this->db);
+            }
+            while($obj=$this->db->fetch_object($resql)) {
+                $tmpobject->id=$obj->rowid;
+                if ($obj->fk_statut != 0                                           // Not a draft
+                    && ! ($obj->fk_statut == 3 && $obj->close_code == 'replaced')  // Not a replaced invoice
+                    )
+                {
+                    $outstandingTotal+= $obj->total_ht;
+                    $outstandingTotalIncTax+= $obj->total_ttc;
+                }
+                if ($obj->paye == 0
+                    && $obj->fk_statut != 0    // Not a draft
+                    && $obj->fk_statut != 3	   // Not abandonned
+                    && $obj->fk_statut != 2)   // Not classified as paid
+                //$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
+                {
+                    $paiement = $tmpobject->getSommePaiement();
+                    $creditnotes = $tmpobject->getSumCreditNotesUsed();
+                    $deposits = $tmpobject->getSumDepositsUsed();
+                    $outstandingOpened+=$obj->total_ttc - $paiement - $creditnotes - $deposits;
+                }
+            }
+            return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+        }
+        else
+        {
+            return array();
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return amount of bill not paid
-	 *
-	 *  @return		int				Amount in debt for thirdparty
-	 *  @deprecated
-	 *  @see getOutstandingBills()
-	 */
-	function get_OutstandingBill()
-	{
+    /**
+     *  Return amount of bill not paid
+     *
+     *  @return		int				Amount in debt for thirdparty
+     *  @deprecated
+     *  @see getOutstandingBills()
+     */
+    function get_OutstandingBill()
+    {
         // phpcs:enable
-		/* Accurate value of remain to pay is to sum remaintopay for each invoice
+        /* Accurate value of remain to pay is to sum remaintopay for each invoice
 	     $paiement = $invoice->getSommePaiement();
 	     $creditnotes=$invoice->getSumCreditNotesUsed();
 	     $deposits=$invoice->getSumDepositsUsed();
 	     $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
 	     $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 	     */
-		$sql  = "SELECT rowid, total_ttc FROM ".MAIN_DB_PREFIX."facture as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
-		$sql .= " AND paye = 0";
-		$sql .= " AND fk_statut <> 0";	// Not a draft
-		//$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
-		$sql .= " AND fk_statut <> 3";		// Not abandonned
-		$sql .= " AND fk_statut <> 2";		// Not clasified as paid
-
-		dol_syslog("get_OutstandingBill", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$outstandingAmount = 0;
-			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-			$tmpobject=new Facture($this->db);
-			while($obj=$this->db->fetch_object($resql)) {
-				$tmpobject->id=$obj->rowid;
-				$paiement = $tmpobject->getSommePaiement();
-				$creditnotes = $tmpobject->getSumCreditNotesUsed();
-				$deposits = $tmpobject->getSumDepositsUsed();
-				$outstandingAmount+= $obj->total_ttc - $paiement - $creditnotes - $deposits;
-			}
-			return $outstandingAmount;
-		}
-		else
-			return 0;
-	}
-
-	/**
-	 * Return label of status customer is prospect/customer
-	 *
-	 * @return   string        	Label
-	 */
-	function getLibCustProspStatut()
-	{
-		return $this->LibCustProspStatut($this->client);
-	}
+        $sql  = "SELECT rowid, total_ttc FROM ".MAIN_DB_PREFIX."facture as f";
+        $sql .= " WHERE fk_soc = ". $this->id;
+        $sql .= " AND paye = 0";
+        $sql .= " AND fk_statut <> 0";	// Not a draft
+        //$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
+        $sql .= " AND fk_statut <> 3";		// Not abandonned
+        $sql .= " AND fk_statut <> 2";		// Not clasified as paid
+
+        dol_syslog("get_OutstandingBill", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $outstandingAmount = 0;
+            require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+            $tmpobject=new Facture($this->db);
+            while($obj=$this->db->fetch_object($resql)) {
+                $tmpobject->id=$obj->rowid;
+                $paiement = $tmpobject->getSommePaiement();
+                $creditnotes = $tmpobject->getSumCreditNotesUsed();
+                $deposits = $tmpobject->getSumDepositsUsed();
+                $outstandingAmount+= $obj->total_ttc - $paiement - $creditnotes - $deposits;
+            }
+            return $outstandingAmount;
+        }
+        else
+            return 0;
+    }
+
+    /**
+     * Return label of status customer is prospect/customer
+     *
+     * @return   string        	Label
+     */
+    function getLibCustProspStatut()
+    {
+        return $this->LibCustProspStatut($this->client);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Renvoi le libelle d'un statut donne
-	 *
-	 *  @param	int		$statut         Id statut
-	 *  @return	string          		Libelle du statut
-	 */
-	function LibCustProspStatut($statut)
-	{
+    /**
+     *  Renvoi le libelle d'un statut donne
+     *
+     *  @param	int		$statut         Id statut
+     *  @return	string          		Libelle du statut
+     */
+    function LibCustProspStatut($statut)
+    {
         // phpcs:enable
-		global $langs;
-		$langs->load('companies');
-
-		if ($statut==0) return $langs->trans("NorProspectNorCustomer");
-		if ($statut==1) return $langs->trans("Customer");
-		if ($statut==2) return $langs->trans("Prospect");
-		if ($statut==3) return $langs->trans("ProspectCustomer");
-	}
-
-
-	/**
-	 *  Create a document onto disk according to template module.
-	 *
-	 *	@param	string		$modele			Generator to use. Caller must set it to obj->modelpdf or GETPOST('modelpdf') for example.
-	 *	@param	Translate	$outputlangs	objet lang a utiliser pour traduction
-	 *  @param  int			$hidedetails    Hide details of lines
-	 *  @param  int			$hidedesc       Hide description
-	 *  @param  int			$hideref        Hide ref
-	 *  @param  null|array  $moreparams     Array to provide more information
-	 *	@return int        					<0 if KO, >0 if OK
-	 */
-	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $moreparams=null)
-	{
-		global $conf,$user,$langs;
-
-		if (! empty($moreparams) && ! empty($moreparams['use_companybankid']))
-		{
-			$modelpath = "core/modules/bank/doc/";
-
-			include_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
-			$companybankaccount = new CompanyBankAccount($this->db);
-			$result = $companybankaccount->fetch($moreparams['use_companybankid']);
-			if (! $result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
-			$result=$companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-		}
-		else
-		{
-			// Positionne le modele sur le nom du modele a utiliser
-			if (! dol_strlen($modele))
-			{
-				if (! empty($conf->global->COMPANY_ADDON_PDF))
-				{
-					$modele = $conf->global->COMPANY_ADDON_PDF;
-				}
-				else
-				{
-					print $langs->trans("Error")." ".$langs->trans("Error_COMPANY_ADDON_PDF_NotDefined");
-					return 0;
-				}
-			}
-
-			$modelpath = "core/modules/societe/doc/";
-
-			$result=$this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-		}
-
-		return $result;
-	}
-
-
-	/**
-	 * Sets object to supplied categories.
-	 *
-	 * Deletes object from existing categories not supplied.
-	 * Adds it to non existing supplied categories.
-	 * Existing categories are left untouch.
-	 *
-	 * @param 	int[]|int 	$categories 	Category ID or array of Categories IDs
-	 * @param 	string 		$type 			Category type ('customer' or 'supplier')
-	 * @return	int							<0 if KO, >0 if OK
-	 */
-	public function setCategories($categories, $type)
-	{
-		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-
-		// Decode type
-		if ($type == 'customer') {
-			$type_id = Categorie::TYPE_CUSTOMER;
-			$type_text = 'customer';
-		} elseif ($type == 'supplier') {
-			$type_id = Categorie::TYPE_SUPPLIER;
-			$type_text = 'supplier';
-		} else {
-			dol_syslog(__METHOD__ . ': Type ' . $type .  'is an unknown company category type. Done nothing.', LOG_ERR);
-			return -1;
-		}
-
-		// Handle single category
-		if (!is_array($categories)) {
-			$categories = array($categories);
-		}
-
-		// Get current categories
-		$c = new Categorie($this->db);
-		$existing = $c->containing($this->id, $type_id, 'id');
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $categories);
-			$to_add = array_diff($categories, $existing);
-		} else {
-			$to_del = array(); // Nothing to delete
-			$to_add = $categories;
-		}
-
-		$error = 0;
-
-		// Process
-		foreach ($to_del as $del) {
-			if ($c->fetch($del) > 0) {
-				$c->del_type($this, $type_text);
-			}
-		}
-		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0)
-			{
-				$result = $c->add_type($this, $type_text);
-				if ($result < 0)
-				{
-					$error++;
-					$this->error = $c->error;
-					$this->errors = $c->errors;
-					break;
-				}
-			}
-		}
-
-		return $error ? -1 : 1;
-	}
-
-	/**
-	 * Sets sales representatives of the thirdparty
-	 *
-	 * @param 	int[]|int 	$salesrep	 	User ID or array of user IDs
-	 * @return	int							<0 if KO, >0 if OK
-	 */
-	public function setSalesRep($salesrep)
-	{
-		global $user;
-
-		// Handle single user
-		if (!is_array($salesrep)) {
-			$salesrep = array($salesrep);
-		}
-
-		// Get current users
-		$existing = $this->getSalesRepresentatives($user, 1);
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $salesrep);
-			$to_add = array_diff($salesrep, $existing);
-		} else {
-			$to_del = array(); // Nothing to delete
-			$to_add = $salesrep;
-		}
-
-		$error = 0;
-
-		// Process
-		foreach ($to_del as $del) {
-			$this->del_commercial($user, $del);
-		}
-		foreach ($to_add as $add) {
-			$result = $this->add_commercial($user, $add);
-			if ($result < 0)
-			{
-				$error++;
-				$this->error = $c->error;
-				$this->errors = $c->errors;
-				break;
-			}
-		}
-
-		return $error ? -1 : 1;
-	}
-
-
-	/**
-	 * Function used to replace a thirdparty id with another one.
-	 * It must be used within a transaction to avoid trouble
-	 *
-	 * @param 	DoliDB 	$db 		Database handler
-	 * @param 	int 	$origin_id 	Old thirdparty id (will be removed)
-	 * @param 	int 	$dest_id 	New thirdparty id
-	 * @return 	bool				True if success, False if error
-	 */
-	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
-	{
-		if ($origin_id == $dest_id)
-		{
-			dol_syslog('Error: Try to merge a thirdparty into itself');
-			return false;
-		}
-
-		/**
-		 * Thirdparty commercials cannot be the same in both thirdparties so we look for them and remove some to avoid duplicate.
-		 * Because this function is meant to be executed within a transaction, we won't take care of begin/commit.
-		 */
-		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'societe_commerciaux ';
-		$sql .= ' WHERE fk_soc = '.(int) $dest_id.' AND fk_user IN ( ';
-		$sql .= ' SELECT fk_user ';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_commerciaux ';
-		$sql .= ' WHERE fk_soc = '.(int) $origin_id.') ';
+        global $langs;
+        $langs->load('companies');
 
-		$query = $db->query($sql);
+        if ($statut==0) return $langs->trans("NorProspectNorCustomer");
+        if ($statut==1) return $langs->trans("Customer");
+        if ($statut==2) return $langs->trans("Prospect");
+        if ($statut==3) return $langs->trans("ProspectCustomer");
+    }
 
-		while ($result = $db->fetch_object($query)) {
-			$db->query('DELETE FROM '.MAIN_DB_PREFIX.'societe_commerciaux WHERE rowid = '.$result->rowid);
-		}
 
-		/**
-		 * llx_societe_extrafields table must not be here because we don't care about the old thirdparty data
-		 * Do not include llx_societe because it will be replaced later
-		 */
-		$tables = array(
-			'societe_address',
-			'societe_commerciaux',
-			'societe_log',
-			'societe_prices',
-			'societe_remise',
-			'societe_remise_except',
-			'societe_rib'
-		);
-
-		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
-	}
+    /**
+     *  Create a document onto disk according to template module.
+     *
+     *	@param	string		$modele			Generator to use. Caller must set it to obj->modelpdf or GETPOST('modelpdf') for example.
+     *	@param	Translate	$outputlangs	objet lang a utiliser pour traduction
+     *  @param  int			$hidedetails    Hide details of lines
+     *  @param  int			$hidedesc       Hide description
+     *  @param  int			$hideref        Hide ref
+     *  @param  null|array  $moreparams     Array to provide more information
+     *	@return int        					<0 if KO, >0 if OK
+     */
+    public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $moreparams=null)
+    {
+        global $conf,$user,$langs;
+
+        if (! empty($moreparams) && ! empty($moreparams['use_companybankid']))
+        {
+            $modelpath = "core/modules/bank/doc/";
+
+            include_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
+            $companybankaccount = new CompanyBankAccount($this->db);
+            $result = $companybankaccount->fetch($moreparams['use_companybankid']);
+            if (! $result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+            $result=$companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+        }
+        else
+        {
+            // Positionne le modele sur le nom du modele a utiliser
+            if (! dol_strlen($modele))
+            {
+                if (! empty($conf->global->COMPANY_ADDON_PDF))
+                {
+                    $modele = $conf->global->COMPANY_ADDON_PDF;
+                }
+                else
+                {
+                    print $langs->trans("Error")." ".$langs->trans("Error_COMPANY_ADDON_PDF_NotDefined");
+                    return 0;
+                }
+            }
+
+            $modelpath = "core/modules/societe/doc/";
+
+            $result=$this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+        }
+
+        return $result;
+    }
+
+
+    /**
+     * Sets object to supplied categories.
+     *
+     * Deletes object from existing categories not supplied.
+     * Adds it to non existing supplied categories.
+     * Existing categories are left untouch.
+     *
+     * @param 	int[]|int 	$categories 	Category ID or array of Categories IDs
+     * @param 	string 		$type 			Category type ('customer' or 'supplier')
+     * @return	int							<0 if KO, >0 if OK
+     */
+    public function setCategories($categories, $type)
+    {
+        require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+
+        // Decode type
+        if ($type == 'customer') {
+            $type_id = Categorie::TYPE_CUSTOMER;
+            $type_text = 'customer';
+        } elseif ($type == 'supplier') {
+            $type_id = Categorie::TYPE_SUPPLIER;
+            $type_text = 'supplier';
+        } else {
+            dol_syslog(__METHOD__ . ': Type ' . $type .  'is an unknown company category type. Done nothing.', LOG_ERR);
+            return -1;
+        }
+
+        // Handle single category
+        if (!is_array($categories)) {
+            $categories = array($categories);
+        }
+
+        // Get current categories
+        $c = new Categorie($this->db);
+        $existing = $c->containing($this->id, $type_id, 'id');
+
+        // Diff
+        if (is_array($existing)) {
+            $to_del = array_diff($existing, $categories);
+            $to_add = array_diff($categories, $existing);
+        } else {
+            $to_del = array(); // Nothing to delete
+            $to_add = $categories;
+        }
+
+        $error = 0;
+
+        // Process
+        foreach ($to_del as $del) {
+            if ($c->fetch($del) > 0) {
+                $c->del_type($this, $type_text);
+            }
+        }
+        foreach ($to_add as $add) {
+            if ($c->fetch($add) > 0)
+            {
+                $result = $c->add_type($this, $type_text);
+                if ($result < 0)
+                {
+                    $error++;
+                    $this->error = $c->error;
+                    $this->errors = $c->errors;
+                    break;
+                }
+            }
+        }
+
+        return $error ? -1 : 1;
+    }
+
+    /**
+     * Sets sales representatives of the thirdparty
+     *
+     * @param 	int[]|int 	$salesrep	 	User ID or array of user IDs
+     * @return	int							<0 if KO, >0 if OK
+     */
+    public function setSalesRep($salesrep)
+    {
+        global $user;
+
+        // Handle single user
+        if (!is_array($salesrep)) {
+            $salesrep = array($salesrep);
+        }
+
+        // Get current users
+        $existing = $this->getSalesRepresentatives($user, 1);
+
+        // Diff
+        if (is_array($existing)) {
+            $to_del = array_diff($existing, $salesrep);
+            $to_add = array_diff($salesrep, $existing);
+        } else {
+            $to_del = array(); // Nothing to delete
+            $to_add = $salesrep;
+        }
+
+        $error = 0;
+
+        // Process
+        foreach ($to_del as $del) {
+            $this->del_commercial($user, $del);
+        }
+        foreach ($to_add as $add) {
+            $result = $this->add_commercial($user, $add);
+            if ($result < 0)
+            {
+                $error++;
+                $this->error = $c->error;
+                $this->errors = $c->errors;
+                break;
+            }
+        }
+
+        return $error ? -1 : 1;
+    }
+
+
+    /**
+     * Function used to replace a thirdparty id with another one.
+     * It must be used within a transaction to avoid trouble
+     *
+     * @param 	DoliDB 	$db 		Database handler
+     * @param 	int 	$origin_id 	Old thirdparty id (will be removed)
+     * @param 	int 	$dest_id 	New thirdparty id
+     * @return 	bool				True if success, False if error
+     */
+    public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+    {
+        if ($origin_id == $dest_id)
+        {
+            dol_syslog('Error: Try to merge a thirdparty into itself');
+            return false;
+        }
+
+        /**
+         * Thirdparty commercials cannot be the same in both thirdparties so we look for them and remove some to avoid duplicate.
+         * Because this function is meant to be executed within a transaction, we won't take care of begin/commit.
+         */
+        $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'societe_commerciaux ';
+        $sql .= ' WHERE fk_soc = '.(int) $dest_id.' AND fk_user IN ( ';
+        $sql .= ' SELECT fk_user ';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_commerciaux ';
+        $sql .= ' WHERE fk_soc = '.(int) $origin_id.') ';
+
+        $query = $db->query($sql);
+
+        while ($result = $db->fetch_object($query)) {
+            $db->query('DELETE FROM '.MAIN_DB_PREFIX.'societe_commerciaux WHERE rowid = '.$result->rowid);
+        }
+
+        /**
+         * llx_societe_extrafields table must not be here because we don't care about the old thirdparty data
+         * Do not include llx_societe because it will be replaced later
+         */
+        $tables = array(
+            'societe_address',
+            'societe_commerciaux',
+            'societe_log',
+            'societe_prices',
+            'societe_remise',
+            'societe_remise_except',
+            'societe_rib'
+        );
+
+        return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+    }
 }

Spacing +798 added lines, -798 removed lines

@@ -45,7 +45,7 @@ 
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='societe';
+	public $element = 'societe';
 
 	/**
 	 * @var string Name of table without prefix where object is stored
@@ -55,11 +55,11 @@ 
 	/**
 	 * @var int Field with ID of parent key if this field has a parent
 	 */
-	public $fk_element='fk_soc';
+	public $fk_element = 'fk_soc';
 
-	public $fieldsforcombobox='nom,name_alias';
-	protected $childtables=array("supplier_proposal"=>'SupplierProposal',"propal"=>'Proposal',"commande"=>'Order',"facture"=>'Invoice',"facture_rec"=>'RecurringInvoiceTemplate',"contrat"=>'Contract',"fichinter"=>'Fichinter',"facture_fourn"=>'SupplierInvoice',"commande_fournisseur"=>'SupplierOrder',"projet"=>'Project',"expedition"=>'Shipment',"prelevement_lignes"=>'DirectDebitRecord');    // To test if we can delete object
-	protected $childtablesoncascade=array("societe_prices", "societe_log", "societe_address", "product_fournisseur_price", "product_customer_price_log", "product_customer_price", "socpeople", "adherent", "societe_rib", "societe_remise", "societe_remise_except", "societe_commerciaux", "categorie", "notify", "notify_def", "actioncomm");
+	public $fieldsforcombobox = 'nom,name_alias';
+	protected $childtables = array("supplier_proposal"=>'SupplierProposal', "propal"=>'Proposal', "commande"=>'Order', "facture"=>'Invoice', "facture_rec"=>'RecurringInvoiceTemplate', "contrat"=>'Contract', "fichinter"=>'Fichinter', "facture_fourn"=>'SupplierInvoice', "commande_fournisseur"=>'SupplierOrder', "projet"=>'Project', "expedition"=>'Shipment', "prelevement_lignes"=>'DirectDebitRecord'); // To test if we can delete object
+	protected $childtablesoncascade = array("societe_prices", "societe_log", "societe_address", "product_fournisseur_price", "product_customer_price_log", "product_customer_price", "socpeople", "adherent", "societe_rib", "societe_remise", "societe_remise_except", "societe_commerciaux", "categorie", "notify", "notify_def", "actioncomm");
 	public $picto = 'company';
 
 	/**
@@ -79,20 +79,20 @@ 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid'         =>array('type'=>'integer',      'label'=>'TechnicalID',      'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'index'=>1, 'position'=>1, 'comment'=>'Id'),
-		'nom'           =>array('type'=>'varchar(128)', 'label'=>'Name',             'enabled'=>1, 'visible'=>1,  'notnull'=>1,  'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
-		'name_alias'    =>array('type'=>'varchar(128)', 'label'=>'Name',             'enabled'=>1, 'visible'=>1,  'notnull'=>1,  'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
-		'entity'        =>array('type'=>'integer',      'label'=>'Entity',           'enabled'=>1, 'visible'=>0,  'default'=>1,  'notnull'=>1,  'index'=>1, 'position'=>20),
-		'note_public'   =>array('type'=>'text',			'label'=>'NotePublic',		 'enabled'=>1, 'visible'=>0,  'position'=>60),
-		'note_private'  =>array('type'=>'text',			'label'=>'NotePrivate',		 'enabled'=>1, 'visible'=>0,  'position'=>61),
-		'datec'			=>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>500),
-		'tms'           =>array('type'=>'timestamp',    'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>501),
+	public $fields = array(
+		'rowid'         =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
+		'nom'           =>array('type'=>'varchar(128)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
+		'name_alias'    =>array('type'=>'varchar(128)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
+		'entity'        =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20),
+		'note_public'   =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>60),
+		'note_private'  =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>61),
+		'datec'			=>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500),
+		'tms'           =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
 		//'date_valid'    =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'position'=>502),
-		'fk_user_creat' =>array('type'=>'integer',      'label'=>'UserAuthor',       'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>510),
-		'fk_user_modif' =>array('type'=>'integer',      'label'=>'UserModif',        'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
+		'fk_user_creat' =>array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>510),
+		'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
 		//'fk_user_valid' =>array('type'=>'integer',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
-		'import_key'    =>array('type'=>'varchar(14)',  'label'=>'ImportId',         'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>1,  'position'=>1000),
+		'import_key'    =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>1, 'position'=>1000),
 	);
 
 
@@ -134,7 +134,7 @@ 
 	 * Thirdparty status : 0=activity ceased, 1= in activity
 	 * @var int
 	 */
-	public $status=1;
+	public $status = 1;
 
 	/**
 	 * Id of department
@@ -256,7 +256,7 @@ 
 
 	public $prefix_comm;
 
-	public $tva_assuj=1;
+	public $tva_assuj = 1;
 	/**
 	 * Intracommunitary VAT ID
 	 * @var string
@@ -271,12 +271,12 @@ 
 
 	public $managers;
 	public $capital;
-	public $typent_id=0;
+	public $typent_id = 0;
 	public $typent_code;
 	public $effectif;
-	public $effectif_id=0;
+	public $effectif_id = 0;
 	public $forme_juridique_code;
-	public $forme_juridique=0;
+	public $forme_juridique = 0;
 
 	public $remise_percent;
 	public $remise_supplier_percent;
@@ -320,12 +320,12 @@ 
 	 * 0=no customer, 1=customer, 2=prospect, 3=customer and prospect
 	 * @var int
 	 */
-	public $client=0;
+	public $client = 0;
 	/**
 	 * 0=no prospect, 1=prospect
 	 * @var int
 	 */
-	public $prospect=0;
+	public $prospect = 0;
 	/**
 	 * 0=no supplier, 1=supplier
 	 * @var int
@@ -461,7 +461,7 @@ 
 	public $fk_incoterms;
 
 	public $location_incoterms;
-	public $libelle_incoterms;  //Used into tooltip
+	public $libelle_incoterms; //Used into tooltip
 
 	// Multicurrency
 	/**
@@ -487,9 +487,9 @@ 
 		$this->client = 0;
 		$this->prospect = 0;
 		$this->fournisseur = 0;
-		$this->typent_id  = 0;
-		$this->effectif_id  = 0;
-		$this->forme_juridique_code  = 0;
+		$this->typent_id = 0;
+		$this->effectif_id = 0;
+		$this->forme_juridique_code = 0;
 		$this->tva_assuj = 1;
 		$this->status = 1;
 	}
@@ -504,17 +504,17 @@ 
 	 */
 	function create(User $user)
 	{
-		global $langs,$conf,$mysoc;
+		global $langs, $conf, $mysoc;
 
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (empty($this->status)) $this->status=0;
-		$this->name=$this->name?trim($this->name):trim($this->nom);
-		if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name=ucwords($this->name);
-		$this->nom=$this->name; // For backward compatibility
-		if (empty($this->client))      $this->client=0;
-		if (empty($this->fournisseur)) $this->fournisseur=0;
+		if (empty($this->status)) $this->status = 0;
+		$this->name = $this->name ?trim($this->name) : trim($this->nom);
+		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name = ucwords($this->name);
+		$this->nom = $this->name; // For backward compatibility
+		if (empty($this->client))      $this->client = 0;
+		if (empty($this->fournisseur)) $this->fournisseur = 0;
 		$this->import_key = trim($this->import_key);
 
 		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
@@ -526,13 +526,13 @@ 
 
 		dol_syslog(get_class($this)."::create ".$this->name);
 
-		$now=dol_now();
+		$now = dol_now();
 
 		$this->db->begin();
 
 		// For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts)
-		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this,0);
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1);
+		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this, 0);
+		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this, 1);
 
 		// Check more parameters (including mandatory setup
 		// If error, this->errors[] is filled
@@ -540,29 +540,29 @@ 
 
 		if ($result >= 0)
 		{
-			$this->entity = ((isset($this->entity) && is_numeric($this->entity))?$this->entity:$conf->entity);
+			$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_int, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)";
-			$sql.= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$this->db->escape($this->entity).", '".$this->db->idate($now)."'";
-			$sql.= ", ".(! empty($user->id) ? "'".$user->id."'":"null");
-			$sql.= ", ".(! empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'":"null");
-			$sql.= ", ".$this->status;
-			$sql.= ", ".(! empty($this->ref_int) ? "'".$this->db->escape($this->ref_int)."'":"null");
-			$sql.= ", ".(! empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'":"null");
-			$sql.= ", 0";
-			$sql.= ", ".(int) $this->fk_incoterms;
-			$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-			$sql.= ", ".(! empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'":"null");
-			$sql.= ", ".(int) $this->fk_multicurrency;
-			$sql.= ", '".$this->db->escape($this->multicurrency_code)."')";
+			$sql .= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$this->db->escape($this->entity).", '".$this->db->idate($now)."'";
+			$sql .= ", ".(!empty($user->id) ? "'".$user->id."'" : "null");
+			$sql .= ", ".(!empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'" : "null");
+			$sql .= ", ".$this->status;
+			$sql .= ", ".(!empty($this->ref_int) ? "'".$this->db->escape($this->ref_int)."'" : "null");
+			$sql .= ", ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
+			$sql .= ", 0";
+			$sql .= ", ".(int) $this->fk_incoterms;
+			$sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+			$sql .= ", ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
+			$sql .= ", ".(int) $this->fk_multicurrency;
+			$sql .= ", '".$this->db->escape($this->multicurrency_code)."')";
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
-			$result=$this->db->query($sql);
+			$result = $this->db->query($sql);
 			if ($result)
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe");
 
-				$ret = $this->update($this->id,$user,0,1,1,'add');
+				$ret = $this->update($this->id, $user, 0, 1, 1, 'add');
 
 				// Ajout du commercial affecte
 				if ($this->commercial_id != '' && $this->commercial_id != -1)
@@ -578,13 +578,13 @@ 
 				if ($ret >= 0)
 				{
 					// Call trigger
-					$result=$this->call_trigger('COMPANY_CREATE',$user);
+					$result = $this->call_trigger('COMPANY_CREATE', $user);
 					if ($result < 0) $error++;
 					// End call triggers
 				}
 				else $error++;
 
-				if (! $error)
+				if (!$error)
 				{
 					dol_syslog(get_class($this)."::Create success id=".$this->id);
 					$this->db->commit();
@@ -592,7 +592,7 @@ 
 				}
 				else
 				{
-					dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',',$this->errors), LOG_ERR);
+					dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',', $this->errors), LOG_ERR);
 					$this->db->rollback();
 					return -4;
 				}
@@ -601,13 +601,13 @@ 
 			{
 				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
-					$this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name);    // duplicate on a field (code or profid or ...)
-					$result=-1;
+					$this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name); // duplicate on a field (code or profid or ...)
+					$result = -1;
 				}
 				else
 				{
-					$this->error=$this->db->lasterror();
-					$result=-2;
+					$this->error = $this->db->lasterror();
+					$result = -2;
 				}
 				$this->db->rollback();
 				return $result;
@@ -616,7 +616,7 @@ 
 		else
 		{
 			$this->db->rollback();
-			dol_syslog(get_class($this)."::Create fails verify ".join(',',$this->errors), LOG_WARNING);
+			dol_syslog(get_class($this)."::Create fails verify ".join(',', $this->errors), LOG_WARNING);
 			return -3;
 		}
 	}
@@ -633,12 +633,12 @@ 
 	{
         // phpcs:enable
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-		$contact=new Contact($this->db);
+		$contact = new Contact($this->db);
 
 		$contact->name              = $this->name_bis;
 		$contact->firstname         = $this->firstname;
 		$contact->civility_id       = $this->civility_id;
-		$contact->socid             = $this->id;	// fk_soc
+		$contact->socid             = $this->id; // fk_soc
 		$contact->statut            = 1;
 		$contact->priv              = 0;
 		$contact->country_id        = $this->country_id;
@@ -654,7 +654,7 @@ 
 		{
 			$this->error = $contact->error;
 			$this->errors = $contact->errors;
-			dol_syslog(get_class($this)."::create_individual ERROR:" . $this->error, LOG_ERR);
+			dol_syslog(get_class($this)."::create_individual ERROR:".$this->error, LOG_ERR);
 		}
 
 		return $result;
@@ -671,13 +671,13 @@ 
 		global $conf, $langs, $mysoc;
 
 		$error = 0;
-		$this->errors=array();
+		$this->errors = array();
 
 		$result = 0;
-		$this->name	= trim($this->name);
-		$this->nom=$this->name; // For backward compatibility
+		$this->name = trim($this->name);
+		$this->nom = $this->name; // For backward compatibility
 
-		if (! $this->name)
+		if (!$this->name)
 		{
 			$this->errors[] = 'ErrorBadThirdPartyName';
 			$result = -2;
@@ -734,12 +734,12 @@ 
 		}
 
 		// Check for duplicate or mandatory fields defined into setup
-		$array_to_check=array('IDPROF1','IDPROF2','IDPROF3','IDPROF4','IDPROF5','IDPROF6','EMAIL');
-		foreach($array_to_check as $key)
+		$array_to_check = array('IDPROF1', 'IDPROF2', 'IDPROF3', 'IDPROF4', 'IDPROF5', 'IDPROF6', 'EMAIL');
+		foreach ($array_to_check as $key)
 		{
-			$keymin=strtolower($key);
-			$i=(int) preg_replace('/[^0-9]/','',$key);
-			$vallabel=$this->$keymin;
+			$keymin = strtolower($key);
+			$i = (int) preg_replace('/[^0-9]/', '', $key);
+			$vallabel = $this->$keymin;
 
 			if ($i > 0)
 			{
@@ -758,8 +758,8 @@ 
 					// Check for mandatory prof id (but only if country is other than ours)
 					if ($mysoc->country_id > 0 && $this->country_id == $mysoc->country_id)
 					{
-						$idprof_mandatory ='SOCIETE_'.$key.'_MANDATORY';
-						if (! $vallabel && ! empty($conf->global->$idprof_mandatory))
+						$idprof_mandatory = 'SOCIETE_'.$key.'_MANDATORY';
+						if (!$vallabel && !empty($conf->global->$idprof_mandatory))
 						{
 							$langs->load("errors");
 							$error++;
@@ -775,7 +775,7 @@ 
 				if ($key == 'EMAIL')
 				{
 					// Check for unicity
-					if ($vallabel && ! empty($conf->global->SOCIETE_EMAIL_UNIQUE))
+					if ($vallabel && !empty($conf->global->SOCIETE_EMAIL_UNIQUE))
 					{
 						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0)))
 						{
@@ -785,7 +785,7 @@ 
 					}
 
 					// Check for mandatory
-					if (! empty($conf->global->SOCIETE_EMAIL_MANDATORY) && ! isValidEMail($this->email))
+					if (!empty($conf->global->SOCIETE_EMAIL_MANDATORY) && !isValidEMail($this->email))
 					{
 						$langs->load("errors");
 						$error++;
@@ -812,58 +812,58 @@ 
 	 *		@param	int		$nosyncmember				Do not synchronize info of linked member
 	 *      @return int  			           			<0 if KO, >=0 if OK
 	 */
-	function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0, $action='update', $nosyncmember=1)
+	function update($id, $user = '', $call_trigger = 1, $allowmodcodeclient = 0, $allowmodcodefournisseur = 0, $action = 'update', $nosyncmember = 1)
 	{
-		global $langs,$conf,$hookmanager;
+		global $langs, $conf, $hookmanager;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		if (empty($id)) $id = $this->id;
 
-		$error=0;
+		$error = 0;
 
 		dol_syslog(get_class($this)."::Update id=".$id." call_trigger=".$call_trigger." allowmodcodeclient=".$allowmodcodeclient." allowmodcodefournisseur=".$allowmodcodefournisseur);
 
-		$now=dol_now();
+		$now = dol_now();
 
 		// Clean parameters
-		$this->id			= $id;
-		$this->entity		= ((isset($this->entity) && is_numeric($this->entity))?$this->entity:$conf->entity);
-		$this->name			= $this->name?trim($this->name):trim($this->nom);
-		$this->nom			= $this->name;	// For backward compatibility
-		$this->name_alias	= trim($this->name_alias);
+		$this->id = $id;
+		$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
+		$this->name = $this->name ?trim($this->name) : trim($this->nom);
+		$this->nom = $this->name; // For backward compatibility
+		$this->name_alias = trim($this->name_alias);
 		$this->ref_ext		= trim($this->ref_ext);
-		$this->address		= $this->address?trim($this->address):trim($this->address);
-		$this->zip			= $this->zip?trim($this->zip):trim($this->zip);
-		$this->town			= $this->town?trim($this->town):trim($this->town);
-		$this->state_id		= trim($this->state_id);
-		$this->country_id	= ($this->country_id > 0)?$this->country_id:0;
+		$this->address		= $this->address ?trim($this->address) : trim($this->address);
+		$this->zip = $this->zip ?trim($this->zip) : trim($this->zip);
+		$this->town			= $this->town ?trim($this->town) : trim($this->town);
+		$this->state_id = trim($this->state_id);
+		$this->country_id = ($this->country_id > 0) ? $this->country_id : 0;
 		$this->phone		= trim($this->phone);
-		$this->phone		= preg_replace("/\s/","",$this->phone);
-		$this->phone		= preg_replace("/\./","",$this->phone);
+		$this->phone		= preg_replace("/\s/", "", $this->phone);
+		$this->phone		= preg_replace("/\./", "", $this->phone);
 		$this->fax			= trim($this->fax);
-		$this->fax			= preg_replace("/\s/","",$this->fax);
-		$this->fax			= preg_replace("/\./","",$this->fax);
+		$this->fax			= preg_replace("/\s/", "", $this->fax);
+		$this->fax			= preg_replace("/\./", "", $this->fax);
 		$this->email		= trim($this->email);
 		$this->skype		= trim($this->skype);
-		$this->twitter		= trim($this->twitter);
-		$this->facebook		= trim($this->facebook);
-		$this->url			= $this->url?clean_url($this->url,0):'';
+		$this->twitter = trim($this->twitter);
+		$this->facebook = trim($this->facebook);
+		$this->url = $this->url ?clean_url($this->url, 0) : '';
 		$this->note_private = trim($this->note_private);
 		$this->note_public  = trim($this->note_public);
 		$this->idprof1		= trim($this->idprof1);
 		$this->idprof2		= trim($this->idprof2);
 		$this->idprof3		= trim($this->idprof3);
 		$this->idprof4		= trim($this->idprof4);
-		$this->idprof5		= (! empty($this->idprof5)?trim($this->idprof5):'');
-		$this->idprof6		= (! empty($this->idprof6)?trim($this->idprof6):'');
-		$this->prefix_comm	= trim($this->prefix_comm);
+		$this->idprof5		= (!empty($this->idprof5) ?trim($this->idprof5) : '');
+		$this->idprof6		= (!empty($this->idprof6) ?trim($this->idprof6) : '');
+		$this->prefix_comm = trim($this->prefix_comm);
 		$this->outstanding_limit = price2num($this->outstanding_limit);
 		$this->order_min_amount = price2num($this->order_min_amount);
 		$this->supplier_order_min_amount = price2num($this->supplier_order_min_amount);
 
 		$this->tva_assuj	= trim($this->tva_assuj);
-		$this->tva_intra	= dol_sanitizeFileName($this->tva_intra,'');
+		$this->tva_intra	= dol_sanitizeFileName($this->tva_intra, '');
 		if (empty($this->status)) $this->status = 0;
 
 		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
@@ -874,64 +874,64 @@ 
 		}
 
 		// Local taxes
-		$this->localtax1_assuj=trim($this->localtax1_assuj);
-		$this->localtax2_assuj=trim($this->localtax2_assuj);
+		$this->localtax1_assuj = trim($this->localtax1_assuj);
+		$this->localtax2_assuj = trim($this->localtax2_assuj);
 
-		$this->localtax1_value=trim($this->localtax1_value);
-		$this->localtax2_value=trim($this->localtax2_value);
+		$this->localtax1_value = trim($this->localtax1_value);
+		$this->localtax2_value = trim($this->localtax2_value);
 
-		if ($this->capital != '') $this->capital=price2num(trim($this->capital));
-		if (! is_numeric($this->capital)) $this->capital = '';     // '' = undef
+		if ($this->capital != '') $this->capital = price2num(trim($this->capital));
+		if (!is_numeric($this->capital)) $this->capital = ''; // '' = undef
 
-		$this->effectif_id=trim($this->effectif_id);
-		$this->forme_juridique_code=trim($this->forme_juridique_code);
+		$this->effectif_id = trim($this->effectif_id);
+		$this->forme_juridique_code = trim($this->forme_juridique_code);
 
 		//Gencod
-		$this->barcode=trim($this->barcode);
+		$this->barcode = trim($this->barcode);
 
 		// For automatic creation
-		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this,0);
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1);
+		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this, 0);
+		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this, 1);
 
-		$this->code_compta=trim($this->code_compta);
-		$this->code_compta_fournisseur=trim($this->code_compta_fournisseur);
+		$this->code_compta = trim($this->code_compta);
+		$this->code_compta_fournisseur = trim($this->code_compta_fournisseur);
 
 		// Check parameters. More tests are done later in the ->verify()
-		if (! is_numeric($this->client) && ! is_numeric($this->fournisseur))
+		if (!is_numeric($this->client) && !is_numeric($this->fournisseur))
 		{
 			$langs->load("errors");
 			$this->error = $langs->trans("BadValueForParameterClientOrSupplier");
 			return -1;
 		}
 
-		$customer=false;
-		if (! empty($allowmodcodeclient) && ! empty($this->client))
+		$customer = false;
+		if (!empty($allowmodcodeclient) && !empty($this->client))
 		{
 			// Attention get_codecompta peut modifier le code suivant le module utilise
 			if (empty($this->code_compta))
 			{
-				$ret=$this->get_codecompta('customer');
+				$ret = $this->get_codecompta('customer');
 				if ($ret < 0) return -1;
 			}
 
-			$customer=true;
+			$customer = true;
 		}
 
-		$supplier=false;
-		if (! empty($allowmodcodefournisseur) && ! empty($this->fournisseur))
+		$supplier = false;
+		if (!empty($allowmodcodefournisseur) && !empty($this->fournisseur))
 		{
 			// Attention get_codecompta peut modifier le code suivant le module utilise
 			if (empty($this->code_compta_fournisseur))
 			{
-				$ret=$this->get_codecompta('supplier');
+				$ret = $this->get_codecompta('supplier');
 				if ($ret < 0) return -1;
 			}
 
-			$supplier=true;
+			$supplier = true;
 		}
 
 		//Web services
-		$this->webservices_url = $this->webservices_url?clean_url($this->webservices_url,0):'';
+		$this->webservices_url = $this->webservices_url ?clean_url($this->webservices_url, 0) : '';
 		$this->webservices_key = trim($this->webservices_key);
 
 		//Incoterms
@@ -955,11 +955,11 @@ 
 			{
 				if (in_array('ErrorBadCustomerCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_client == $this->code_client)
 				{
-					if (($key = array_search('ErrorBadCustomerCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]);	// Remove error message
+					if (($key = array_search('ErrorBadCustomerCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]); // Remove error message
 				}
 				if (in_array('ErrorBadSupplierCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_fournisseur == $this->code_fournisseur)
 				{
-					if (($key = array_search('ErrorBadSupplierCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]);	// Remove error message
+					if (($key = array_search('ErrorBadSupplierCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]); // Remove error message
 				}
 				if (empty($this->errors))	// If there is no more error, we can make like if there is no error at all
 				{
@@ -973,118 +973,118 @@ 
 			dol_syslog(get_class($this)."::update verify ok or not done");
 
 			$sql  = "UPDATE ".MAIN_DB_PREFIX."societe SET ";
-			$sql .= "entity = " . $this->db->escape($this->entity);
-			$sql .= ",nom = '" . $this->db->escape($this->name) ."'"; // Required
-			$sql .= ",name_alias = '" . $this->db->escape($this->name_alias) ."'";
-			$sql .= ",ref_ext = " .(! empty($this->ref_ext)?"'".$this->db->escape($this->ref_ext) ."'":"null");
-			$sql .= ",address = '" . $this->db->escape($this->address) ."'";
-
-			$sql .= ",zip = ".(! empty($this->zip)?"'".$this->db->escape($this->zip)."'":"null");
-			$sql .= ",town = ".(! empty($this->town)?"'".$this->db->escape($this->town)."'":"null");
-
-			$sql .= ",fk_departement = '" . (! empty($this->state_id)?$this->state_id:'0') ."'";
-			$sql .= ",fk_pays = '" . (! empty($this->country_id)?$this->country_id:'0') ."'";
-
-			$sql .= ",phone = ".(! empty($this->phone)?"'".$this->db->escape($this->phone)."'":"null");
-			$sql .= ",fax = ".(! empty($this->fax)?"'".$this->db->escape($this->fax)."'":"null");
-			$sql .= ",email = ".(! empty($this->email)?"'".$this->db->escape($this->email)."'":"null");
-			$sql .= ",skype = ".(! empty($this->skype)?"'".$this->db->escape($this->skype)."'":"null");
-			$sql .= ",twitter = ".(! empty($this->twitter)?"'".$this->db->escape($this->twitter)."'":"null");
-			$sql .= ",facebook = ".(! empty($this->facebook)?"'".$this->db->escape($this->facebook)."'":"null");
-			$sql .= ",url = ".(! empty($this->url)?"'".$this->db->escape($this->url)."'":"null");
-
-			$sql .= ",parent = " . ($this->parent > 0 ? $this->parent : "null");
-
-			$sql .= ",note_private = ".(! empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
-			$sql .= ",note_public = ".(! empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
-
-			$sql .= ",siren   = '". $this->db->escape($this->idprof1) ."'";
-			$sql .= ",siret   = '". $this->db->escape($this->idprof2) ."'";
-			$sql .= ",ape     = '". $this->db->escape($this->idprof3) ."'";
-			$sql .= ",idprof4 = '". $this->db->escape($this->idprof4) ."'";
-			$sql .= ",idprof5 = '". $this->db->escape($this->idprof5) ."'";
-			$sql .= ",idprof6 = '". $this->db->escape($this->idprof6) ."'";
-
-			$sql .= ",tva_assuj = ".($this->tva_assuj!=''?"'".$this->db->escape($this->tva_assuj)."'":"null");
-			$sql .= ",tva_intra = '" . $this->db->escape($this->tva_intra) ."'";
-			$sql .= ",status = " .$this->status;
+			$sql .= "entity = ".$this->db->escape($this->entity);
+			$sql .= ",nom = '".$this->db->escape($this->name)."'"; // Required
+			$sql .= ",name_alias = '".$this->db->escape($this->name_alias)."'";
+			$sql .= ",ref_ext = ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
+			$sql .= ",address = '".$this->db->escape($this->address)."'";
+
+			$sql .= ",zip = ".(!empty($this->zip) ? "'".$this->db->escape($this->zip)."'" : "null");
+			$sql .= ",town = ".(!empty($this->town) ? "'".$this->db->escape($this->town)."'" : "null");
+
+			$sql .= ",fk_departement = '".(!empty($this->state_id) ? $this->state_id : '0')."'";
+			$sql .= ",fk_pays = '".(!empty($this->country_id) ? $this->country_id : '0')."'";
+
+			$sql .= ",phone = ".(!empty($this->phone) ? "'".$this->db->escape($this->phone)."'" : "null");
+			$sql .= ",fax = ".(!empty($this->fax) ? "'".$this->db->escape($this->fax)."'" : "null");
+			$sql .= ",email = ".(!empty($this->email) ? "'".$this->db->escape($this->email)."'" : "null");
+			$sql .= ",skype = ".(!empty($this->skype) ? "'".$this->db->escape($this->skype)."'" : "null");
+			$sql .= ",twitter = ".(!empty($this->twitter) ? "'".$this->db->escape($this->twitter)."'" : "null");
+			$sql .= ",facebook = ".(!empty($this->facebook) ? "'".$this->db->escape($this->facebook)."'" : "null");
+			$sql .= ",url = ".(!empty($this->url) ? "'".$this->db->escape($this->url)."'" : "null");
+
+			$sql .= ",parent = ".($this->parent > 0 ? $this->parent : "null");
+
+			$sql .= ",note_private = ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
+			$sql .= ",note_public = ".(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null");
+
+			$sql .= ",siren   = '".$this->db->escape($this->idprof1)."'";
+			$sql .= ",siret   = '".$this->db->escape($this->idprof2)."'";
+			$sql .= ",ape     = '".$this->db->escape($this->idprof3)."'";
+			$sql .= ",idprof4 = '".$this->db->escape($this->idprof4)."'";
+			$sql .= ",idprof5 = '".$this->db->escape($this->idprof5)."'";
+			$sql .= ",idprof6 = '".$this->db->escape($this->idprof6)."'";
+
+			$sql .= ",tva_assuj = ".($this->tva_assuj != '' ? "'".$this->db->escape($this->tva_assuj)."'" : "null");
+			$sql .= ",tva_intra = '".$this->db->escape($this->tva_intra)."'";
+			$sql .= ",status = ".$this->status;
 
 			// Local taxes
-			$sql .= ",localtax1_assuj = ".($this->localtax1_assuj!=''?"'".$this->db->escape($this->localtax1_assuj)."'":"null");
-			$sql .= ",localtax2_assuj = ".($this->localtax2_assuj!=''?"'".$this->db->escape($this->localtax2_assuj)."'":"null");
-			if($this->localtax1_assuj==1)
+			$sql .= ",localtax1_assuj = ".($this->localtax1_assuj != '' ? "'".$this->db->escape($this->localtax1_assuj)."'" : "null");
+			$sql .= ",localtax2_assuj = ".($this->localtax2_assuj != '' ? "'".$this->db->escape($this->localtax2_assuj)."'" : "null");
+			if ($this->localtax1_assuj == 1)
 			{
-				if($this->localtax1_value!='')
+				if ($this->localtax1_value != '')
 				{
-					$sql .=",localtax1_value =".$this->localtax1_value;
+					$sql .= ",localtax1_value =".$this->localtax1_value;
 				}
-				else $sql .=",localtax1_value =0.000";
+				else $sql .= ",localtax1_value =0.000";
 			}
-			else $sql .=",localtax1_value =0.000";
+			else $sql .= ",localtax1_value =0.000";
 
-			if($this->localtax2_assuj==1)
+			if ($this->localtax2_assuj == 1)
 			{
-				if($this->localtax2_value!='')
+				if ($this->localtax2_value != '')
 				{
-					$sql .=",localtax2_value =".$this->localtax2_value;
+					$sql .= ",localtax2_value =".$this->localtax2_value;
 				}
-				else $sql .=",localtax2_value =0.000";
+				else $sql .= ",localtax2_value =0.000";
 			}
-			else $sql .=",localtax2_value =0.000";
+			else $sql .= ",localtax2_value =0.000";
 
 			$sql .= ",capital = ".($this->capital == '' ? "null" : $this->capital);
 
-			$sql .= ",prefix_comm = ".(! empty($this->prefix_comm)?"'".$this->db->escape($this->prefix_comm)."'":"null");
+			$sql .= ",prefix_comm = ".(!empty($this->prefix_comm) ? "'".$this->db->escape($this->prefix_comm)."'" : "null");
 
-			$sql .= ",fk_effectif = ".(! empty($this->effectif_id)?"'".$this->db->escape($this->effectif_id)."'":"null");
+			$sql .= ",fk_effectif = ".(!empty($this->effectif_id) ? "'".$this->db->escape($this->effectif_id)."'" : "null");
 			if (isset($this->stcomm_id))
 			{
-				$sql .= ",fk_stcomm=".(!empty($this->stcomm_id)  ? $this->stcomm_id : "0");
+				$sql .= ",fk_stcomm=".(!empty($this->stcomm_id) ? $this->stcomm_id : "0");
 			}
-			$sql .= ",fk_typent = ".(! empty($this->typent_id)?"'".$this->db->escape($this->typent_id)."'":"0");
-
-			$sql .= ",fk_forme_juridique = ".(! empty($this->forme_juridique_code)?"'".$this->db->escape($this->forme_juridique_code)."'":"null");
-
-			$sql .= ",mode_reglement = ".(! empty($this->mode_reglement_id)?"'".$this->db->escape($this->mode_reglement_id)."'":"null");
-			$sql .= ",cond_reglement = ".(! empty($this->cond_reglement_id)?"'".$this->db->escape($this->cond_reglement_id)."'":"null");
-			$sql .= ",mode_reglement_supplier = ".(! empty($this->mode_reglement_supplier_id)?"'".$this->db->escape($this->mode_reglement_supplier_id)."'":"null");
-			$sql .= ",cond_reglement_supplier = ".(! empty($this->cond_reglement_supplier_id)?"'".$this->db->escape($this->cond_reglement_supplier_id)."'":"null");
-			$sql .= ",fk_shipping_method = ".(! empty($this->shipping_method_id)?"'".$this->db->escape($this->shipping_method_id)."'":"null");
-
-			$sql .= ",client = " . (! empty($this->client)?$this->client:0);
-			$sql .= ",fournisseur = " . (! empty($this->fournisseur)?$this->fournisseur:0);
-			$sql .= ",barcode = ".(! empty($this->barcode)?"'".$this->db->escape($this->barcode)."'":"null");
-			$sql .= ",default_lang = ".(! empty($this->default_lang)?"'".$this->db->escape($this->default_lang)."'":"null");
-			$sql .= ",logo = ".(! empty($this->logo)?"'".$this->db->escape($this->logo)."'":"null");
-			$sql .= ",outstanding_limit= ".($this->outstanding_limit!=''?$this->outstanding_limit:'null');
-			$sql .= ",order_min_amount= ".($this->order_min_amount!=''?$this->order_min_amount:'null');
-			$sql .= ",supplier_order_min_amount= ".($this->supplier_order_min_amount!=''?$this->supplier_order_min_amount:'null');
+			$sql .= ",fk_typent = ".(!empty($this->typent_id) ? "'".$this->db->escape($this->typent_id)."'" : "0");
+
+			$sql .= ",fk_forme_juridique = ".(!empty($this->forme_juridique_code) ? "'".$this->db->escape($this->forme_juridique_code)."'" : "null");
+
+			$sql .= ",mode_reglement = ".(!empty($this->mode_reglement_id) ? "'".$this->db->escape($this->mode_reglement_id)."'" : "null");
+			$sql .= ",cond_reglement = ".(!empty($this->cond_reglement_id) ? "'".$this->db->escape($this->cond_reglement_id)."'" : "null");
+			$sql .= ",mode_reglement_supplier = ".(!empty($this->mode_reglement_supplier_id) ? "'".$this->db->escape($this->mode_reglement_supplier_id)."'" : "null");
+			$sql .= ",cond_reglement_supplier = ".(!empty($this->cond_reglement_supplier_id) ? "'".$this->db->escape($this->cond_reglement_supplier_id)."'" : "null");
+			$sql .= ",fk_shipping_method = ".(!empty($this->shipping_method_id) ? "'".$this->db->escape($this->shipping_method_id)."'" : "null");
+
+			$sql .= ",client = ".(!empty($this->client) ? $this->client : 0);
+			$sql .= ",fournisseur = ".(!empty($this->fournisseur) ? $this->fournisseur : 0);
+			$sql .= ",barcode = ".(!empty($this->barcode) ? "'".$this->db->escape($this->barcode)."'" : "null");
+			$sql .= ",default_lang = ".(!empty($this->default_lang) ? "'".$this->db->escape($this->default_lang)."'" : "null");
+			$sql .= ",logo = ".(!empty($this->logo) ? "'".$this->db->escape($this->logo)."'" : "null");
+			$sql .= ",outstanding_limit= ".($this->outstanding_limit != '' ? $this->outstanding_limit : 'null');
+			$sql .= ",order_min_amount= ".($this->order_min_amount != '' ? $this->order_min_amount : 'null');
+			$sql .= ",supplier_order_min_amount= ".($this->supplier_order_min_amount != '' ? $this->supplier_order_min_amount : 'null');
 			$sql .= ",fk_prospectlevel='".$this->db->escape($this->fk_prospectlevel)."'";
 
-			$sql .= ",webservices_url = ".(! empty($this->webservices_url)?"'".$this->db->escape($this->webservices_url)."'":"null");
-			$sql .= ",webservices_key = ".(! empty($this->webservices_key)?"'".$this->db->escape($this->webservices_key)."'":"null");
+			$sql .= ",webservices_url = ".(!empty($this->webservices_url) ? "'".$this->db->escape($this->webservices_url)."'" : "null");
+			$sql .= ",webservices_key = ".(!empty($this->webservices_key) ? "'".$this->db->escape($this->webservices_key)."'" : "null");
 
 			//Incoterms
-			$sql.= ", fk_incoterms = ".$this->fk_incoterms;
-			$sql.= ", location_incoterms = ".(! empty($this->location_incoterms)?"'".$this->db->escape($this->location_incoterms)."'":"null");
+			$sql .= ", fk_incoterms = ".$this->fk_incoterms;
+			$sql .= ", location_incoterms = ".(!empty($this->location_incoterms) ? "'".$this->db->escape($this->location_incoterms)."'" : "null");
 
 			if ($customer)
 			{
-				$sql .= ", code_client = ".(! empty($this->code_client)?"'".$this->db->escape($this->code_client)."'":"null");
-				$sql .= ", code_compta = ".(! empty($this->code_compta)?"'".$this->db->escape($this->code_compta)."'":"null");
+				$sql .= ", code_client = ".(!empty($this->code_client) ? "'".$this->db->escape($this->code_client)."'" : "null");
+				$sql .= ", code_compta = ".(!empty($this->code_compta) ? "'".$this->db->escape($this->code_compta)."'" : "null");
 			}
 
 			if ($supplier)
 			{
-				$sql .= ", code_fournisseur = ".(! empty($this->code_fournisseur)?"'".$this->db->escape($this->code_fournisseur)."'":"null");
-				$sql .= ", code_compta_fournisseur = ".(! empty($this->code_compta_fournisseur)?"'".$this->db->escape($this->code_compta_fournisseur)."'":"null");
+				$sql .= ", code_fournisseur = ".(!empty($this->code_fournisseur) ? "'".$this->db->escape($this->code_fournisseur)."'" : "null");
+				$sql .= ", code_compta_fournisseur = ".(!empty($this->code_compta_fournisseur) ? "'".$this->db->escape($this->code_compta_fournisseur)."'" : "null");
 			}
-			$sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id:"null");
+			$sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id : "null");
 			$sql .= ", fk_multicurrency = ".(int) $this->fk_multicurrency;
 			$sql .= ", multicurrency_code = '".$this->db->escape($this->multicurrency_code)."'";
-			$sql .= " WHERE rowid = " . (int) $id;
+			$sql .= " WHERE rowid = ".(int) $id;
 
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				if (is_object($this->oldcopy))	// If we have information on old values
@@ -1102,7 +1102,7 @@ 
 				}
 				else
 				{
-					unset($this->country_code);	// We clean this, in the doubt, because it may have been changed after an update of country_id
+					unset($this->country_code); // We clean this, in the doubt, because it may have been changed after an update of country_id
 					unset($this->country);
 					unset($this->state_code);
 					unset($this->state);
@@ -1110,67 +1110,67 @@ 
 
 				$nbrowsaffected = $this->db->affected_rows($resql);
 
-				if (! $error && $nbrowsaffected)
+				if (!$error && $nbrowsaffected)
 				{
 					// Update information on linked member if it is an update
-					if (! $nosyncmember && ! empty($conf->adherent->enabled))
+					if (!$nosyncmember && !empty($conf->adherent->enabled))
 					{
 						require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
 						dol_syslog(get_class($this)."::update update linked member");
 
-						$lmember=new Adherent($this->db);
-						$result=$lmember->fetch(0, 0, $this->id);
+						$lmember = new Adherent($this->db);
+						$result = $lmember->fetch(0, 0, $this->id);
 
 						if ($result > 0)
 						{
-							$lmember->societe=$this->name;
+							$lmember->societe = $this->name;
 							//$lmember->firstname=$this->firstname?$this->firstname:$lmember->firstname;	// We keep firstname and lastname of member unchanged
 							//$lmember->lastname=$this->lastname?$this->lastname:$lmember->lastname;		// We keep firstname and lastname of member unchanged
-							$lmember->address=$this->address;
-							$lmember->email=$this->email;
-							$lmember->skype=$this->skype;
-							$lmember->twitter=$this->twitter;
-							$lmember->facebook=$this->facebook;
-							$lmember->phone=$this->phone;
-
-							$result=$lmember->update($user,0,1,1,1);	// Use nosync to 1 to avoid cyclic updates
+							$lmember->address = $this->address;
+							$lmember->email = $this->email;
+							$lmember->skype = $this->skype;
+							$lmember->twitter = $this->twitter;
+							$lmember->facebook = $this->facebook;
+							$lmember->phone = $this->phone;
+
+							$result = $lmember->update($user, 0, 1, 1, 1); // Use nosync to 1 to avoid cyclic updates
 							if ($result < 0)
 							{
-								$this->error=$lmember->error;
-								dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
+								$this->error = $lmember->error;
+								dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 								$error++;
 							}
 						}
 						elseif ($result < 0)
 						{
-							$this->error=$lmember->error;
+							$this->error = $lmember->error;
 							$error++;
 						}
 					}
 				}
 
-				$action='update';
+				$action = 'update';
 
 				// Actions on extra fields
-				if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 				{
-					$result=$this->insertExtraFields();
+					$result = $this->insertExtraFields();
 					if ($result < 0)
 					{
 						$error++;
 					}
 				}
 
-				if (! $error && $call_trigger)
+				if (!$error && $call_trigger)
 				{
 					// Call trigger
-					$result=$this->call_trigger('COMPANY_MODIFY',$user);
+					$result = $this->call_trigger('COMPANY_MODIFY', $user);
 					if ($result < 0) $error++;
 					// End call triggers
 				}
 
-				if (! $error)
+				if (!$error)
 				{
 					dol_syslog(get_class($this)."::Update success");
 					$this->db->commit();
@@ -1202,7 +1202,7 @@ 
 		else
 	   {
 			$this->db->rollback();
-			dol_syslog(get_class($this)."::Update fails verify ".join(',',$this->errors), LOG_WARNING);
+			dol_syslog(get_class($this)."::Update fails verify ".join(',', $this->errors), LOG_WARNING);
 			return -3;
 		}
 	}
@@ -1224,7 +1224,7 @@ 
 	 *    @param    string	$ref_alias 		Name_alias of third party (Warning, this can return several records)
 	 *    @return   int						>0 if OK, <0 if KO or if two records found for same ref or idprof, 0 if not found.
 	 */
-	function fetch($rowid, $ref='', $ref_ext='', $ref_int='', $idprof1='',$idprof2='',$idprof3='',$idprof4='',$idprof5='',$idprof6='', $email='', $ref_alias='')
+	function fetch($rowid, $ref = '', $ref_ext = '', $ref_int = '', $idprof1 = '', $idprof2 = '', $idprof3 = '', $idprof4 = '', $idprof5 = '', $idprof6 = '', $email = '', $ref_alias = '')
 	{
 		global $langs;
 		global $conf;
@@ -1279,13 +1279,13 @@ 
 		if ($idprof6)   $sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
 		if ($email)     $sql .= " AND s.email = '".$this->db->escape($email)."'";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$num=$this->db->num_rows($resql);
+			$num = $this->db->num_rows($resql);
 			if ($num > 1)
 			{
-				$this->error='Fetch found several records. Rename one of tirdparties to avoid duplicate.';
+				$this->error = 'Fetch found several records. Rename one of tirdparties to avoid duplicate.';
 				dol_syslog($this->error, LOG_ERR);
 				$result = -2;
 			}
@@ -1295,11 +1295,11 @@ 
 
 				$this->id           = $obj->rowid;
 				$this->entity       = $obj->entity;
-				$this->canvas		= $obj->canvas;
+				$this->canvas = $obj->canvas;
 
 				$this->ref          = $obj->rowid;
-				$this->name 		= $obj->name;
-				$this->nom          = $obj->name;		// deprecated
+				$this->name = $obj->name;
+				$this->nom          = $obj->name; // deprecated
 				$this->name_alias = $obj->name_alias;
 				$this->ref_ext      = $obj->ref_ext;
 				$this->ref_int      = $obj->ref_int;
@@ -1309,22 +1309,22 @@ 
 				$this->user_creation     = $obj->fk_user_creat;
 				$this->user_modification = $obj->fk_user_modif;
 
-				$this->address 		= $obj->address;
+				$this->address = $obj->address;
 				$this->zip 			= $obj->zip;
 				$this->town 		= $obj->town;
 
 				$this->country_id   = $obj->country_id;
-				$this->country_code = $obj->country_id?$obj->country_code:'';
-				$this->country 		= $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):'';
+				$this->country_code = $obj->country_id ? $obj->country_code : '';
+				$this->country = $obj->country_id ? ($langs->trans('Country'.$obj->country_code) != 'Country'.$obj->country_code ? $langs->transnoentities('Country'.$obj->country_code) : $obj->country) : '';
 
 				$this->state_id     = $obj->fk_departement;
 				$this->state_code   = $obj->state_code;
-				$this->state        = ($obj->state!='-'?$obj->state:'');
+				$this->state        = ($obj->state != '-' ? $obj->state : '');
 
-				$transcode=$langs->trans('StatusProspect'.$obj->fk_stcomm);
-				$libelle=($transcode!='StatusProspect'.$obj->fk_stcomm?$transcode:$obj->stcomm);
-				$this->stcomm_id = $obj->fk_stcomm;     // id statut commercial
-				$this->statut_commercial = $libelle;    // libelle statut commercial
+				$transcode = $langs->trans('StatusProspect'.$obj->fk_stcomm);
+				$libelle = ($transcode != 'StatusProspect'.$obj->fk_stcomm ? $transcode : $obj->stcomm);
+				$this->stcomm_id = $obj->fk_stcomm; // id statut commercial
+				$this->statut_commercial = $libelle; // libelle statut commercial
 
 				$this->email = $obj->email;
 				$this->skype = $obj->skype;
@@ -1334,7 +1334,7 @@ 
 				$this->phone = $obj->phone;
 				$this->fax = $obj->fax;
 
-				$this->parent    = $obj->parent;
+				$this->parent = $obj->parent;
 
 				$this->idprof1		= $obj->idprof1;
 				$this->idprof2		= $obj->idprof2;
@@ -1343,7 +1343,7 @@ 
 				$this->idprof5		= $obj->idprof5;
 				$this->idprof6		= $obj->idprof6;
 
-				$this->capital   = $obj->capital;
+				$this->capital = $obj->capital;
 
 				$this->code_client = $obj->code_client;
 				$this->code_fournisseur = $obj->code_fournisseur;
@@ -1368,23 +1368,23 @@ 
 				$this->typent_code    = $obj->typent_code;
 
 				$this->effectif_id    = $obj->effectif_id;
-				$this->effectif       = $obj->effectif_id?$obj->effectif:'';
+				$this->effectif       = $obj->effectif_id ? $obj->effectif : '';
 
-				$this->forme_juridique_code= $obj->forme_juridique_code;
-				$this->forme_juridique     = $obj->forme_juridique_code?$obj->forme_juridique:'';
+				$this->forme_juridique_code = $obj->forme_juridique_code;
+				$this->forme_juridique     = $obj->forme_juridique_code ? $obj->forme_juridique : '';
 
 				$this->fk_prospectlevel = $obj->fk_prospectlevel;
 
 				$this->prefix_comm = $obj->prefix_comm;
 
-				$this->remise_percent		= $obj->remise_client;
-				$this->remise_supplier_percent		= $obj->remise_supplier;
+				$this->remise_percent = $obj->remise_client;
+				$this->remise_supplier_percent = $obj->remise_supplier;
 				$this->mode_reglement_id 	= $obj->mode_reglement;
 				$this->cond_reglement_id 	= $obj->cond_reglement;
 				$this->mode_reglement_supplier_id 	= $obj->mode_reglement_supplier;
 				$this->cond_reglement_supplier_id 	= $obj->cond_reglement_supplier;
-				$this->shipping_method_id   = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
-				$this->fk_account			= $obj->fk_account;
+				$this->shipping_method_id = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null;
+				$this->fk_account = $obj->fk_account;
 
 				$this->client      = $obj->client;
 				$this->fournisseur = $obj->fournisseur;
@@ -1401,7 +1401,7 @@ 
 
 				$this->outstanding_limit		= $obj->outstanding_limit;
 				$this->order_min_amount			= $obj->order_min_amount;
-				$this->supplier_order_min_amount	= $obj->supplier_order_min_amount;
+				$this->supplier_order_min_amount = $obj->supplier_order_min_amount;
 
 				// multiprix
 				$this->price_level = $obj->price_level;
@@ -1431,12 +1431,12 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$result = -3;
 		}
 
 		// Use first price level if level not defined for third party
-		if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) $this->price_level=1;
+		if (!empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) $this->price_level = 1;
 
 		return $result;
 	}
@@ -1449,15 +1449,15 @@ 
 	 *    @param    int		$call_trigger   0=No, 1=yes
 	 *    @return	int						<0 if KO, 0 if nothing done, >0 if OK
 	 */
-	function delete($id, User $fuser=null, $call_trigger=1)
+	function delete($id, User $fuser = null, $call_trigger = 1)
 	{
 		global $langs, $conf, $user;
 
-		if (empty($fuser)) $fuser=$user;
+		if (empty($fuser)) $fuser = $user;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$entity=isset($this->entity)?$this->entity:$conf->entity;
+		$entity = isset($this->entity) ? $this->entity : $conf->entity;
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$error = 0;
@@ -1469,15 +1469,15 @@ 
 			$this->db->begin();
 
 			// User is mandatory for trigger call
-			if (! $error && $call_trigger)
+			if (!$error && $call_trigger)
 			{
 				// Call trigger
-				$result=$this->call_trigger('COMPANY_DELETE',$fuser);
+				$result = $this->call_trigger('COMPANY_DELETE', $fuser);
 				if ($result < 0) $error++;
 				// End call triggers
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 				$static_cat = new Categorie($this->db);
@@ -1486,11 +1486,11 @@ 
 				// Fill $toute_categs array with an array of (type => array of ("Categorie" instance))
 				if ($this->client || $this->prospect)
 				{
-					$toute_categs['customer'] = $static_cat->containing($this->id,Categorie::TYPE_CUSTOMER);
+					$toute_categs['customer'] = $static_cat->containing($this->id, Categorie::TYPE_CUSTOMER);
 				}
 				if ($this->fournisseur)
 				{
-					$toute_categs['supplier'] = $static_cat->containing($this->id,Categorie::TYPE_SUPPLIER);
+					$toute_categs['supplier'] = $static_cat->containing($this->id, Categorie::TYPE_SUPPLIER);
 				}
 
 				// Remove each "Categorie"
@@ -1505,11 +1505,11 @@ 
 
 			foreach ($this->childtablesoncascade as $tabletodelete)
 			{
-				if (! $error)
+				if (!$error)
 				{
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete;
-					$sql.= " WHERE fk_soc = " . $id;
-					if (! $this->db->query($sql))
+					$sql .= " WHERE fk_soc = ".$id;
+					if (!$this->db->query($sql))
 					{
 						$error++;
 						$this->errors[] = $this->db->lasterror();
@@ -1518,9 +1518,9 @@ 
 			}
 
 			// Removed extrafields
-			if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+			if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
 			{
-				$result=$this->deleteExtraFields();
+				$result = $this->deleteExtraFields();
 				if ($result < 0)
 				{
 					$error++;
@@ -1529,12 +1529,12 @@ 
 			}
 
 			// Remove links to subsidiaries companies
-			if (! $error)
+			if (!$error)
 			{
 				$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
-				$sql.= " SET parent = NULL";
-				$sql.= " WHERE parent = " . $id;
-				if (! $this->db->query($sql))
+				$sql .= " SET parent = NULL";
+				$sql .= " WHERE parent = ".$id;
+				if (!$this->db->query($sql))
 				{
 					$error++;
 					$this->errors[] = $this->db->lasterror();
@@ -1542,25 +1542,25 @@ 
 			}
 
 			// Remove third party
-			if (! $error)
+			if (!$error)
 			{
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe";
-				$sql.= " WHERE rowid = " . $id;
-				if (! $this->db->query($sql))
+				$sql .= " WHERE rowid = ".$id;
+				if (!$this->db->query($sql))
 				{
 					$error++;
 					$this->errors[] = $this->db->lasterror();
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$this->db->commit();
 
 				// Delete directory
-				if (! empty($conf->societe->multidir_output[$entity]))
+				if (!empty($conf->societe->multidir_output[$entity]))
 				{
-					$docdir = $conf->societe->multidir_output[$entity] . "/" . $id;
+					$docdir = $conf->societe->multidir_output[$entity]."/".$id;
 					if (dol_is_dir($docdir))
 					{
 						dol_delete_dir_recursive($docdir);
@@ -1591,13 +1591,13 @@ 
         // phpcs:enable
 		if ($this->id)
 		{
-			$newclient=1;
-			if ($this->client == 2 || $this->client == 3) $newclient=3;	//If prospect, we keep prospect tag
+			$newclient = 1;
+			if ($this->client == 2 || $this->client == 3) $newclient = 3; //If prospect, we keep prospect tag
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
-			$sql.= " SET client = ".$newclient;
-			$sql.= " WHERE rowid = " . $this->id;
+			$sql .= " SET client = ".$newclient;
+			$sql .= " WHERE rowid = ".$this->id;
 
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->client = $newclient;
@@ -1623,10 +1623,10 @@ 
 		global $conf, $langs;
 
 		// Nettoyage parametres
-		$note=trim($note);
-		if (! $note)
+		$note = trim($note);
+		if (!$note)
 		{
-			$this->error=$langs->trans("ErrorFieldRequired",$langs->trans("NoteReason"));
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->trans("NoteReason"));
 			return -2;
 		}
 
@@ -1636,33 +1636,33 @@ 
 		{
 			$this->db->begin();
 
-			$now=dol_now();
+			$now = dol_now();
 
 			// Positionne remise courante
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
-			$sql.= " SET remise_client = '".$this->db->escape($remise)."'";
-			$sql.= " WHERE rowid = " . $this->id;
-			$resql=$this->db->query($sql);
-			if (! $resql)
+			$sql .= " SET remise_client = '".$this->db->escape($remise)."'";
+			$sql .= " WHERE rowid = ".$this->id;
+			$resql = $this->db->query($sql);
+			if (!$resql)
 			{
 				$this->db->rollback();
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 
 			// Ecrit trace dans historique des remises
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise";
-			$sql.= " (entity, datec, fk_soc, remise_client, note, fk_user_author)";
-			$sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
-			$sql.= " '".$this->db->escape($note)."',";
-			$sql.= " ".$user->id;
-			$sql.= ")";
-
-			$resql=$this->db->query($sql);
-			if (! $resql)
+			$sql .= " (entity, datec, fk_soc, remise_client, note, fk_user_author)";
+			$sql .= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
+			$sql .= " '".$this->db->escape($note)."',";
+			$sql .= " ".$user->id;
+			$sql .= ")";
+
+			$resql = $this->db->query($sql);
+			if (!$resql)
 			{
 				$this->db->rollback();
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				return -1;
 			}
 
@@ -1686,10 +1686,10 @@ 
 		global $conf, $langs;
 
 		// Nettoyage parametres
-		$note=trim($note);
-		if (! $note)
+		$note = trim($note);
+		if (!$note)
 		{
-			$this->error=$langs->trans("ErrorFieldRequired",$langs->trans("NoteReason"));
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->trans("NoteReason"));
 			return -2;
 		}
 
@@ -1699,33 +1699,33 @@ 
 		{
 			$this->db->begin();
 
-			$now=dol_now();
+			$now = dol_now();
 
 			// Positionne remise courante
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
-			$sql.= " SET remise_supplier = '".$this->db->escape($remise)."'";
-			$sql.= " WHERE rowid = " . $this->id;
-			$resql=$this->db->query($sql);
-			if (! $resql)
+			$sql .= " SET remise_supplier = '".$this->db->escape($remise)."'";
+			$sql .= " WHERE rowid = ".$this->id;
+			$resql = $this->db->query($sql);
+			if (!$resql)
 			{
 				$this->db->rollback();
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 
 			// Ecrit trace dans historique des remises
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_supplier";
-			$sql.= " (entity, datec, fk_soc, remise_supplier, note, fk_user_author)";
-			$sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
-			$sql.= " '".$this->db->escape($note)."',";
-			$sql.= " ".$user->id;
-			$sql.= ")";
-
-			$resql=$this->db->query($sql);
-			if (! $resql)
+			$sql .= " (entity, datec, fk_soc, remise_supplier, note, fk_user_author)";
+			$sql .= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($remise)."',";
+			$sql .= " '".$this->db->escape($note)."',";
+			$sql .= " ".$user->id;
+			$sql .= ")";
+
+			$resql = $this->db->query($sql);
+			if (!$resql)
 			{
 				$this->db->rollback();
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				return -1;
 			}
 
@@ -1745,7 +1745,7 @@ 
 	 *      @param	int		$discount_type	0 => customer discount, 1 => supplier discount
 	 *		@return	int					<0 if KO, id of discount record if OK
 	 */
-	function set_remise_except($remise, User $user, $desc, $tva_tx=0, $discount_type=0)
+	function set_remise_except($remise, User $user, $desc, $tva_tx = 0, $discount_type = 0)
 	{
         // phpcs:enable
 		global $langs;
@@ -1755,14 +1755,14 @@ 
 		$desc = trim($desc);
 
 		// Check parameters
-		if (! $remise > 0)
+		if (!$remise > 0)
 		{
-			$this->error=$langs->trans("ErrorWrongValueForParameter","1");
+			$this->error = $langs->trans("ErrorWrongValueForParameter", "1");
 			return -1;
 		}
-		if (! $desc)
+		if (!$desc)
 		{
-			$this->error=$langs->trans("ErrorWrongValueForParameter","3");
+			$this->error = $langs->trans("ErrorWrongValueForParameter", "3");
 			return -2;
 		}
 
@@ -1771,25 +1771,25 @@ 
 			require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
 			$discount = new DiscountAbsolute($this->db);
-			$discount->fk_soc=$this->id;
+			$discount->fk_soc = $this->id;
 
-			$discount->discount_type=$discount_type;
+			$discount->discount_type = $discount_type;
 
-			$discount->amount_ht=$discount->multicurrency_amount_ht=price2num($remise,'MT');
-			$discount->amount_tva=$discount->multicurrency_amount_tva=price2num($remise*$tva_tx/100,'MT');
-			$discount->amount_ttc=$discount->multicurrency_amount_ttc=price2num($discount->amount_ht+$discount->amount_tva,'MT');
+			$discount->amount_ht = $discount->multicurrency_amount_ht = price2num($remise, 'MT');
+			$discount->amount_tva = $discount->multicurrency_amount_tva = price2num($remise * $tva_tx / 100, 'MT');
+			$discount->amount_ttc = $discount->multicurrency_amount_ttc = price2num($discount->amount_ht + $discount->amount_tva, 'MT');
 
-			$discount->tva_tx=price2num($tva_tx,'MT');
-			$discount->description=$desc;
+			$discount->tva_tx = price2num($tva_tx, 'MT');
+			$discount->description = $desc;
 
-			$result=$discount->create($user);
+			$result = $discount->create($user);
 			if ($result > 0)
 			{
 				return $result;
 			}
 			else
 			{
-				$this->error=$discount->error;
+				$this->error = $discount->error;
 				return -3;
 			}
 		}
@@ -1805,19 +1805,19 @@ 
 	 * 	@param	int		$discount_type	0 => customer discount, 1 => supplier discount
 	 *	@return	int					<0 if KO, Credit note amount otherwise
 	 */
-	function getAvailableDiscounts($user='',$filter='',$maxvalue=0,$discount_type=0)
+	function getAvailableDiscounts($user = '', $filter = '', $maxvalue = 0, $discount_type = 0)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
-		$discountstatic=new DiscountAbsolute($this->db);
-		$result=$discountstatic->getAvailableDiscounts($this,$user,$filter,$maxvalue,$discount_type);
+		$discountstatic = new DiscountAbsolute($this->db);
+		$result = $discountstatic->getAvailableDiscounts($this, $user, $filter, $maxvalue, $discount_type);
 		if ($result >= 0)
 		{
 			return $result;
 		}
 		else
 		{
-			$this->error=$discountstatic->error;
+			$this->error = $discountstatic->error;
 			return -1;
 		}
 	}
@@ -1829,49 +1829,49 @@ 
 	 *  @param	int		$mode		0=Array with properties, 1=Array of id.
 	 *  @return array       		Array of sales representatives of third party
 	 */
-	function getSalesRepresentatives(User $user, $mode=0)
+	function getSalesRepresentatives(User $user, $mode = 0)
 	{
 		global $conf;
 
-		$reparray=array();
+		$reparray = array();
 
 		$sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
-		if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
+		if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 		{
-			$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
-			$sql.= " WHERE ((ug.fk_user = sc.fk_user";
-			$sql.= " AND ug.entity = ".$conf->entity.")";
-			$sql.= " OR u.admin = 1)";
+			$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
+			$sql .= " WHERE ((ug.fk_user = sc.fk_user";
+			$sql .= " AND ug.entity = ".$conf->entity.")";
+			$sql .= " OR u.admin = 1)";
 		}
 		else
-			$sql.= " WHERE entity in (0, ".$conf->entity.")";
+			$sql .= " WHERE entity in (0, ".$conf->entity.")";
 
-		$sql.= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
+		$sql .= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
 
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
-			$i=0;
+			$i = 0;
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
 
 				if (empty($mode))
 				{
-					$reparray[$i]['id']=$obj->rowid;
-					$reparray[$i]['lastname']=$obj->lastname;
-					$reparray[$i]['firstname']=$obj->firstname;
-					$reparray[$i]['email']=$obj->email;
-					$reparray[$i]['statut']=$obj->statut;
-					$reparray[$i]['entity']=$obj->entity;
-					$reparray[$i]['login']=$obj->login;
-					$reparray[$i]['photo']=$obj->photo;
+					$reparray[$i]['id'] = $obj->rowid;
+					$reparray[$i]['lastname'] = $obj->lastname;
+					$reparray[$i]['firstname'] = $obj->firstname;
+					$reparray[$i]['email'] = $obj->email;
+					$reparray[$i]['statut'] = $obj->statut;
+					$reparray[$i]['entity'] = $obj->entity;
+					$reparray[$i]['login'] = $obj->login;
+					$reparray[$i]['photo'] = $obj->photo;
 				}
 				else
 				{
-					$reparray[]=$obj->rowid;
+					$reparray[] = $obj->rowid;
 				}
 				$i++;
 			}
@@ -1896,13 +1896,13 @@ 
         // phpcs:enable
 		if ($this->id)
 		{
-			$now=dol_now();
+			$now = dol_now();
 
 			$sql  = "UPDATE ".MAIN_DB_PREFIX."societe";
 			$sql .= " SET price_level = '".$this->db->escape($price_level)."'";
-			$sql .= " WHERE rowid = " . $this->id;
+			$sql .= " WHERE rowid = ".$this->id;
 
-			if (! $this->db->query($sql))
+			if (!$this->db->query($sql))
 			{
 				dol_print_error($this->db);
 				return -1;
@@ -1912,7 +1912,7 @@ 
 			$sql .= " (datec, fk_soc, price_level, fk_user_author)";
 			$sql .= " VALUES ('".$this->db->idate($now)."', ".$this->id.", '".$this->db->escape($price_level)."', ".$user->id.")";
 
-			if (! $this->db->query($sql))
+			if (!$this->db->query($sql))
 			{
 				dol_print_error($this->db);
 				return -1;
@@ -1933,28 +1933,28 @@ 
 	function add_commercial(User $user, $commid)
 	{
         // phpcs:enable
-		$error=0;
+		$error = 0;
 
 
 		if ($this->id > 0 && $commid > 0)
 		{
 			$sql = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux";
-			$sql.= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
+			$sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
 
 			$this->db->query($sql);
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_commerciaux";
-			$sql.= " ( fk_soc, fk_user )";
-			$sql.= " VALUES (".$this->id.",".$commid.")";
+			$sql .= " ( fk_soc, fk_user )";
+			$sql .= " VALUES (".$this->id.",".$commid.")";
 
-			if (! $this->db->query($sql) )
+			if (!$this->db->query($sql))
 			{
 				dol_syslog(get_class($this)."::add_commercial Erreur");
 			}
 			else {
-				$this->context=array('commercial_modified'=>$commid);
+				$this->context = array('commercial_modified'=>$commid);
 
-				$result=$this->call_trigger('COMPANY_LINK_SALE_REPRESENTATIVE',$user);
+				$result = $this->call_trigger('COMPANY_LINK_SALE_REPRESENTATIVE', $user);
                 if ($result < 0) $error++;
 			}
 		}
@@ -1971,10 +1971,10 @@ 
 	function del_commercial(User $user, $commid)
 	{
         // phpcs:enable
-		$error=0;
-		$this->context=array('commercial_modified'=>$commid);
+		$error = 0;
+		$this->context = array('commercial_modified'=>$commid);
 
-		$result=$this->call_trigger('COMPANY_UNLINK_SALE_REPRESENTATIVE',$user);
+		$result = $this->call_trigger('COMPANY_UNLINK_SALE_REPRESENTATIVE', $user);
         if ($result < 0) $error++;
 
 		if ($this->id > 0 && $commid > 0)
@@ -1982,7 +1982,7 @@ 
 			$sql  = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux ";
 			$sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
 
-			if (! $this->db->query($sql) )
+			if (!$this->db->query($sql))
 			{
 				dol_syslog(get_class($this)."::del_commercial Erreur");
 			}
@@ -2000,162 +2000,162 @@ 
 	 *      @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *		@return	string					          String with URL
 	 */
-	function getNomUrl($withpicto=0, $option='', $maxlen=0, $notooltip=0, $save_lastsearch_value=-1)
+	function getNomUrl($withpicto = 0, $option = '', $maxlen = 0, $notooltip = 0, $save_lastsearch_value = -1)
 	{
 		global $conf, $langs, $hookmanager;
 
-		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-		$name=$this->name?$this->name:$this->nom;
+		$name = $this->name ? $this->name : $this->nom;
 
-		if(!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)){
+		if (!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)) {
 
-             if(empty($option) && $this->client > 0) $option = 'customer';
-             if(empty($option) && $this->fournisseur > 0) $option = 'supplier';
+             if (empty($option) && $this->client > 0) $option = 'customer';
+             if (empty($option) && $this->fournisseur > 0) $option = 'supplier';
          }
 
 
-		if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
+		if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
 		{
 			$code = '';
-			if (($this->client) && (! empty ( $this->code_client ))
+			if (($this->client) && (!empty ($this->code_client))
 				&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
 				|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
 				)
 			)
 			{
-				$code = $this->code_client . ' - ';
+				$code = $this->code_client.' - ';
 			}
 
-			if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
+			if (($this->fournisseur) && (!empty ($this->code_fournisseur))
 				&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
 				|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
 				)
 			)
 			{
-				$code .= $this->code_fournisseur . ' - ';
+				$code .= $this->code_fournisseur.' - ';
 			}
 
 			if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
 			{
-				$name =$code.' '.$name;
+				$name = $code.' '.$name;
 			}
 			else
 			{
-				$name =$code;
+				$name = $code;
 			}
 		}
 
 		if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
 
-		$result=''; $label='';
-		$linkstart=''; $linkend='';
+		$result = ''; $label = '';
+		$linkstart = ''; $linkend = '';
 
-		if (! empty($this->logo) && class_exists('Form'))
+		if (!empty($this->logo) && class_exists('Form'))
 		{
-			$label.= '<div class="photointooltip">';
-			$label.= Form::showphoto('societe', $this, 0, 40, 0, 'photowithmargin', 'mini', 0);	// Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
-			$label.= '</div><div style="clear: both;"></div>';
+			$label .= '<div class="photointooltip">';
+			$label .= Form::showphoto('societe', $this, 0, 40, 0, 'photowithmargin', 'mini', 0); // Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
+			$label .= '</div><div style="clear: both;"></div>';
 		}
 
-		$label.= '<div class="centpercent">';
+		$label .= '<div class="centpercent">';
 
 		if ($option == 'customer' || $option == 'compta' || $option == 'category' || $option == 'category_supplier')
 		{
-		   $label.= '<u>' . $langs->trans("ShowCustomer") . '</u>';
+		   $label .= '<u>'.$langs->trans("ShowCustomer").'</u>';
 		   $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
 		}
 		elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
 		{
-			$label.= '<u>' . $langs->trans("ShowProspect") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowProspect").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
 		}
 		elseif ($option == 'supplier')
 		{
-			$label.= '<u>' . $langs->trans("ShowSupplier") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowSupplier").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
 		}
 		elseif ($option == 'agenda')
 		{
-			$label.= '<u>' . $langs->trans("ShowAgenda") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowAgenda").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
 		}
 		elseif ($option == 'project')
 		{
-			$label.= '<u>' . $langs->trans("ShowProject") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowProject").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
 		}
 		elseif ($option == 'margin')
 		{
-			$label.= '<u>' . $langs->trans("ShowMargin") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowMargin").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
 		}
 		elseif ($option == 'contact')
 		{
-			$label.= '<u>' . $langs->trans("ShowContacts") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowContacts").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
 		}
 		elseif ($option == 'ban')
 		{
-			$label.= '<u>' . $langs->trans("ShowBan") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowBan").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$this->id;
 		}
 
 		// By default
 		if (empty($linkstart))
 		{
-			$label.= '<u>' . $langs->trans("ShowCompany") . '</u>';
+			$label .= '<u>'.$langs->trans("ShowCompany").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$this->id;
 		}
 
-		if (! empty($this->name))
+		if (!empty($this->name))
 		{
-			$label.= '<br><b>' . $langs->trans('Name') . ':</b> '. $this->name;
-			if (! empty($this->name_alias)) $label.=' ('.$this->name_alias.')';
-			$label.= '<br><b>' . $langs->trans('Email') . ':</b> '. $this->email;
-		}
-		if (! empty($this->country_code))
-			$label.= '<br><b>' . $langs->trans('Country') . ':</b> '. $this->country_code;
-		if (! empty($this->tva_intra) || (! empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false))
-			$label.= '<br><b>' . $langs->trans('VATIntra') . ':</b> '. $this->tva_intra;
-		if (! empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP))
+			$label .= '<br><b>'.$langs->trans('Name').':</b> '.$this->name;
+			if (!empty($this->name_alias)) $label .= ' ('.$this->name_alias.')';
+			$label .= '<br><b>'.$langs->trans('Email').':</b> '.$this->email;
+		}
+		if (!empty($this->country_code))
+			$label .= '<br><b>'.$langs->trans('Country').':</b> '.$this->country_code;
+		if (!empty($this->tva_intra) || (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false))
+			$label .= '<br><b>'.$langs->trans('VATIntra').':</b> '.$this->tva_intra;
+		if (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP))
 		{
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false) $label.= '<br><b>' . $langs->trans('ProfId1'.$this->country_code) . ':</b> '. $this->idprof1;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid2') !== false) $label.= '<br><b>' . $langs->trans('ProfId2'.$this->country_code) . ':</b> '. $this->idprof2;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid3') !== false) $label.= '<br><b>' . $langs->trans('ProfId3'.$this->country_code) . ':</b> '. $this->idprof3;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid4') !== false) $label.= '<br><b>' . $langs->trans('ProfId4'.$this->country_code) . ':</b> '. $this->idprof4;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid5') !== false) $label.= '<br><b>' . $langs->trans('ProfId5'.$this->country_code) . ':</b> '. $this->idprof5;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid6') !== false) $label.= '<br><b>' . $langs->trans('ProfId6'.$this->country_code) . ':</b> '. $this->idprof6;
-		}
-		if (! empty($this->code_client) && ($this->client == 1 || $this->client == 3))
-			$label.= '<br><b>' . $langs->trans('CustomerCode') . ':</b> '. $this->code_client;
-		if (! empty($this->code_fournisseur) && $this->fournisseur)
-			$label.= '<br><b>' . $langs->trans('SupplierCode') . ':</b> '. $this->code_fournisseur;
-		if (! empty($conf->accounting->enabled) && ($this->client == 1 || $this->client == 3))
-			$label.= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> '. ($this->code_compta ? $this->code_compta : $this->code_compta_client);
-		if (! empty($conf->accounting->enabled) && $this->fournisseur)
-			$label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
-
-		$label.= '</div>';
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false) $label .= '<br><b>'.$langs->trans('ProfId1'.$this->country_code).':</b> '.$this->idprof1;
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid2') !== false) $label .= '<br><b>'.$langs->trans('ProfId2'.$this->country_code).':</b> '.$this->idprof2;
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid3') !== false) $label .= '<br><b>'.$langs->trans('ProfId3'.$this->country_code).':</b> '.$this->idprof3;
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid4') !== false) $label .= '<br><b>'.$langs->trans('ProfId4'.$this->country_code).':</b> '.$this->idprof4;
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid5') !== false) $label .= '<br><b>'.$langs->trans('ProfId5'.$this->country_code).':</b> '.$this->idprof5;
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid6') !== false) $label .= '<br><b>'.$langs->trans('ProfId6'.$this->country_code).':</b> '.$this->idprof6;
+		}
+		if (!empty($this->code_client) && ($this->client == 1 || $this->client == 3))
+			$label .= '<br><b>'.$langs->trans('CustomerCode').':</b> '.$this->code_client;
+		if (!empty($this->code_fournisseur) && $this->fournisseur)
+			$label .= '<br><b>'.$langs->trans('SupplierCode').':</b> '.$this->code_fournisseur;
+		if (!empty($conf->accounting->enabled) && ($this->client == 1 || $this->client == 3))
+			$label .= '<br><b>'.$langs->trans('CustomerAccountancyCode').':</b> '.($this->code_compta ? $this->code_compta : $this->code_compta_client);
+		if (!empty($conf->accounting->enabled) && $this->fournisseur)
+			$label .= '<br><b>'.$langs->trans('SupplierAccountancyCode').':</b> '.$this->code_compta_fournisseur;
+
+		$label .= '</div>';
 
 		// Add type of canvas
-		$linkstart.=(!empty($this->canvas)?'&canvas='.$this->canvas:'');
+		$linkstart .= (!empty($this->canvas) ? '&canvas='.$this->canvas : '');
 		// Add param to save lastsearch_values or not
-		$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-		if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-		if ($add_save_lastsearch_values) $linkstart.='&save_lastsearch_values=1';
-		$linkstart.='"';
+		$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+		if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+		if ($add_save_lastsearch_values) $linkstart .= '&save_lastsearch_values=1';
+		$linkstart .= '"';
 
-		$linkclose='';
+		$linkclose = '';
 		if (empty($notooltip))
 		{
-			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 			{
-				$label=$langs->trans("ShowCompany");
-				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+				$label = $langs->trans("ShowCompany");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose.=' class="classfortooltip refurl"';
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip refurl"';
 
 		 	/*
 			$hookmanager->initHooks(array('thirdpartydao'));
@@ -2164,25 +2164,25 @@ 
 			if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 			*/
 		}
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
 		global $user;
-		if (! $user->rights->societe->client->voir && $user->societe_id > 0 && $this->id != $user->societe_id)
+		if (!$user->rights->societe->client->voir && $user->societe_id > 0 && $this->id != $user->societe_id)
 		{
-			$linkstart='';
-			$linkend='';
+			$linkstart = '';
+			$linkend = '';
 		}
 
-		$result.=$linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.=($maxlen?dol_trunc($name,$maxlen):$name);
-		$result.=$linkend;
+		$result .= $linkstart;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= ($maxlen ?dol_trunc($name, $maxlen) : $name);
+		$result .= $linkend;
 
 		global $action;
 		$hookmanager->initHooks(array('thirdpartydao'));
-		$parameters=array('id'=>$this->id, 'getnomurl'=>$result);
-		$reshook=$hookmanager->executeHooks('getNomUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) $result = $hookmanager->resPrint;
 		else $result .= $hookmanager->resPrint;
 
@@ -2195,9 +2195,9 @@ 
 	 *    @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *    @return   string        		Libelle
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->status,$mode);
+		return $this->LibStatut($this->status, $mode);
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -2208,7 +2208,7 @@ 
 	 *  @param	int		$mode           0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
 	 *  @return	string          		Libelle du statut
 	 */
-	function LibStatut($statut,$mode=0)
+	function LibStatut($statut, $mode = 0)
 	{
         // phpcs:enable
 		global $langs;
@@ -2216,38 +2216,38 @@ 
 
 		if ($mode == 0)
 		{
-			if ($statut==0) return $langs->trans("ActivityCeased");
-			elseif ($statut==1) return $langs->trans("InActivity");
+			if ($statut == 0) return $langs->trans("ActivityCeased");
+			elseif ($statut == 1) return $langs->trans("InActivity");
 		}
 		elseif ($mode == 1)
 		{
-			if ($statut==0) return $langs->trans("ActivityCeased");
-			elseif ($statut==1) return $langs->trans("InActivity");
+			if ($statut == 0) return $langs->trans("ActivityCeased");
+			elseif ($statut == 1) return $langs->trans("InActivity");
 		}
 		elseif ($mode == 2)
 		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-			elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+			if ($statut == 0) return img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+			elseif ($statut == 1) return img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
 		}
 		elseif ($mode == 3)
 		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			if ($statut == 0) return img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"');
+			elseif ($statut == 1) return img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"');
 		}
 		elseif ($mode == 4)
 		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-			elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+			if ($statut == 0) return img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+			elseif ($statut == 1) return img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
 		}
 		elseif ($mode == 5)
 		{
-			if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			elseif ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			if ($statut == 0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"');
+			elseif ($statut == 1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"');
 		}
 		elseif ($mode == 6)
 		{
-			if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			elseif ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			if ($statut == 0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"), 'statut5', 'class="pictostatus"');
+			elseif ($statut == 1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"), 'statut4', 'class="pictostatus"');
 		}
 	}
 
@@ -2258,16 +2258,16 @@ 
 	 *	  @param	  int		$addthirdparty		1=Add also a record for thirdparty email
 	 *    @return     array       					Array of contacts emails
 	 */
-	function thirdparty_and_contact_email_array($addthirdparty=0)
+	function thirdparty_and_contact_email_array($addthirdparty = 0)
 	{
         // phpcs:enable
 		global $langs;
 
-		$contact_emails = $this->contact_property_array('email',1);
+		$contact_emails = $this->contact_property_array('email', 1);
 		if ($this->email && $addthirdparty)
 		{
-			if (empty($this->name)) $this->name=$this->nom;
-			$contact_emails['thirdparty']=$langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->email.">";
+			if (empty($this->name)) $this->name = $this->nom;
+			$contact_emails['thirdparty'] = $langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name, 16)." <".$this->email.">";
 		}
 		//var_dump($contact_emails)
 		return $contact_emails;
@@ -2286,11 +2286,11 @@ 
 
 		$contact_phone = $this->contact_property_array('mobile');
 
-		if (! empty($this->phone))	// If a phone of thirdparty is defined, we add it ot mobile of contacts
+		if (!empty($this->phone))	// If a phone of thirdparty is defined, we add it ot mobile of contacts
 		{
-			if (empty($this->name)) $this->name=$this->nom;
+			if (empty($this->name)) $this->name = $this->nom;
 			// TODO: Tester si tel non deja present dans tableau contact
-			$contact_phone['thirdparty']=$langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->phone.">";
+			$contact_phone['thirdparty'] = $langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name, 16)." <".$this->phone.">";
 		}
 		return $contact_phone;
 	}
@@ -2303,7 +2303,7 @@ 
 	 * 	@param	int		$hidedisabled		1=Hide contact if disabled
 	 *  @return array       				Array of contacts emails or mobile. Example: array(id=>'Name <email>')
 	 */
-	function contact_property_array($mode='email', $hidedisabled=0)
+	function contact_property_array($mode = 'email', $hidedisabled = 0)
 	{
         // phpcs:enable
 		global $langs;
@@ -2312,45 +2312,45 @@ 
 
 
 		$sql = "SELECT rowid, email, statut, phone_mobile, lastname, poste, firstname";
-		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
-		$sql.= " WHERE fk_soc = ".$this->id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople";
+		$sql .= " WHERE fk_soc = ".$this->id;
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$nump = $this->db->num_rows($resql);
 			if ($nump)
 			{
-				$sepa="("; $sepb=")";
+				$sepa = "("; $sepb = ")";
 				if ($mode == 'email')
 				{
 					//$sepa="&lt;"; $sepb="&gt;";
-					$sepa="<"; $sepb=">";
+					$sepa = "<"; $sepb = ">";
 				}
 				$i = 0;
 				while ($i < $nump)
 				{
 					$obj = $this->db->fetch_object($resql);
-					if ($mode == 'email') $property=$obj->email;
-					else if ($mode == 'mobile') $property=$obj->phone_mobile;
-					else $property=$obj->$mode;
+					if ($mode == 'email') $property = $obj->email;
+					else if ($mode == 'mobile') $property = $obj->phone_mobile;
+					else $property = $obj->$mode;
 
 					// Show all contact. If hidedisabled is 1, showonly contacts with status = 1
 					if ($obj->statut == 1 || empty($hidedisabled))
 					{
 						if (empty($property))
 						{
-							if ($mode == 'email') $property=$langs->transnoentitiesnoconv("NoEMail");
-							else if ($mode == 'mobile') $property=$langs->transnoentitiesnoconv("NoMobilePhone");
+							if ($mode == 'email') $property = $langs->transnoentitiesnoconv("NoEMail");
+							else if ($mode == 'mobile') $property = $langs->transnoentitiesnoconv("NoMobilePhone");
 						}
 
 						if (!empty($obj->poste))
 						{
-							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).($obj->poste?" - ".$obj->poste:"").(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
+							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).($obj->poste ? " - ".$obj->poste : "").(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
 						}
 						else
 						{
-							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
+							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
 						}
 					}
 					$i++;
@@ -2377,7 +2377,7 @@ 
 		$contacts = array();
 
 		$sql = "SELECT rowid, lastname, firstname FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$nump = $this->db->num_rows($resql);
@@ -2387,7 +2387,7 @@ 
 				while ($i < $nump)
 				{
 					$obj = $this->db->fetch_object($resql);
-					$contacts[$obj->rowid] = dolGetFirstLastname($obj->firstname,$obj->lastname);
+					$contacts[$obj->rowid] = dolGetFirstLastname($obj->firstname, $obj->lastname);
 					$i++;
 				}
 			}
@@ -2408,11 +2408,11 @@ 
 	function contact_array_objects()
 	{
         // phpcs:enable
-		require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 		$contacts = array();
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$nump = $this->db->num_rows($resql);
@@ -2444,18 +2444,18 @@ 
 	 *  @param  string	$mode       'email' or 'mobile'
 	 *  @return string  			Email of contact with format: "Full name <email>"
 	 */
-	function contact_get_property($rowid,$mode)
+	function contact_get_property($rowid, $mode)
 	{
         // phpcs:enable
-		$contact_property='';
+		$contact_property = '';
 
 		if (empty($rowid)) return '';
 
 		$sql = "SELECT rowid, email, phone_mobile, lastname, firstname";
-		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
-		$sql.= " WHERE rowid = '".$rowid."'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople";
+		$sql .= " WHERE rowid = '".$rowid."'";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$nump = $this->db->num_rows($resql);
@@ -2483,13 +2483,13 @@ 
 	 *	@param	string	$mode	'label' or 'rum' or 'format'
 	 *  @return	string			Bank number
 	 */
-	function display_rib($mode='label')
+	function display_rib($mode = 'label')
 	{
         // phpcs:enable
-		require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 
 		$bac = new CompanyBankAccount($this->db);
-		$bac->fetch(0,$this->id);
+		$bac->fetch(0, $this->id);
 
 		if ($mode == 'label')
 		{
@@ -2499,7 +2499,7 @@ 
 		{
 			if (empty($bac->rum))
 			{
-				require_once DOL_DOCUMENT_ROOT . '/compta/prelevement/class/bonprelevement.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 				$prelevement = new BonPrelevement($this->db);
 				$bac->fetch_thirdparty();
 				$bac->rum = $prelevement->buildRumNumber($bac->thirdparty->code_client, $bac->datec, $bac->id);
@@ -2523,7 +2523,7 @@ 
 	function get_all_rib()
 	{
         // phpcs:enable
-		require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib WHERE type='ban' AND fk_soc = ".$this->id;
 		$result = $this->db->query($sql);
 		if (!$result) {
@@ -2553,23 +2553,23 @@ 
 	 *	@param	int			$type		Should be 0 to say customer
 	 *  @return void
 	 */
-	function get_codeclient($objsoc=0,$type=0)
+	function get_codeclient($objsoc = 0, $type = 0)
 	{
         // phpcs:enable
 		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot)
 			{
-				$res=dol_include_once($dirroot.$module.'.php');
+				$res = dol_include_once($dirroot.$module.'.php');
 				if ($res) break;
 			}
 			$mod = new $module();
 
-			$this->code_client = $mod->getNextValue($objsoc,$type);
+			$this->code_client = $mod->getNextValue($objsoc, $type);
 			$this->prefixCustomerIsRequired = $mod->prefixIsRequired;
 
 			dol_syslog(get_class($this)."::get_codeclient code_client=".$this->code_client." module=".$module);
@@ -2585,23 +2585,23 @@ 
 	 *	@param	int			$type		Should be 1 to say supplier
 	 *  @return void
 	 */
-	function get_codefournisseur($objsoc=0,$type=1)
+	function get_codefournisseur($objsoc = 0, $type = 1)
 	{
         // phpcs:enable
 		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot)
 			{
-				$res=dol_include_once($dirroot.$module.'.php');
+				$res = dol_include_once($dirroot.$module.'.php');
 				if ($res) break;
 			}
 			$mod = new $module();
 
-			$this->code_fournisseur = $mod->getNextValue($objsoc,$type);
+			$this->code_fournisseur = $mod->getNextValue($objsoc, $type);
 
 			dol_syslog(get_class($this)."::get_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
 		}
@@ -2618,23 +2618,23 @@ 
 	{
         // phpcs:enable
 		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot)
 			{
-				$res=dol_include_once($dirroot.$module.'.php');
+				$res = dol_include_once($dirroot.$module.'.php');
 				if ($res) break;
 			}
 
 			$mod = new $module();
 
 			dol_syslog(get_class($this)."::codeclient_modifiable code_client=".$this->code_client." module=".$module);
-			if ($mod->code_modifiable_null && ! $this->code_client) return 1;
+			if ($mod->code_modifiable_null && !$this->code_client) return 1;
 			if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) return 1;
-			if ($mod->code_modifiable) return 1;	// A mettre en dernier
+			if ($mod->code_modifiable) return 1; // A mettre en dernier
 			return 0;
 		}
 		else
@@ -2654,23 +2654,23 @@ 
 	{
         // phpcs:enable
 		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot)
 			{
-				$res=dol_include_once($dirroot.$module.'.php');
+				$res = dol_include_once($dirroot.$module.'.php');
 				if ($res) break;
 			}
 
 			$mod = new $module();
 
 			dol_syslog(get_class($this)."::codefournisseur_modifiable code_founisseur=".$this->code_fournisseur." module=".$module);
-			if ($mod->code_modifiable_null && ! $this->code_fournisseur) return 1;
+			if ($mod->code_modifiable_null && !$this->code_fournisseur) return 1;
 			if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) return 1;
-			if ($mod->code_modifiable) return 1;	// A mettre en dernier
+			if ($mod->code_modifiable) return 1; // A mettre en dernier
 			return 0;
 		}
 		else
@@ -2694,14 +2694,14 @@ 
 	{
         // phpcs:enable
 		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot)
 			{
-				$res=dol_include_once($dirroot.$module.'.php');
+				$res = dol_include_once($dirroot.$module.'.php');
 				if ($res) break;
 			}
 
@@ -2731,14 +2731,14 @@ 
 	{
         // phpcs:enable
 		global $conf;
-		if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
+		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
-			$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
 
-			$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot)
 			{
-				$res=dol_include_once($dirroot.$module.'.php');
+				$res = dol_include_once($dirroot.$module.'.php');
 				if ($res) break;
 			}
 
@@ -2768,13 +2768,13 @@ 
         // phpcs:enable
 		global $conf;
 
-		if (! empty($conf->global->SOCIETE_CODECOMPTA_ADDON))
+		if (!empty($conf->global->SOCIETE_CODECOMPTA_ADDON))
 		{
-			$res=false;
-			$dirsociete=array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+			$res = false;
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot)
 			{
-				$res=dol_include_once($dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.'.php');
+				$res = dol_include_once($dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.'.php');
 				if ($res) break;
 			}
 
@@ -2819,10 +2819,10 @@ 
 		if ($this->id)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
-			$sql.= " SET parent = ".($id > 0 ? $id : "null");
-			$sql.= " WHERE rowid = " . $this->id;
+			$sql .= " SET parent = ".($id > 0 ? $id : "null");
+			$sql .= " WHERE rowid = ".$this->id;
 			dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->parent = $id;
@@ -2848,28 +2848,28 @@ 
         // phpcs:enable
 		global $conf;
 
-	 	switch($idprof)
+	 	switch ($idprof)
 		{
 			case 1:
-				$ret=(!$conf->global->SOCIETE_IDPROF1_UNIQUE?false:true);
+				$ret = (!$conf->global->SOCIETE_IDPROF1_UNIQUE ?false:true);
 				break;
 			case 2:
-				$ret=(!$conf->global->SOCIETE_IDPROF2_UNIQUE?false:true);
+				$ret = (!$conf->global->SOCIETE_IDPROF2_UNIQUE ?false:true);
 				break;
 			case 3:
-				$ret=(!$conf->global->SOCIETE_IDPROF3_UNIQUE?false:true);
+				$ret = (!$conf->global->SOCIETE_IDPROF3_UNIQUE ?false:true);
 				break;
 			case 4:
-				$ret=(!$conf->global->SOCIETE_IDPROF4_UNIQUE?false:true);
+				$ret = (!$conf->global->SOCIETE_IDPROF4_UNIQUE ?false:true);
 				break;
 			case 5:
-				$ret=(!$conf->global->SOCIETE_IDPROF5_UNIQUE?false:true);
+				$ret = (!$conf->global->SOCIETE_IDPROF5_UNIQUE ?false:true);
 				break;
 			case 6:
-				$ret=(!$conf->global->SOCIETE_IDPROF6_UNIQUE?false:true);
+				$ret = (!$conf->global->SOCIETE_IDPROF6_UNIQUE ?false:true);
 				break;
 			default:
-				$ret=false;
+				$ret = false;
 		}
 
 		return $ret;
@@ -2884,40 +2884,40 @@ 
 	 *    @param	int		$socid		Id of thirdparty to exclude (if update)
 	 *    @return   boolean				True if exists, False if not
 	 */
-	function id_prof_exists($idprof, $value, $socid=0)
+	function id_prof_exists($idprof, $value, $socid = 0)
 	{
         // phpcs:enable
 		$field = $idprof;
 
-	 	switch($idprof)	// For backward compatibility
+	 	switch ($idprof)	// For backward compatibility
 		{
 			case '1':
 			case 'idprof1':
-				$field="siren";
+				$field = "siren";
 				break;
 			case '2':
 			case 'idprof2':
-				$field="siret";
+				$field = "siret";
 				break;
 			case '3':
 			case 'idprof3':
-				$field="ape";
+				$field = "ape";
 				break;
 			case '4':
 			case 'idprof4':
-				$field="idprof4";
+				$field = "idprof4";
 				break;
 			case '5':
-				$field="idprof5";
+				$field = "idprof5";
 				break;
 			case '6':
-				$field="idprof6";
+				$field = "idprof6";
 				break;
 	 	}
 
 		 //Verify duplicate entries
-		$sql  = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
-		if($socid) $sql .= " AND rowid <> ".$socid;
+		$sql = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
+		if ($socid) $sql .= " AND rowid <> ".$socid;
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -2944,20 +2944,20 @@ 
 	 *  @return int             			<=0 if KO, >0 if OK
 	 *  TODO better to have this in a lib than into a business class
 	 */
-	function id_prof_check($idprof,$soc)
+	function id_prof_check($idprof, $soc)
 	{
         // phpcs:enable
 		global $conf;
 
-		$ok=1;
+		$ok = 1;
 
-		if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
+		if (!empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
 
 		// Verifie SIREN si pays FR
 		if ($idprof == 1 && $soc->country_code == 'FR')
 		{
-			$chaine=trim($this->idprof1);
-			$chaine=preg_replace('/(\s)/','',$chaine);
+			$chaine = trim($this->idprof1);
+			$chaine = preg_replace('/(\s)/', '', $chaine);
 
 			if (!is_numeric($chaine)) return -1;
 			if (dol_strlen($chaine) != 9) return -1;
@@ -2967,7 +2967,7 @@ 
 			// on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
 			// on ajoute cette valeur à la somme totale
 
-			for ($index = 0; $index < 9; $index ++)
+			for ($index = 0; $index < 9; $index++)
 			{
 				$number = (int) $siren[$index];
 				if (($index % 2) != 0) { if (($number *= 2) > 9) $number -= 9; }
@@ -2981,8 +2981,8 @@ 
 		// Verifie SIRET si pays FR
 		if ($idprof == 2 && $soc->country_code == 'FR')
 		{
-			$chaine=trim($this->idprof2);
-			$chaine=preg_replace('/(\s)/','',$chaine);
+			$chaine = trim($this->idprof2);
+			$chaine = preg_replace('/(\s)/', '', $chaine);
 
 			if (!is_numeric($chaine)) return -1;
 			if (dol_strlen($chaine) != 14) return -1;
@@ -2992,7 +2992,7 @@ 
 			// on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
 			// on ajoute cette valeur à la somme totale
 
-			for ($index = 0; $index < 14; $index ++)
+			for ($index = 0; $index < 14; $index++)
 			{
 				$number = (int) $chaine[$index];
 				if (($index % 2) == 0) { if (($number *= 2) > 9) $number -= 9; }
@@ -3007,11 +3007,11 @@ 
 		//Returns: 1 if NIF ok, 2 if CIF ok, 3 if NIE ok, -1 if NIF bad, -2 if CIF bad, -3 if NIE bad, 0 if unexpected bad
 		if ($idprof == 1 && $soc->country_code == 'ES')
 		{
-			$string=trim($this->idprof1);
-			$string=preg_replace('/(\s)/','',$string);
+			$string = trim($this->idprof1);
+			$string = preg_replace('/(\s)/', '', $string);
 			$string = strtoupper($string);
 
-			for ($i = 0; $i < 9; $i ++)
+			for ($i = 0; $i < 9; $i++)
 			$num[$i] = substr($string, $i, 1);
 
 			//Check format
@@ -3028,7 +3028,7 @@ 
 			//algorithm checking type code CIF
 			$sum = $num[2] + $num[4] + $num[6];
 			for ($i = 1; $i < 8; $i += 2)
-			$sum += intval(substr((2 * $num[$i]),0,1)) + intval(substr((2 * $num[$i]),1,1));
+			$sum += intval(substr((2 * $num[$i]), 0, 1)) + intval(substr((2 * $num[$i]), 1, 1));
 			$n = 10 - substr($sum, strlen($sum) - 1, 1);
 
 			//Chek special NIF
@@ -3054,7 +3054,7 @@ 
 
 			//Check NIE XYZ
 			if (preg_match('/^[XYZ]{1}/', $string))
-				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X','Y','Z'), array('0','1','2'), $string), 0, 8) % 23, 1))
+				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X', 'Y', 'Z'), array('0', '1', '2'), $string), 0, 8) % 23, 1))
 				return 3;
 				else
 				return -3;
@@ -3067,10 +3067,10 @@ 
 		//Returns: 1 if NIF ok, -1 if NIF bad, 0 if unexpected bad
 		if ($idprof == 1 && $soc->country_code == 'PT')
 		{
-			$string=trim($this->idprof1);
-			$string=preg_replace('/(\s)/','',$string);
+			$string = trim($this->idprof1);
+			$string = preg_replace('/(\s)/', '', $string);
 
-			for ($i = 0; $i < 9; $i ++) {
+			for ($i = 0; $i < 9; $i++) {
 				$num[$i] = substr($string, $i, 1);
 			}
 
@@ -3095,38 +3095,38 @@ 
 	 *   @return	string          		Url or empty string if no URL known
 	 *   TODO better in a lib than into business class
 	 */
-	function id_prof_url($idprof,$thirdparty)
+	function id_prof_url($idprof, $thirdparty)
 	{
         // phpcs:enable
-		global $conf,$langs,$hookmanager;
+		global $conf, $langs, $hookmanager;
 
-		$url='';
+		$url = '';
 		$action = '';
 
 		$hookmanager->initHooks(array('idprofurl'));
-		$parameters=array('idprof'=>$idprof, 'company'=>$thirdparty);
-		$reshook=$hookmanager->executeHooks('getIdProfUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+		$parameters = array('idprof'=>$idprof, 'company'=>$thirdparty);
+		$reshook = $hookmanager->executeHooks('getIdProfUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if (empty($reshook)) {
-			if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+			if (!empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
 				return '';
 			}
 
 			// TODO Move links to validate professional ID into a dictionary table "country" + "link"
             $strippedIdProf1 = str_replace(' ', '', $thirdparty->idprof1);
 			if ($idprof == 1 && $thirdparty->country_code == 'FR') {
-				$url='http://www.societe.com/cgi-bin/search?champs='.$strippedIdProf1;    // See also http://avis-situation-sirene.insee.fr/
+				$url = 'http://www.societe.com/cgi-bin/search?champs='.$strippedIdProf1; // See also http://avis-situation-sirene.insee.fr/
 			}
 			if ($idprof == 1 && ($thirdparty->country_code == 'GB' || $thirdparty->country_code == 'UK')) {
-				$url='https://beta.companieshouse.gov.uk/company/'.$strippedIdProf1;
+				$url = 'https://beta.companieshouse.gov.uk/company/'.$strippedIdProf1;
 			}
 			if ($idprof == 1 && $thirdparty->country_code == 'ES') {
-				$url='http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$strippedIdProf1;
+				$url = 'http://www.e-informa.es/servlet/app/portal/ENTP/screen/SProducto/prod/ETIQUETA_EMPRESA/nif/'.$strippedIdProf1;
 			}
 			if ($idprof == 1 && $thirdparty->country_code == 'IN') {
-				$url='http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$strippedIdProf1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
+				$url = 'http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$strippedIdProf1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
 			}
 			if ($idprof == 1 && $thirdparty->country_code == 'PT') {
-				$url='http://www.nif.pt/'.$strippedIdProf1;
+				$url = 'http://www.nif.pt/'.$strippedIdProf1;
 			}
 
 			if ($url) {
@@ -3149,7 +3149,7 @@ 
 	function has_projects()
 	{
         // phpcs:enable
-		$sql = 'SELECT COUNT(*) as numproj FROM '.MAIN_DB_PREFIX.'projet WHERE fk_soc = ' . $this->id;
+		$sql = 'SELECT COUNT(*) as numproj FROM '.MAIN_DB_PREFIX.'projet WHERE fk_soc = '.$this->id;
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -3175,11 +3175,11 @@ 
 	function info($id)
 	{
 		$sql = "SELECT s.rowid, s.nom as name, s.datec as date_creation, tms as date_modification,";
-		$sql.= " fk_user_creat, fk_user_modif";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-		$sql.= " WHERE s.rowid = ".$id;
+		$sql .= " fk_user_creat, fk_user_modif";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " WHERE s.rowid = ".$id;
 
-		$result=$this->db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			if ($this->db->num_rows($result))
@@ -3191,7 +3191,7 @@ 
 				if ($obj->fk_user_creat) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_creat);
-					$this->user_creation     = $cuser;
+					$this->user_creation = $cuser;
 				}
 
 				if ($obj->fk_user_modif) {
@@ -3200,7 +3200,7 @@ 
 					$this->user_modification = $muser;
 				}
 
-				$this->ref			     = $obj->name;
+				$this->ref = $obj->name;
 				$this->date_creation     = $this->db->jdate($obj->date_creation);
 				$this->date_modification = $this->db->jdate($obj->date_modification);
 			}
@@ -3223,13 +3223,13 @@ 
 		global $conf;
 
 		// Define if third party is treated as company (or not) when nature is unknown
-		$isacompany=empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES)?0:1; // 0 by default
-		if (! empty($this->tva_intra)) $isacompany=1;
-		else if (! empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN')
+		$isacompany = empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES) ? 0 : 1; // 0 by default
+		if (!empty($this->tva_intra)) $isacompany = 1;
+		else if (!empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN')
 		{
 			// TODO Add a field is_a_company into dictionary
-			if (preg_match('/^TE_PRIVATE/', $this->typent_code)) $isacompany=0;
-			else $isacompany=1;
+			if (preg_match('/^TE_PRIVATE/', $this->typent_code)) $isacompany = 0;
+			else $isacompany = 1;
 		}
 
 		return $isacompany;
@@ -3257,13 +3257,13 @@ 
         // phpcs:enable
 		$this->SupplierCategories = array();
 		$sql = "SELECT rowid, label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
-		$sql.= " WHERE type = ".Categorie::TYPE_SUPPLIER;
+		$sql .= " FROM ".MAIN_DB_PREFIX."categorie";
+		$sql .= " WHERE type = ".Categorie::TYPE_SUPPLIER;
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			while ($obj = $this->db->fetch_object($resql) )
+			while ($obj = $this->db->fetch_object($resql))
 			{
 				$this->SupplierCategories[$obj->rowid] = $obj->label;
 			}
@@ -3288,9 +3288,9 @@ 
 		if ($categorie_id > 0 && $this->id > 0)
 		{
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
-			$sql.= " VALUES (".$categorie_id.", ".$this->id.")";
+			$sql .= " VALUES (".$categorie_id.", ".$this->id.")";
 
-			if ($resql=$this->db->query($sql)) return 0;
+			if ($resql = $this->db->query($sql)) return 0;
 		}
 		else
 		{
@@ -3310,48 +3310,48 @@ 
 	 *  @param	string		$customercode	Customer code
 	 *  @return int							<0 if KO, id of created account if OK
 	 */
-	function create_from_member(Adherent $member, $socname='', $socalias='', $customercode='')
+	function create_from_member(Adherent $member, $socname = '', $socalias = '', $customercode = '')
 	{
         // phpcs:enable
-		global $user,$langs;
+		global $user, $langs;
 
 		dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
 
-		$name = $socname?$socname:$member->societe;
-		if (empty($name)) $name=$member->getFullName($langs);
+		$name = $socname ? $socname : $member->societe;
+		if (empty($name)) $name = $member->getFullName($langs);
 
-		$alias = $socalias?$socalias:'';
+		$alias = $socalias ? $socalias : '';
 
 		// Positionne parametres
-		$this->nom=$name;				// TODO deprecated
-		$this->name=$name;
-		$this->name_alias=$alias;
-		$this->address=$member->address;
-		$this->zip=$member->zip;
-		$this->town=$member->town;
-		$this->country_code=$member->country_code;
-		$this->country_id=$member->country_id;
-		$this->phone=$member->phone;       // Prof phone
-		$this->email=$member->email;
-		$this->skype=$member->skype;
-		$this->twitter=$member->twitter;
-		$this->facebook=$member->facebook;
-
-		$this->client = 1;				// A member is a customer by default
-		$this->code_client = ($customercode?$customercode:-1);
+		$this->nom = $name; // TODO deprecated
+		$this->name = $name;
+		$this->name_alias = $alias;
+		$this->address = $member->address;
+		$this->zip = $member->zip;
+		$this->town = $member->town;
+		$this->country_code = $member->country_code;
+		$this->country_id = $member->country_id;
+		$this->phone = $member->phone; // Prof phone
+		$this->email = $member->email;
+		$this->skype = $member->skype;
+		$this->twitter = $member->twitter;
+		$this->facebook = $member->facebook;
+
+		$this->client = 1; // A member is a customer by default
+		$this->code_client = ($customercode ? $customercode : -1);
 		$this->code_fournisseur = -1;
 
 		$this->db->begin();
 
 		// Cree et positionne $this->id
-		$result=$this->create($user);
+		$result = $this->create($user);
 		if ($result >= 0)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
-			$sql.= " SET fk_soc=".$this->id;
-			$sql.= " WHERE rowid=".$member->id;
+			$sql .= " SET fk_soc=".$this->id;
+			$sql .= " WHERE rowid=".$member->id;
 
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->db->commit();
@@ -3359,7 +3359,7 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 
 				$this->db->rollback();
 				return -1;
@@ -3368,7 +3368,7 @@ 
 		else
 		{
 			// $this->error deja positionne
-			dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',',$this->errors), LOG_ERR);
+			dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',', $this->errors), LOG_ERR);
 
 			$this->db->rollback();
 			return $result;
@@ -3385,68 +3385,68 @@ 
 	{
 		global $langs;
 
-		$this->id=0;
-		$this->name=empty($conf->global->MAIN_INFO_SOCIETE_NOM)?'':$conf->global->MAIN_INFO_SOCIETE_NOM;
-		$this->address=empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS;
-		$this->zip=empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP;
-		$this->town=empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN;
-		$this->state_id=empty($conf->global->MAIN_INFO_SOCIETE_STATE)?'':$conf->global->MAIN_INFO_SOCIETE_STATE;
-		$this->region_code=empty($conf->global->MAIN_INFO_SOCIETE_REGION)?'':$conf->global->MAIN_INFO_SOCIETE_REGION;
-		$this->object=empty($conf->global->MAIN_INFO_SOCIETE_OBJECT)?'':$conf->global->MAIN_INFO_SOCIETE_OBJECT;
+		$this->id = 0;
+		$this->name = empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? '' : $conf->global->MAIN_INFO_SOCIETE_NOM;
+		$this->address = empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS) ? '' : $conf->global->MAIN_INFO_SOCIETE_ADDRESS;
+		$this->zip = empty($conf->global->MAIN_INFO_SOCIETE_ZIP) ? '' : $conf->global->MAIN_INFO_SOCIETE_ZIP;
+		$this->town = empty($conf->global->MAIN_INFO_SOCIETE_TOWN) ? '' : $conf->global->MAIN_INFO_SOCIETE_TOWN;
+		$this->state_id = empty($conf->global->MAIN_INFO_SOCIETE_STATE) ? '' : $conf->global->MAIN_INFO_SOCIETE_STATE;
+		$this->region_code = empty($conf->global->MAIN_INFO_SOCIETE_REGION) ? '' : $conf->global->MAIN_INFO_SOCIETE_REGION;
+		$this->object = empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? '' : $conf->global->MAIN_INFO_SOCIETE_OBJECT;
 
-		$this->note_private=empty($conf->global->MAIN_INFO_SOCIETE_NOTE)?'':$conf->global->MAIN_INFO_SOCIETE_NOTE;
+		$this->note_private = empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? '' : $conf->global->MAIN_INFO_SOCIETE_NOTE;
 
-		$this->nom=$this->name; 									// deprecated
+		$this->nom = $this->name; // deprecated
 
 		// We define country_id, country_code and country
-		$country_id=$country_code=$country_label='';
-		if (! empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
+		$country_id = $country_code = $country_label = '';
+		if (!empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 		{
-			$tmp=explode(':',$conf->global->MAIN_INFO_SOCIETE_COUNTRY);
-			$country_id=$tmp[0];
-			if (! empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
+			$tmp = explode(':', $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
+			$country_id = $tmp[0];
+			if (!empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
 			{
-				$country_code=$tmp[1];
-				$country_label=$tmp[2];
+				$country_code = $tmp[1];
+				$country_label = $tmp[2];
 			}
 			else                    // For backward compatibility
 			{
 				dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_ERR);
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-				$country_code=getCountry($country_id,2,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
-				$country_label=getCountry($country_id,0,$this->db);  // This need a SQL request, but it's the old feature that should not be used anymore
+				$country_code = getCountry($country_id, 2, $this->db); // This need a SQL request, but it's the old feature that should not be used anymore
+				$country_label = getCountry($country_id, 0, $this->db); // This need a SQL request, but it's the old feature that should not be used anymore
 			}
 		}
-		$this->country_id=$country_id;
-		$this->country_code=$country_code;
-		$this->country=$country_label;
-		if (is_object($langs)) $this->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
+		$this->country_id = $country_id;
+		$this->country_code = $country_code;
+		$this->country = $country_label;
+		if (is_object($langs)) $this->country = ($langs->trans('Country'.$country_code) != 'Country'.$country_code) ? $langs->trans('Country'.$country_code) : $country_label;
 
-		$this->phone=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL;
-		$this->fax=empty($conf->global->MAIN_INFO_SOCIETE_FAX)?'':$conf->global->MAIN_INFO_SOCIETE_FAX;
-		$this->url=empty($conf->global->MAIN_INFO_SOCIETE_WEB)?'':$conf->global->MAIN_INFO_SOCIETE_WEB;
+		$this->phone = empty($conf->global->MAIN_INFO_SOCIETE_TEL) ? '' : $conf->global->MAIN_INFO_SOCIETE_TEL;
+		$this->fax = empty($conf->global->MAIN_INFO_SOCIETE_FAX) ? '' : $conf->global->MAIN_INFO_SOCIETE_FAX;
+		$this->url = empty($conf->global->MAIN_INFO_SOCIETE_WEB) ? '' : $conf->global->MAIN_INFO_SOCIETE_WEB;
 		// Id prof generiques
-		$this->idprof1=empty($conf->global->MAIN_INFO_SIREN)?'':$conf->global->MAIN_INFO_SIREN;
-		$this->idprof2=empty($conf->global->MAIN_INFO_SIRET)?'':$conf->global->MAIN_INFO_SIRET;
-		$this->idprof3=empty($conf->global->MAIN_INFO_APE)?'':$conf->global->MAIN_INFO_APE;
-		$this->idprof4=empty($conf->global->MAIN_INFO_RCS)?'':$conf->global->MAIN_INFO_RCS;
-		$this->idprof5=empty($conf->global->MAIN_INFO_PROFID5)?'':$conf->global->MAIN_INFO_PROFID5;
-		$this->idprof6=empty($conf->global->MAIN_INFO_PROFID6)?'':$conf->global->MAIN_INFO_PROFID6;
-		$this->tva_intra=empty($conf->global->MAIN_INFO_TVAINTRA)?'':$conf->global->MAIN_INFO_TVAINTRA;	// VAT number, not necessarly INTRA.
-		$this->managers=empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS)?'':$conf->global->MAIN_INFO_SOCIETE_MANAGERS;
-		$this->capital=empty($conf->global->MAIN_INFO_CAPITAL)?'':$conf->global->MAIN_INFO_CAPITAL;
-		$this->forme_juridique_code=empty($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE)?'':$conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE;
-		$this->email=empty($conf->global->MAIN_INFO_SOCIETE_MAIL)?'':$conf->global->MAIN_INFO_SOCIETE_MAIL;
-		$this->logo=empty($conf->global->MAIN_INFO_SOCIETE_LOGO)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO;
-		$this->logo_small=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL;
-		$this->logo_mini=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
+		$this->idprof1 = empty($conf->global->MAIN_INFO_SIREN) ? '' : $conf->global->MAIN_INFO_SIREN;
+		$this->idprof2 = empty($conf->global->MAIN_INFO_SIRET) ? '' : $conf->global->MAIN_INFO_SIRET;
+		$this->idprof3 = empty($conf->global->MAIN_INFO_APE) ? '' : $conf->global->MAIN_INFO_APE;
+		$this->idprof4 = empty($conf->global->MAIN_INFO_RCS) ? '' : $conf->global->MAIN_INFO_RCS;
+		$this->idprof5 = empty($conf->global->MAIN_INFO_PROFID5) ? '' : $conf->global->MAIN_INFO_PROFID5;
+		$this->idprof6 = empty($conf->global->MAIN_INFO_PROFID6) ? '' : $conf->global->MAIN_INFO_PROFID6;
+		$this->tva_intra = empty($conf->global->MAIN_INFO_TVAINTRA) ? '' : $conf->global->MAIN_INFO_TVAINTRA; // VAT number, not necessarly INTRA.
+		$this->managers = empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS) ? '' : $conf->global->MAIN_INFO_SOCIETE_MANAGERS;
+		$this->capital = empty($conf->global->MAIN_INFO_CAPITAL) ? '' : $conf->global->MAIN_INFO_CAPITAL;
+		$this->forme_juridique_code = empty($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE) ? '' : $conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE;
+		$this->email = empty($conf->global->MAIN_INFO_SOCIETE_MAIL) ? '' : $conf->global->MAIN_INFO_SOCIETE_MAIL;
+		$this->logo = empty($conf->global->MAIN_INFO_SOCIETE_LOGO) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO;
+		$this->logo_small = empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL;
+		$this->logo_mini = empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
 
 		// Define if company use vat or not
-		$this->tva_assuj=$conf->global->FACTURE_TVAOPTION;
+		$this->tva_assuj = $conf->global->FACTURE_TVAOPTION;
 
 		// Define if company use local taxes
-		$this->localtax1_assuj=((isset($conf->global->FACTURE_LOCAL_TAX1_OPTION) && ($conf->global->FACTURE_LOCAL_TAX1_OPTION=='1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on'))?1:0);
-		$this->localtax2_assuj=((isset($conf->global->FACTURE_LOCAL_TAX2_OPTION) && ($conf->global->FACTURE_LOCAL_TAX2_OPTION=='1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on'))?1:0);
+		$this->localtax1_assuj = ((isset($conf->global->FACTURE_LOCAL_TAX1_OPTION) && ($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == 'localtax1on')) ? 1 : 0);
+		$this->localtax2_assuj = ((isset($conf->global->FACTURE_LOCAL_TAX2_OPTION) && ($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == 'localtax2on')) ? 1 : 0);
 	}
 
 	/**
@@ -3458,48 +3458,48 @@ 
 	 */
 	function initAsSpecimen()
 	{
-		$now=dol_now();
+		$now = dol_now();
 
 		// Initialize parameters
-		$this->id=0;
-		$this->name = 'THIRDPARTY SPECIMEN '.dol_print_date($now,'dayhourlog');
-		$this->nom = $this->name;   // For backward compatibility
+		$this->id = 0;
+		$this->name = 'THIRDPARTY SPECIMEN '.dol_print_date($now, 'dayhourlog');
+		$this->nom = $this->name; // For backward compatibility
 		$this->ref_ext = 'Ref ext';
-		$this->specimen=1;
-		$this->address='21 jump street';
-		$this->zip='99999';
-		$this->town='MyTown';
-		$this->state_id=1;
-		$this->state_code='AA';
-		$this->state='MyState';
-		$this->country_id=1;
-		$this->country_code='FR';
-		$this->email='specimen@specimen.com';
-		$this->skype='tom.hanson';
-		$this->twitter='tomhanson';
-		$this->facebook='tomhanson';
-		$this->url='http://www.specimen.com';
-
-		$this->phone='0909090901';
-		$this->fax='0909090909';
-
-		$this->code_client='CC-'.dol_print_date($now,'dayhourlog');
-		$this->code_fournisseur='SC-'.dol_print_date($now,'dayhourlog');
-		$this->capital=10000;
-		$this->client=1;
-		$this->prospect=1;
-		$this->fournisseur=1;
-		$this->tva_assuj=1;
-		$this->tva_intra='EU1234567';
-		$this->note_public='This is a comment (public)';
-		$this->note_private='This is a comment (private)';
-
-		$this->idprof1='idprof1';
-		$this->idprof2='idprof2';
-		$this->idprof3='idprof3';
-		$this->idprof4='idprof4';
-		$this->idprof5='idprof5';
-		$this->idprof6='idprof6';
+		$this->specimen = 1;
+		$this->address = '21 jump street';
+		$this->zip = '99999';
+		$this->town = 'MyTown';
+		$this->state_id = 1;
+		$this->state_code = 'AA';
+		$this->state = 'MyState';
+		$this->country_id = 1;
+		$this->country_code = 'FR';
+		$this->email = 'specimen@specimen.com';
+		$this->skype = 'tom.hanson';
+		$this->twitter = 'tomhanson';
+		$this->facebook = 'tomhanson';
+		$this->url = 'http://www.specimen.com';
+
+		$this->phone = '0909090901';
+		$this->fax = '0909090909';
+
+		$this->code_client = 'CC-'.dol_print_date($now, 'dayhourlog');
+		$this->code_fournisseur = 'SC-'.dol_print_date($now, 'dayhourlog');
+		$this->capital = 10000;
+		$this->client = 1;
+		$this->prospect = 1;
+		$this->fournisseur = 1;
+		$this->tva_assuj = 1;
+		$this->tva_intra = 'EU1234567';
+		$this->note_public = 'This is a comment (public)';
+		$this->note_private = 'This is a comment (private)';
+
+		$this->idprof1 = 'idprof1';
+		$this->idprof2 = 'idprof2';
+		$this->idprof3 = 'idprof3';
+		$this->idprof4 = 'idprof4';
+		$this->idprof5 = 'idprof5';
+		$this->idprof6 = 'idprof6';
 	}
 
 	/**
@@ -3508,7 +3508,7 @@ 
 	 *	@param		int		$localTaxNum	To get info for only localtax1 or localtax2
 	 *  @return		boolean					true or false
 	 */
-	function useLocalTax($localTaxNum=0)
+	function useLocalTax($localTaxNum = 0)
 	{
 		$sql  = "SELECT t.localtax1, t.localtax2";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
@@ -3519,7 +3519,7 @@ 
 		elseif ($localTaxNum == 2) $sql .= " AND t.localtax2_type <> '0'";
 
 		dol_syslog("useLocalTax", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
    			return ($this->db->num_rows($resql) > 0);
@@ -3540,7 +3540,7 @@ 
 		$sql .= " AND t.active = 1 AND t.recuperableonly = 1";
 
 		dol_syslog("useNPR", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			return ($this->db->num_rows($resql) > 0);
@@ -3561,15 +3561,15 @@ 
 		$sql .= " AND r.active = 1";
 
 		dol_syslog("useRevenueStamp", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$obj=$this->db->fetch_object($resql);
-   			return (($obj->nb > 0)?true:false);
+			$obj = $this->db->fetch_object($resql);
+   			return (($obj->nb > 0) ?true:false);
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return false;
 		}
 	}
@@ -3596,11 +3596,11 @@ 
         // phpcs:enable
 		global $langs;
 
-		$lib=$langs->trans("ProspectLevel".$fk_prospectlevel);
+		$lib = $langs->trans("ProspectLevel".$fk_prospectlevel);
 		// If lib not found in language file, we get label from cache/databse
 		if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel))
 		{
-			$lib=$langs->getLabelFromKey($this->db,$fk_prospectlevel,'c_prospectlevel','code','label');
+			$lib = $langs->getLabelFromKey($this->db, $fk_prospectlevel, 'c_prospectlevel', 'code', 'label');
 		}
 		return $lib;
 	}
@@ -3627,7 +3627,7 @@ 
 	 *  @param	string	$label		Label to use for status for added status
 	 *  @return string        		Libelle
 	 */
-	function getLibProspCommStatut($mode=0, $label='')
+	function getLibProspCommStatut($mode = 0, $label = '')
 	{
 		return $this->LibProspCommStatut($this->stcomm_id, $mode, $label);
 	}
@@ -3641,7 +3641,7 @@ 
 	 *  @param	string		$label			Label to use for status for added status
 	 *  @return string       	 			Libelle du statut
 	 */
-	function LibProspCommStatut($statut, $mode=0, $label='')
+	function LibProspCommStatut($statut, $mode = 0, $label = '')
 	{
         // phpcs:enable
 		global $langs;
@@ -3649,11 +3649,11 @@ 
 
 		if ($mode == 2)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1).' '.$langs->trans("StatusProspect-1");
+			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+			elseif ($statut == '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+			elseif ($statut == '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+			elseif ($statut == '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
 			else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
@@ -3661,11 +3661,11 @@ 
 		}
 		if ($mode == 3)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1);
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0);
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1);
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2);
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3);
+			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1);
+			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0);
+			elseif ($statut == '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1);
+			elseif ($statut == '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2);
+			elseif ($statut == '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3);
 			else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0);
@@ -3673,11 +3673,11 @@ 
 		}
 		if ($mode == 4)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1).' '.$langs->trans("StatusProspect-1");
+			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+			elseif ($statut == '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+			elseif ($statut == '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+			elseif ($statut == '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
 			else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
@@ -3707,13 +3707,13 @@ 
 	 *  @param     string      $mode    'customer' or 'supplier'
 	 *  @return    array				array('opened'=>Amount, 'total'=>Total amount)
 	 */
-	function getOutstandingProposals($mode='customer')
+	function getOutstandingProposals($mode = 'customer')
 	{
-		$table='propal';
+		$table = 'propal';
 		if ($mode == 'supplier') $table = 'supplier_proposal';
 
 		$sql  = "SELECT rowid, total_ht, total as total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
+		$sql .= " WHERE fk_soc = ".$this->id;
 		if ($mode == 'supplier') {
 			$sql .= " AND entity IN (".getEntity('supplier_proposal').")";
 		} else {
@@ -3721,21 +3721,21 @@ 
 		}
 
 		dol_syslog("getOutstandingProposals", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$outstandingOpened = 0;
 			$outstandingTotal = 0;
 			$outstandingTotalIncTax = 0;
-			while($obj=$this->db->fetch_object($resql)) {
-				$outstandingTotal+= $obj->total_ht;
-				$outstandingTotalIncTax+= $obj->total_ttc;
+			while ($obj = $this->db->fetch_object($resql)) {
+				$outstandingTotal += $obj->total_ht;
+				$outstandingTotalIncTax += $obj->total_ttc;
 				if ($obj->fk_statut != 0)    // Not a draft
 				{
-					$outstandingOpened+=$obj->total_ttc;
+					$outstandingOpened += $obj->total_ttc;
 				}
 			}
-			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
 		}
 		else
 			return array();
@@ -3747,13 +3747,13 @@ 
 	 *  @param     string      $mode    'customer' or 'supplier'
 	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
 	 */
-	function getOutstandingOrders($mode='customer')
+	function getOutstandingOrders($mode = 'customer')
 	{
-		$table='commande';
+		$table = 'commande';
 		if ($mode == 'supplier') $table = 'commande_fournisseur';
 
 		$sql  = "SELECT rowid, total_ht, total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
+		$sql .= " WHERE fk_soc = ".$this->id;
 		if ($mode == 'supplier') {
 			$sql .= " AND entity IN (".getEntity('supplier_order').")";
 		} else {
@@ -3761,21 +3761,21 @@ 
 		}
 
 		dol_syslog("getOutstandingOrders", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$outstandingOpened = 0;
 			$outstandingTotal = 0;
 			$outstandingTotalIncTax = 0;
-			while($obj=$this->db->fetch_object($resql)) {
-				$outstandingTotal+= $obj->total_ht;
-				$outstandingTotalIncTax+= $obj->total_ttc;
+			while ($obj = $this->db->fetch_object($resql)) {
+				$outstandingTotal += $obj->total_ht;
+				$outstandingTotalIncTax += $obj->total_ttc;
 				if ($obj->fk_statut != 0)    // Not a draft
 				{
-					$outstandingOpened+=$obj->total_ttc;
+					$outstandingOpened += $obj->total_ttc;
 				}
 			}
-			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
 		}
 		else
 			return array();
@@ -3787,9 +3787,9 @@ 
 	 *  @param     string      $mode    'customer' or 'supplier'
 	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
 	 */
-	function getOutstandingBills($mode='customer')
+	function getOutstandingBills($mode = 'customer')
 	{
-		$table='facture';
+		$table = 'facture';
 		if ($mode == 'supplier') $table = 'facture_fourn';
 
 		/* Accurate value of remain to pay is to sum remaintopay for each invoice
@@ -3799,9 +3799,9 @@ 
 		 $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
 		 $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 		 */
-		if ($mode == 'supplier') $sql  = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
-		else $sql  = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
+		if ($mode == 'supplier') $sql = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		else $sql = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		$sql .= " WHERE fk_soc = ".$this->id;
 		if ($mode == 'supplier') {
 			$sql .= " AND entity IN (".getEntity('facture_fourn').")";
 		} else {
@@ -3809,7 +3809,7 @@ 
 		}
 
 		dol_syslog("getOutstandingBills", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$outstandingOpened = 0;
@@ -3818,21 +3818,21 @@ 
 			if ($mode == 'supplier')
 			{
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-				$tmpobject=new FactureFournisseur($this->db);
+				$tmpobject = new FactureFournisseur($this->db);
 			}
 			else
 			{
 				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-				$tmpobject=new Facture($this->db);
+				$tmpobject = new Facture($this->db);
 			}
-			while($obj=$this->db->fetch_object($resql)) {
-				$tmpobject->id=$obj->rowid;
+			while ($obj = $this->db->fetch_object($resql)) {
+				$tmpobject->id = $obj->rowid;
 				if ($obj->fk_statut != 0                                           // Not a draft
-					&& ! ($obj->fk_statut == 3 && $obj->close_code == 'replaced')  // Not a replaced invoice
+					&& !($obj->fk_statut == 3 && $obj->close_code == 'replaced')  // Not a replaced invoice
 					)
 				{
-					$outstandingTotal+= $obj->total_ht;
-					$outstandingTotalIncTax+= $obj->total_ttc;
+					$outstandingTotal += $obj->total_ht;
+					$outstandingTotalIncTax += $obj->total_ttc;
 				}
 				if ($obj->paye == 0
 					&& $obj->fk_statut != 0    // Not a draft
@@ -3843,10 +3843,10 @@ 
 					$paiement = $tmpobject->getSommePaiement();
 					$creditnotes = $tmpobject->getSumCreditNotesUsed();
 					$deposits = $tmpobject->getSumDepositsUsed();
-					$outstandingOpened+=$obj->total_ttc - $paiement - $creditnotes - $deposits;
+					$outstandingOpened += $obj->total_ttc - $paiement - $creditnotes - $deposits;
 				}
 			}
-			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
 		}
 		else
 		{
@@ -3873,26 +3873,26 @@ 
 	     $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 	     */
 		$sql  = "SELECT rowid, total_ttc FROM ".MAIN_DB_PREFIX."facture as f";
-		$sql .= " WHERE fk_soc = ". $this->id;
+		$sql .= " WHERE fk_soc = ".$this->id;
 		$sql .= " AND paye = 0";
-		$sql .= " AND fk_statut <> 0";	// Not a draft
+		$sql .= " AND fk_statut <> 0"; // Not a draft
 		//$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
-		$sql .= " AND fk_statut <> 3";		// Not abandonned
-		$sql .= " AND fk_statut <> 2";		// Not clasified as paid
+		$sql .= " AND fk_statut <> 3"; // Not abandonned
+		$sql .= " AND fk_statut <> 2"; // Not clasified as paid
 
 		dol_syslog("get_OutstandingBill", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$outstandingAmount = 0;
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-			$tmpobject=new Facture($this->db);
-			while($obj=$this->db->fetch_object($resql)) {
-				$tmpobject->id=$obj->rowid;
+			$tmpobject = new Facture($this->db);
+			while ($obj = $this->db->fetch_object($resql)) {
+				$tmpobject->id = $obj->rowid;
 				$paiement = $tmpobject->getSommePaiement();
 				$creditnotes = $tmpobject->getSumCreditNotesUsed();
 				$deposits = $tmpobject->getSumDepositsUsed();
-				$outstandingAmount+= $obj->total_ttc - $paiement - $creditnotes - $deposits;
+				$outstandingAmount += $obj->total_ttc - $paiement - $creditnotes - $deposits;
 			}
 			return $outstandingAmount;
 		}
@@ -3923,10 +3923,10 @@ 
 		global $langs;
 		$langs->load('companies');
 
-		if ($statut==0) return $langs->trans("NorProspectNorCustomer");
-		if ($statut==1) return $langs->trans("Customer");
-		if ($statut==2) return $langs->trans("Prospect");
-		if ($statut==3) return $langs->trans("ProspectCustomer");
+		if ($statut == 0) return $langs->trans("NorProspectNorCustomer");
+		if ($statut == 1) return $langs->trans("Customer");
+		if ($statut == 2) return $langs->trans("Prospect");
+		if ($statut == 3) return $langs->trans("ProspectCustomer");
 	}
 
 
@@ -3941,26 +3941,26 @@ 
 	 *  @param  null|array  $moreparams     Array to provide more information
 	 *	@return int        					<0 if KO, >0 if OK
 	 */
-	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $moreparams=null)
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
-		global $conf,$user,$langs;
+		global $conf, $user, $langs;
 
-		if (! empty($moreparams) && ! empty($moreparams['use_companybankid']))
+		if (!empty($moreparams) && !empty($moreparams['use_companybankid']))
 		{
 			$modelpath = "core/modules/bank/doc/";
 
 			include_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 			$companybankaccount = new CompanyBankAccount($this->db);
 			$result = $companybankaccount->fetch($moreparams['use_companybankid']);
-			if (! $result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
-			$result=$companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+			if (!$result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+			$result = $companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
 		else
 		{
 			// Positionne le modele sur le nom du modele a utiliser
-			if (! dol_strlen($modele))
+			if (!dol_strlen($modele))
 			{
-				if (! empty($conf->global->COMPANY_ADDON_PDF))
+				if (!empty($conf->global->COMPANY_ADDON_PDF))
 				{
 					$modele = $conf->global->COMPANY_ADDON_PDF;
 				}
@@ -3973,7 +3973,7 @@ 
 
 			$modelpath = "core/modules/societe/doc/";
 
-			$result=$this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+			$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
 
 		return $result;
@@ -3993,7 +3993,7 @@ 
 	 */
 	public function setCategories($categories, $type)
 	{
-		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 		// Decode type
 		if ($type == 'customer') {
@@ -4003,7 +4003,7 @@ 
 			$type_id = Categorie::TYPE_SUPPLIER;
 			$type_text = 'supplier';
 		} else {
-			dol_syslog(__METHOD__ . ': Type ' . $type .  'is an unknown company category type. Done nothing.', LOG_ERR);
+			dol_syslog(__METHOD__.': Type '.$type.'is an unknown company category type. Done nothing.', LOG_ERR);
 			return -1;
 		}
 

Braces +588 added lines, -352 removed lines

@@ -509,15 +509,25 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (empty($this->status)) $this->status=0;
+		if (empty($this->status)) {
+		    $this->status=0;
+		}
 		$this->name=$this->name?trim($this->name):trim($this->nom);
-		if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name=ucwords($this->name);
+		if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) {
+		    $this->name=ucwords($this->name);
+		}
 		$this->nom=$this->name; // For backward compatibility
-		if (empty($this->client))      $this->client=0;
-		if (empty($this->fournisseur)) $this->fournisseur=0;
+		if (empty($this->client)) {
+		    $this->client=0;
+		}
+		if (empty($this->fournisseur)) {
+		    $this->fournisseur=0;
+		}
 		$this->import_key = trim($this->import_key);
 
-		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (!empty($this->multicurrency_code)) {
+		    $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
 		if (empty($this->fk_multicurrency))
 		{
 			$this->multicurrency_code = '';
@@ -531,8 +541,12 @@ 
 		$this->db->begin();
 
 		// For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts)
-		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this,0);
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1);
+		if ($this->code_client == -1 || $this->code_client === 'auto') {
+		    $this->get_codeclient($this,0);
+		}
+		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') {
+		    $this->get_codefournisseur($this,1);
+		}
 
 		// Check more parameters (including mandatory setup
 		// If error, this->errors[] is filled
@@ -579,32 +593,32 @@ 
 				{
 					// Call trigger
 					$result=$this->call_trigger('COMPANY_CREATE',$user);
-					if ($result < 0) $error++;
+					if ($result < 0) {
+					    $error++;
+					}
 					// End call triggers
+				} else {
+				    $error++;
 				}
-				else $error++;
 
 				if (! $error)
 				{
 					dol_syslog(get_class($this)."::Create success id=".$this->id);
 					$this->db->commit();
 					return $this->id;
-				}
-				else
+				} else
 				{
 					dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',',$this->errors), LOG_ERR);
 					$this->db->rollback();
 					return -4;
 				}
-			}
-			else
+			} else
 			{
 				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name);    // duplicate on a field (code or profid or ...)
 					$result=-1;
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->lasterror();
 					$result=-2;
@@ -612,8 +626,7 @@ 
 				$this->db->rollback();
 				return $result;
 			}
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::Create fails verify ".join(',',$this->errors), LOG_WARNING);
@@ -691,16 +704,13 @@ 
 				if ($rescode == -1)
 				{
 					$this->errors[] = 'ErrorBadCustomerCodeSyntax';
-				}
-				elseif ($rescode == -2)
+				} elseif ($rescode == -2)
 				{
 					$this->errors[] = 'ErrorCustomerCodeRequired';
-				}
-				elseif ($rescode == -3)
+				} elseif ($rescode == -3)
 				{
 					$this->errors[] = 'ErrorCustomerCodeAlreadyUsed';
-				}
-				elseif ($rescode == -4)
+				} elseif ($rescode == -4)
 				{
 					$this->errors[] = 'ErrorPrefixRequired';
 				}
@@ -716,16 +726,13 @@ 
 				if ($rescode == -1)
 				{
 					$this->errors[] = 'ErrorBadSupplierCodeSyntax';
-				}
-				elseif ($rescode == -2)
+				} elseif ($rescode == -2)
 				{
 					$this->errors[] = 'ErrorSupplierCodeRequired';
-				}
-				elseif ($rescode == -3)
+				} elseif ($rescode == -3)
 				{
 					$this->errors[] = 'ErrorSupplierCodeAlreadyUsed';
-				}
-				elseif ($rescode == -5)
+				} elseif ($rescode == -5)
 				{
 					$this->errors[] = 'ErrorprefixRequired';
 				}
@@ -767,8 +774,7 @@ 
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				//var_dump($conf->global->SOCIETE_EMAIL_UNIQUE);
 				//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
@@ -795,7 +801,9 @@ 
 			}
 		}
 
-		if ($error) $result = -4;
+		if ($error) {
+		    $result = -4;
+		}
 
 		return $result;
 	}
@@ -818,7 +826,9 @@ 
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		if (empty($id)) $id = $this->id;
+		if (empty($id)) {
+		    $id = $this->id;
+		}
 
 		$error=0;
 
@@ -864,9 +874,13 @@ 
 
 		$this->tva_assuj	= trim($this->tva_assuj);
 		$this->tva_intra	= dol_sanitizeFileName($this->tva_intra,'');
-		if (empty($this->status)) $this->status = 0;
+		if (empty($this->status)) {
+		    $this->status = 0;
+		}
 
-		if (!empty($this->multicurrency_code)) $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		if (!empty($this->multicurrency_code)) {
+		    $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
 		if (empty($this->fk_multicurrency))
 		{
 			$this->multicurrency_code = '';
@@ -880,8 +894,13 @@ 
 		$this->localtax1_value=trim($this->localtax1_value);
 		$this->localtax2_value=trim($this->localtax2_value);
 
-		if ($this->capital != '') $this->capital=price2num(trim($this->capital));
-		if (! is_numeric($this->capital)) $this->capital = '';     // '' = undef
+		if ($this->capital != '') {
+		    $this->capital=price2num(trim($this->capital));
+		}
+		if (! is_numeric($this->capital)) {
+		    $this->capital = '';
+		}
+		// '' = undef
 
 		$this->effectif_id=trim($this->effectif_id);
 		$this->forme_juridique_code=trim($this->forme_juridique_code);
@@ -890,8 +909,12 @@ 
 		$this->barcode=trim($this->barcode);
 
 		// For automatic creation
-		if ($this->code_client == -1 || $this->code_client === 'auto')           $this->get_codeclient($this,0);
-		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1);
+		if ($this->code_client == -1 || $this->code_client === 'auto') {
+		    $this->get_codeclient($this,0);
+		}
+		if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') {
+		    $this->get_codefournisseur($this,1);
+		}
 
 		$this->code_compta=trim($this->code_compta);
 		$this->code_compta_fournisseur=trim($this->code_compta_fournisseur);
@@ -911,7 +934,9 @@ 
 			if (empty($this->code_compta))
 			{
 				$ret=$this->get_codecompta('customer');
-				if ($ret < 0) return -1;
+				if ($ret < 0) {
+				    return -1;
+				}
 			}
 
 			$customer=true;
@@ -924,7 +949,9 @@ 
 			if (empty($this->code_compta_fournisseur))
 			{
 				$ret=$this->get_codecompta('supplier');
-				if ($ret < 0) return -1;
+				if ($ret < 0) {
+				    return -1;
+				}
 			}
 
 			$supplier=true;
@@ -955,16 +982,24 @@ 
 			{
 				if (in_array('ErrorBadCustomerCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_client == $this->code_client)
 				{
-					if (($key = array_search('ErrorBadCustomerCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]);	// Remove error message
+					if (($key = array_search('ErrorBadCustomerCodeSyntax', $this->errors)) !== false) {
+					    unset($this->errors[$key]);
+					}
+					// Remove error message
 				}
 				if (in_array('ErrorBadSupplierCodeSyntax', $this->errors) && is_object($this->oldcopy) && $this->oldcopy->code_fournisseur == $this->code_fournisseur)
 				{
-					if (($key = array_search('ErrorBadSupplierCodeSyntax', $this->errors)) !== false) unset($this->errors[$key]);	// Remove error message
+					if (($key = array_search('ErrorBadSupplierCodeSyntax', $this->errors)) !== false) {
+					    unset($this->errors[$key]);
+					}
+					// Remove error message
 				}
-				if (empty($this->errors))	// If there is no more error, we can make like if there is no error at all
+				if (empty($this->errors)) {
+				    // If there is no more error, we can make like if there is no error at all
 				{
 					$result = 0;
 				}
+				}
 			}
 		}
 
@@ -1017,20 +1052,24 @@ 
 				if($this->localtax1_value!='')
 				{
 					$sql .=",localtax1_value =".$this->localtax1_value;
+				} else {
+				    $sql .=",localtax1_value =0.000";
 				}
-				else $sql .=",localtax1_value =0.000";
+			} else {
+			    $sql .=",localtax1_value =0.000";
 			}
-			else $sql .=",localtax1_value =0.000";
 
 			if($this->localtax2_assuj==1)
 			{
 				if($this->localtax2_value!='')
 				{
 					$sql .=",localtax2_value =".$this->localtax2_value;
+				} else {
+				    $sql .=",localtax2_value =0.000";
 				}
-				else $sql .=",localtax2_value =0.000";
+			} else {
+			    $sql .=",localtax2_value =0.000";
 			}
-			else $sql .=",localtax2_value =0.000";
 
 			$sql .= ",capital = ".($this->capital == '' ? "null" : $this->capital);
 
@@ -1087,11 +1126,13 @@ 
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
-				if (is_object($this->oldcopy))	// If we have information on old values
+				if (is_object($this->oldcopy)) {
+				    // If we have information on old values
 				{
 					if ($this->oldcopy->country_id != $this->country_id)
 					{
 						unset($this->country_code);
+				}
 						unset($this->country);
 					}
 					if ($this->oldcopy->state_id != $this->state_id)
@@ -1099,8 +1140,7 @@ 
 						unset($this->state_code);
 						unset($this->state);
 					}
-				}
-				else
+				} else
 				{
 					unset($this->country_code);	// We clean this, in the doubt, because it may have been changed after an update of country_id
 					unset($this->country);
@@ -1141,8 +1181,7 @@ 
 								dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
 								$error++;
 							}
-						}
-						elseif ($result < 0)
+						} elseif ($result < 0)
 						{
 							$this->error=$lmember->error;
 							$error++;
@@ -1153,9 +1192,11 @@ 
 				$action='update';
 
 				// Actions on extra fields
-				if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+				    // For avoid conflicts if trigger used
 				{
 					$result=$this->insertExtraFields();
+				}
 					if ($result < 0)
 					{
 						$error++;
@@ -1166,7 +1207,9 @@ 
 				{
 					// Call trigger
 					$result=$this->call_trigger('COMPANY_MODIFY',$user);
-					if ($result < 0) $error++;
+					if ($result < 0) {
+					    $error++;
+					}
 					// End call triggers
 				}
 
@@ -1175,22 +1218,19 @@ 
 					dol_syslog(get_class($this)."::Update success");
 					$this->db->commit();
 					return 1;
-				}
-				else
+				} else
 				{
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
+			} else
 			{
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					// Doublon
 					$this->error = $langs->trans("ErrorDuplicateField");
 					$result = -1;
-				}
-				else
+				} else
 				{
 					$this->error = $this->db->lasterror();
 					$result = -2;
@@ -1198,8 +1238,7 @@ 
 				$this->db->rollback();
 				return $result;
 			}
-		}
-		else
+		} else
 	   {
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::Update fails verify ".join(',',$this->errors), LOG_WARNING);
@@ -1229,7 +1268,9 @@ 
 		global $langs;
 		global $conf;
 
-		if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) return -1;
+		if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) {
+		    return -1;
+		}
 
 		$sql = 'SELECT s.rowid, s.nom as name, s.name_alias, s.entity, s.ref_ext, s.ref_int, s.address, s.datec as date_creation, s.prefix_comm';
 		$sql .= ', s.status';
@@ -1266,18 +1307,42 @@ 
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON s.fk_incoterms = i.rowid';
 
 		$sql .= ' WHERE s.entity IN ('.getEntity($this->element).')';
-		if ($rowid)     $sql .= ' AND s.rowid = '.$rowid;
-		if ($ref)       $sql .= " AND s.nom = '".$this->db->escape($ref)."'";
-		if ($ref_alias) $sql .= " AND s.nom_alias = '".$this->db->escape($ref_alias)."'";
-		if ($ref_ext)   $sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
-		if ($ref_int)   $sql .= " AND s.ref_int = '".$this->db->escape($ref_int)."'";
-		if ($idprof1)   $sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
-		if ($idprof2)   $sql .= " AND s.siret = '".$this->db->escape($idprof2)."'";
-		if ($idprof3)   $sql .= " AND s.ape = '".$this->db->escape($idprof3)."'";
-		if ($idprof4)   $sql .= " AND s.idprof4 = '".$this->db->escape($idprof4)."'";
-		if ($idprof5)   $sql .= " AND s.idprof5 = '".$this->db->escape($idprof5)."'";
-		if ($idprof6)   $sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
-		if ($email)     $sql .= " AND s.email = '".$this->db->escape($email)."'";
+		if ($rowid) {
+		    $sql .= ' AND s.rowid = '.$rowid;
+		}
+		if ($ref) {
+		    $sql .= " AND s.nom = '".$this->db->escape($ref)."'";
+		}
+		if ($ref_alias) {
+		    $sql .= " AND s.nom_alias = '".$this->db->escape($ref_alias)."'";
+		}
+		if ($ref_ext) {
+		    $sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
+		}
+		if ($ref_int) {
+		    $sql .= " AND s.ref_int = '".$this->db->escape($ref_int)."'";
+		}
+		if ($idprof1) {
+		    $sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
+		}
+		if ($idprof2) {
+		    $sql .= " AND s.siret = '".$this->db->escape($idprof2)."'";
+		}
+		if ($idprof3) {
+		    $sql .= " AND s.ape = '".$this->db->escape($idprof3)."'";
+		}
+		if ($idprof4) {
+		    $sql .= " AND s.idprof4 = '".$this->db->escape($idprof4)."'";
+		}
+		if ($idprof5) {
+		    $sql .= " AND s.idprof5 = '".$this->db->escape($idprof5)."'";
+		}
+		if ($idprof6) {
+		    $sql .= " AND s.idprof6 = '".$this->db->escape($idprof6)."'";
+		}
+		if ($email) {
+		    $sql .= " AND s.email = '".$this->db->escape($email)."'";
+		}
 
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -1288,10 +1353,11 @@ 
 				$this->error='Fetch found several records. Rename one of tirdparties to avoid duplicate.';
 				dol_syslog($this->error, LOG_ERR);
 				$result = -2;
-			}
-			elseif ($num)   // $num = 1
+			} elseif ($num) {
+			    // $num = 1
 			{
 				$obj = $this->db->fetch_object($resql);
+			}
 
 				$this->id           = $obj->rowid;
 				$this->entity       = $obj->entity;
@@ -1421,22 +1487,22 @@ 
 
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
-			}
-			else
+			} else
 			{
 				$result = 0;
 			}
 
 			$this->db->free($resql);
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$result = -3;
 		}
 
 		// Use first price level if level not defined for third party
-		if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) $this->price_level=1;
+		if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->price_level)) {
+		    $this->price_level=1;
+		}
 
 		return $result;
 	}
@@ -1453,7 +1519,9 @@ 
 	{
 		global $langs, $conf, $user;
 
-		if (empty($fuser)) $fuser=$user;
+		if (empty($fuser)) {
+		    $fuser=$user;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -1473,7 +1541,9 @@ 
 			{
 				// Call trigger
 				$result=$this->call_trigger('COMPANY_DELETE',$fuser);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+				    $error++;
+				}
 				// End call triggers
 			}
 
@@ -1518,9 +1588,11 @@ 
 			}
 
 			// Removed extrafields
-			if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+			if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) {
+			    // For avoid conflicts if trigger used
 			{
 				$result=$this->deleteExtraFields();
+			}
 				if ($result < 0)
 				{
 					$error++;
@@ -1568,15 +1640,15 @@ 
 				}
 
 				return 1;
-			}
-			else
+			} else
 			{
 				dol_syslog($this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
 			}
+		} else {
+		    dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
 		}
-		else dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
 		return 0;
 	}
 
@@ -1592,7 +1664,10 @@ 
 		if ($this->id)
 		{
 			$newclient=1;
-			if ($this->client == 2 || $this->client == 3) $newclient=3;	//If prospect, we keep prospect tag
+			if ($this->client == 2 || $this->client == 3) {
+			    $newclient=3;
+			}
+			//If prospect, we keep prospect tag
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
 			$sql.= " SET client = ".$newclient;
 			$sql.= " WHERE rowid = " . $this->id;
@@ -1602,8 +1677,9 @@ 
 			{
 				$this->client = $newclient;
 				return 1;
+			} else {
+			    return -1;
 			}
-			else return -1;
 		}
 		return 0;
 	}
@@ -1786,14 +1862,14 @@ 
 			if ($result > 0)
 			{
 				return $result;
-			}
-			else
+			} else
 			{
 				$this->error=$discount->error;
 				return -3;
 			}
+		} else {
+		    return 0;
 		}
-		else return 0;
 	}
 
 	/**
@@ -1814,8 +1890,7 @@ 
 		if ($result >= 0)
 		{
 			return $result;
-		}
-		else
+		} else
 		{
 			$this->error=$discountstatic->error;
 			return -1;
@@ -1843,9 +1918,9 @@ 
 			$sql.= " WHERE ((ug.fk_user = sc.fk_user";
 			$sql.= " AND ug.entity = ".$conf->entity.")";
 			$sql.= " OR u.admin = 1)";
+		} else {
+					$sql.= " WHERE entity in (0, ".$conf->entity.")";
 		}
-		else
-			$sql.= " WHERE entity in (0, ".$conf->entity.")";
 
 		$sql.= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
 
@@ -1868,16 +1943,14 @@ 
 					$reparray[$i]['entity']=$obj->entity;
 					$reparray[$i]['login']=$obj->login;
 					$reparray[$i]['photo']=$obj->photo;
-				}
-				else
+				} else
 				{
 					$reparray[]=$obj->rowid;
 				}
 				$i++;
 			}
 			return $reparray;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1950,12 +2023,13 @@ 
 			if (! $this->db->query($sql) )
 			{
 				dol_syslog(get_class($this)."::add_commercial Erreur");
-			}
-			else {
+			} else {
 				$this->context=array('commercial_modified'=>$commid);
 
 				$result=$this->call_trigger('COMPANY_LINK_SALE_REPRESENTATIVE',$user);
-                if ($result < 0) $error++;
+                if ($result < 0) {
+                    $error++;
+                }
 			}
 		}
 	}
@@ -1975,7 +2049,9 @@ 
 		$this->context=array('commercial_modified'=>$commid);
 
 		$result=$this->call_trigger('COMPANY_UNLINK_SALE_REPRESENTATIVE',$user);
-        if ($result < 0) $error++;
+        if ($result < 0) {
+            $error++;
+        }
 
 		if ($this->id > 0 && $commid > 0)
 		{
@@ -2004,14 +2080,21 @@ 
 	{
 		global $conf, $langs, $hookmanager;
 
-		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+		if (! empty($conf->dol_no_mouse_hover)) {
+		    $notooltip=1;
+		}
+		// Force disable tooltips
 
 		$name=$this->name?$this->name:$this->nom;
 
 		if(!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)){
 
-             if(empty($option) && $this->client > 0) $option = 'customer';
-             if(empty($option) && $this->fournisseur > 0) $option = 'supplier';
+             if(empty($option) && $this->client > 0) {
+                 $option = 'customer';
+             }
+             if(empty($option) && $this->fournisseur > 0) {
+                 $option = 'supplier';
+             }
          }
 
 
@@ -2039,14 +2122,15 @@ 
 			if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
 			{
 				$name =$code.' '.$name;
-			}
-			else
+			} else
 			{
 				$name =$code;
 			}
 		}
 
-		if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
+		if (!empty($this->name_alias)) {
+		    $name .= ' ('.$this->name_alias.')';
+		}
 
 		$result=''; $label='';
 		$linkstart=''; $linkend='';
@@ -2064,38 +2148,31 @@ 
 		{
 		   $label.= '<u>' . $langs->trans("ShowCustomer") . '</u>';
 		   $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-		}
-		elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
+		} elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
 		{
 			$label.= '<u>' . $langs->trans("ShowProspect") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-		}
-		elseif ($option == 'supplier')
+		} elseif ($option == 'supplier')
 		{
 			$label.= '<u>' . $langs->trans("ShowSupplier") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
-		}
-		elseif ($option == 'agenda')
+		} elseif ($option == 'agenda')
 		{
 			$label.= '<u>' . $langs->trans("ShowAgenda") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
-		}
-		elseif ($option == 'project')
+		} elseif ($option == 'project')
 		{
 			$label.= '<u>' . $langs->trans("ShowProject") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
-		}
-		elseif ($option == 'margin')
+		} elseif ($option == 'margin')
 		{
 			$label.= '<u>' . $langs->trans("ShowMargin") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
-		}
-		elseif ($option == 'contact')
+		} elseif ($option == 'contact')
 		{
 			$label.= '<u>' . $langs->trans("ShowContacts") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
-		}
-		elseif ($option == 'ban')
+		} elseif ($option == 'ban')
 		{
 			$label.= '<u>' . $langs->trans("ShowBan") . '</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$this->id;
@@ -2111,30 +2188,50 @@ 
 		if (! empty($this->name))
 		{
 			$label.= '<br><b>' . $langs->trans('Name') . ':</b> '. $this->name;
-			if (! empty($this->name_alias)) $label.=' ('.$this->name_alias.')';
+			if (! empty($this->name_alias)) {
+			    $label.=' ('.$this->name_alias.')';
+			}
 			$label.= '<br><b>' . $langs->trans('Email') . ':</b> '. $this->email;
 		}
-		if (! empty($this->country_code))
-			$label.= '<br><b>' . $langs->trans('Country') . ':</b> '. $this->country_code;
-		if (! empty($this->tva_intra) || (! empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false))
-			$label.= '<br><b>' . $langs->trans('VATIntra') . ':</b> '. $this->tva_intra;
+		if (! empty($this->country_code)) {
+					$label.= '<br><b>' . $langs->trans('Country') . ':</b> '. $this->country_code;
+		}
+		if (! empty($this->tva_intra) || (! empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false)) {
+					$label.= '<br><b>' . $langs->trans('VATIntra') . ':</b> '. $this->tva_intra;
+		}
 		if (! empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP))
 		{
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false) $label.= '<br><b>' . $langs->trans('ProfId1'.$this->country_code) . ':</b> '. $this->idprof1;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid2') !== false) $label.= '<br><b>' . $langs->trans('ProfId2'.$this->country_code) . ':</b> '. $this->idprof2;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid3') !== false) $label.= '<br><b>' . $langs->trans('ProfId3'.$this->country_code) . ':</b> '. $this->idprof3;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid4') !== false) $label.= '<br><b>' . $langs->trans('ProfId4'.$this->country_code) . ':</b> '. $this->idprof4;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid5') !== false) $label.= '<br><b>' . $langs->trans('ProfId5'.$this->country_code) . ':</b> '. $this->idprof5;
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid6') !== false) $label.= '<br><b>' . $langs->trans('ProfId6'.$this->country_code) . ':</b> '. $this->idprof6;
-		}
-		if (! empty($this->code_client) && ($this->client == 1 || $this->client == 3))
-			$label.= '<br><b>' . $langs->trans('CustomerCode') . ':</b> '. $this->code_client;
-		if (! empty($this->code_fournisseur) && $this->fournisseur)
-			$label.= '<br><b>' . $langs->trans('SupplierCode') . ':</b> '. $this->code_fournisseur;
-		if (! empty($conf->accounting->enabled) && ($this->client == 1 || $this->client == 3))
-			$label.= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> '. ($this->code_compta ? $this->code_compta : $this->code_compta_client);
-		if (! empty($conf->accounting->enabled) && $this->fournisseur)
-			$label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false) {
+			    $label.= '<br><b>' . $langs->trans('ProfId1'.$this->country_code) . ':</b> '. $this->idprof1;
+			}
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid2') !== false) {
+			    $label.= '<br><b>' . $langs->trans('ProfId2'.$this->country_code) . ':</b> '. $this->idprof2;
+			}
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid3') !== false) {
+			    $label.= '<br><b>' . $langs->trans('ProfId3'.$this->country_code) . ':</b> '. $this->idprof3;
+			}
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid4') !== false) {
+			    $label.= '<br><b>' . $langs->trans('ProfId4'.$this->country_code) . ':</b> '. $this->idprof4;
+			}
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid5') !== false) {
+			    $label.= '<br><b>' . $langs->trans('ProfId5'.$this->country_code) . ':</b> '. $this->idprof5;
+			}
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid6') !== false) {
+			    $label.= '<br><b>' . $langs->trans('ProfId6'.$this->country_code) . ':</b> '. $this->idprof6;
+			}
+		}
+		if (! empty($this->code_client) && ($this->client == 1 || $this->client == 3)) {
+					$label.= '<br><b>' . $langs->trans('CustomerCode') . ':</b> '. $this->code_client;
+		}
+		if (! empty($this->code_fournisseur) && $this->fournisseur) {
+					$label.= '<br><b>' . $langs->trans('SupplierCode') . ':</b> '. $this->code_fournisseur;
+		}
+		if (! empty($conf->accounting->enabled) && ($this->client == 1 || $this->client == 3)) {
+					$label.= '<br><b>' . $langs->trans('CustomerAccountancyCode') . ':</b> '. ($this->code_compta ? $this->code_compta : $this->code_compta_client);
+		}
+		if (! empty($conf->accounting->enabled) && $this->fournisseur) {
+					$label.= '<br><b>' . $langs->trans('SupplierAccountancyCode') . ':</b> '. $this->code_compta_fournisseur;
+		}
 
 		$label.= '</div>';
 
@@ -2142,8 +2239,12 @@ 
 		$linkstart.=(!empty($this->canvas)?'&canvas='.$this->canvas:'');
 		// Add param to save lastsearch_values or not
 		$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-		if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-		if ($add_save_lastsearch_values) $linkstart.='&save_lastsearch_values=1';
+		if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) {
+		    $add_save_lastsearch_values=1;
+		}
+		if ($add_save_lastsearch_values) {
+		    $linkstart.='&save_lastsearch_values=1';
+		}
 		$linkstart.='"';
 
 		$linkclose='';
@@ -2175,16 +2276,23 @@ 
 		}
 
 		$result.=$linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.=($maxlen?dol_trunc($name,$maxlen):$name);
+		if ($withpicto) {
+		    $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1);
+		}
+		if ($withpicto != 2) {
+		    $result.=($maxlen?dol_trunc($name,$maxlen):$name);
+		}
 		$result.=$linkend;
 
 		global $action;
 		$hookmanager->initHooks(array('thirdpartydao'));
 		$parameters=array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook=$hookmanager->executeHooks('getNomUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+		    $result = $hookmanager->resPrint;
+		} else {
+		    $result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -2216,38 +2324,53 @@ 
 
 		if ($mode == 0)
 		{
-			if ($statut==0) return $langs->trans("ActivityCeased");
-			elseif ($statut==1) return $langs->trans("InActivity");
-		}
-		elseif ($mode == 1)
+			if ($statut==0) {
+			    return $langs->trans("ActivityCeased");
+			} elseif ($statut==1) {
+			    return $langs->trans("InActivity");
+			}
+		} elseif ($mode == 1)
 		{
-			if ($statut==0) return $langs->trans("ActivityCeased");
-			elseif ($statut==1) return $langs->trans("InActivity");
-		}
-		elseif ($mode == 2)
+			if ($statut==0) {
+			    return $langs->trans("ActivityCeased");
+			} elseif ($statut==1) {
+			    return $langs->trans("InActivity");
+			}
+		} elseif ($mode == 2)
 		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-			elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
-		}
-		elseif ($mode == 3)
+			if ($statut==0) {
+			    return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+			} elseif ($statut==1) {
+			    return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+			}
+		} elseif ($mode == 3)
 		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
-		}
-		elseif ($mode == 4)
+			if ($statut==0) {
+			    return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+			} elseif ($statut==1) {
+			    return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			}
+		} elseif ($mode == 4)
 		{
-			if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-			elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
-		}
-		elseif ($mode == 5)
+			if ($statut==0) {
+			    return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+			} elseif ($statut==1) {
+			    return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+			}
+		} elseif ($mode == 5)
 		{
-			if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			elseif ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
-		}
-		elseif ($mode == 6)
+			if ($statut==0) {
+			    return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+			} elseif ($statut==1) {
+			    return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			}
+		} elseif ($mode == 6)
 		{
-			if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			elseif ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			if ($statut==0) {
+			    return '<span class="hideonsmartphone">'.$langs->trans("ActivityCeased").'</span> '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+			} elseif ($statut==1) {
+			    return '<span class="hideonsmartphone">'.$langs->trans("InActivity").'</span> '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+			}
 		}
 	}
 
@@ -2266,7 +2389,9 @@ 
 		$contact_emails = $this->contact_property_array('email',1);
 		if ($this->email && $addthirdparty)
 		{
-			if (empty($this->name)) $this->name=$this->nom;
+			if (empty($this->name)) {
+			    $this->name=$this->nom;
+			}
 			$contact_emails['thirdparty']=$langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->email.">";
 		}
 		//var_dump($contact_emails)
@@ -2286,9 +2411,11 @@ 
 
 		$contact_phone = $this->contact_property_array('mobile');
 
-		if (! empty($this->phone))	// If a phone of thirdparty is defined, we add it ot mobile of contacts
+		if (! empty($this->phone)) {
+		    // If a phone of thirdparty is defined, we add it ot mobile of contacts
 		{
 			if (empty($this->name)) $this->name=$this->nom;
+		}
 			// TODO: Tester si tel non deja present dans tableau contact
 			$contact_phone['thirdparty']=$langs->transnoentitiesnoconv("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->phone.">";
 		}
@@ -2331,24 +2458,30 @@ 
 				while ($i < $nump)
 				{
 					$obj = $this->db->fetch_object($resql);
-					if ($mode == 'email') $property=$obj->email;
-					else if ($mode == 'mobile') $property=$obj->phone_mobile;
-					else $property=$obj->$mode;
+					if ($mode == 'email') {
+					    $property=$obj->email;
+					} else if ($mode == 'mobile') {
+					    $property=$obj->phone_mobile;
+					} else {
+					    $property=$obj->$mode;
+					}
 
 					// Show all contact. If hidedisabled is 1, showonly contacts with status = 1
 					if ($obj->statut == 1 || empty($hidedisabled))
 					{
 						if (empty($property))
 						{
-							if ($mode == 'email') $property=$langs->transnoentitiesnoconv("NoEMail");
-							else if ($mode == 'mobile') $property=$langs->transnoentitiesnoconv("NoMobilePhone");
+							if ($mode == 'email') {
+							    $property=$langs->transnoentitiesnoconv("NoEMail");
+							} else if ($mode == 'mobile') {
+							    $property=$langs->transnoentitiesnoconv("NoMobilePhone");
+							}
 						}
 
 						if (!empty($obj->poste))
 						{
 							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).($obj->poste?" - ".$obj->poste:"").(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
-						}
-						else
+						} else
 						{
 							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
 						}
@@ -2356,8 +2489,7 @@ 
 					$i++;
 				}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -2391,8 +2523,7 @@ 
 					$i++;
 				}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -2428,8 +2559,7 @@ 
 					$i++;
 				}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -2449,7 +2579,9 @@ 
         // phpcs:enable
 		$contact_property='';
 
-		if (empty($rowid)) return '';
+		if (empty($rowid)) {
+		    return '';
+		}
 
 		$sql = "SELECT rowid, email, phone_mobile, lastname, firstname";
 		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople";
@@ -2464,12 +2596,14 @@ 
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				if ($mode == 'email') $contact_property = dol_string_nospecial(dolGetFirstLastname($obj->firstname, $obj->lastname), ' ', array(","))." <".$obj->email.">";
-				else if ($mode == 'mobile') $contact_property = $obj->phone_mobile;
+				if ($mode == 'email') {
+				    $contact_property = dol_string_nospecial(dolGetFirstLastname($obj->firstname, $obj->lastname), ' ', array(","))." <".$obj->email.">";
+				} else if ($mode == 'mobile') {
+				    $contact_property = $obj->phone_mobile;
+				}
 			}
 			return $contact_property;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -2494,8 +2628,7 @@ 
 		if ($mode == 'label')
 		{
 			return $bac->getRibLabel(true);
-		}
-		elseif ($mode == 'rum')
+		} elseif ($mode == 'rum')
 		{
 			if (empty($bac->rum))
 			{
@@ -2505,8 +2638,7 @@ 
 				$bac->rum = $prelevement->buildRumNumber($bac->thirdparty->code_client, $bac->datec, $bac->id);
 			}
 			return $bac->rum;
-		}
-		elseif ($mode == 'format')
+		} elseif ($mode == 'format')
 		{
 			return $bac->frstrecur;
 		}
@@ -2565,7 +2697,9 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+				    break;
+				}
 			}
 			$mod = new $module();
 
@@ -2597,7 +2731,9 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+				    break;
+				}
 			}
 			$mod = new $module();
 
@@ -2626,18 +2762,26 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+				    break;
+				}
 			}
 
 			$mod = new $module();
 
 			dol_syslog(get_class($this)."::codeclient_modifiable code_client=".$this->code_client." module=".$module);
-			if ($mod->code_modifiable_null && ! $this->code_client) return 1;
-			if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) return 1;
-			if ($mod->code_modifiable) return 1;	// A mettre en dernier
+			if ($mod->code_modifiable_null && ! $this->code_client) {
+			    return 1;
+			}
+			if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) {
+			    return 1;
+			}
+			if ($mod->code_modifiable) {
+			    return 1;
+			}
+			// A mettre en dernier
 			return 0;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -2662,18 +2806,26 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+				    break;
+				}
 			}
 
 			$mod = new $module();
 
 			dol_syslog(get_class($this)."::codefournisseur_modifiable code_founisseur=".$this->code_fournisseur." module=".$module);
-			if ($mod->code_modifiable_null && ! $this->code_fournisseur) return 1;
-			if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) return 1;
-			if ($mod->code_modifiable) return 1;	// A mettre en dernier
+			if ($mod->code_modifiable_null && ! $this->code_fournisseur) {
+			    return 1;
+			}
+			if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) {
+			    return 1;
+			}
+			if ($mod->code_modifiable) {
+			    return 1;
+			}
+			// A mettre en dernier
 			return 0;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -2702,7 +2854,9 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+				    break;
+				}
 			}
 
 			$mod = new $module();
@@ -2710,8 +2864,7 @@ 
 		   	dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
 		   	$result = $mod->verif($this->db, $this->code_client, $this, 0);
 			return $result;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -2739,7 +2892,9 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+				    break;
+				}
 			}
 
 			$mod = new $module();
@@ -2747,8 +2902,7 @@ 
 			dol_syslog(get_class($this)."::check_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
 			$result = $mod->verif($this->db, $this->code_fournisseur, $this, 1);
 			return $result;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -2775,7 +2929,9 @@ 
 			foreach ($dirsociete as $dirroot)
 			{
 				$res=dol_include_once($dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.'.php');
-				if ($res) break;
+				if ($res) {
+				    break;
+				}
 			}
 
 			if ($res)
@@ -2786,21 +2942,25 @@ 
 				// Defini code compta dans $mod->code
 				$result = $mod->get_code($this->db, $this, $type);
 
-				if ($type == 'customer') $this->code_compta = $mod->code;
-				else if ($type == 'supplier') $this->code_compta_fournisseur = $mod->code;
+				if ($type == 'customer') {
+				    $this->code_compta = $mod->code;
+				} else if ($type == 'supplier') {
+				    $this->code_compta_fournisseur = $mod->code;
+				}
 
 				return $result;
-			}
-			else
+			} else
 			{
 				$this->error = 'ErrorAccountancyCodeNotDefined';
 				return -1;
 			}
-		}
-		else
+		} else
 		{
-			if ($type == 'customer') $this->code_compta = '';
-			else if ($type == 'supplier') $this->code_compta_fournisseur = '';
+			if ($type == 'customer') {
+			    $this->code_compta = '';
+			} else if ($type == 'supplier') {
+			    $this->code_compta_fournisseur = '';
+			}
 
 			return 0;
 		}
@@ -2827,13 +2987,13 @@ 
 			{
 				$this->parent = $id;
 				return 1;
-			}
-			else
+			} else
 			{
 				return -1;
 			}
+		} else {
+		    return -1;
 		}
-		else return -1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -2917,22 +3077,26 @@ 
 
 		 //Verify duplicate entries
 		$sql  = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
-		if($socid) $sql .= " AND rowid <> ".$socid;
+		if($socid) {
+		    $sql .= " AND rowid <> ".$socid;
+		}
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$obj = $this->db->fetch_object($resql);
 			$count = $obj->idprof;
-		}
-		else
+		} else
 		{
 			$count = 0;
 			print $this->db->error();
 		}
 		$this->db->free($resql);
 
-		if ($count > 0) return true;
-		else return false;
+		if ($count > 0) {
+		    return true;
+		} else {
+		    return false;
+		}
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -2951,7 +3115,9 @@ 
 
 		$ok=1;
 
-		if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) return 1;
+		if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+		    return 1;
+		}
 
 		// Verifie SIREN si pays FR
 		if ($idprof == 1 && $soc->country_code == 'FR')
@@ -2959,8 +3125,12 @@ 
 			$chaine=trim($this->idprof1);
 			$chaine=preg_replace('/(\s)/','',$chaine);
 
-			if (!is_numeric($chaine)) return -1;
-			if (dol_strlen($chaine) != 9) return -1;
+			if (!is_numeric($chaine)) {
+			    return -1;
+			}
+			if (dol_strlen($chaine) != 9) {
+			    return -1;
+			}
 
 			// on prend chaque chiffre un par un
 			// si son index (position dans la chaîne en commence à 0 au premier caractère) est impair
@@ -2970,12 +3140,17 @@ 
 			for ($index = 0; $index < 9; $index ++)
 			{
 				$number = (int) $siren[$index];
-				if (($index % 2) != 0) { if (($number *= 2) > 9) $number -= 9; }
+				if (($index % 2) != 0) { if (($number *= 2) > 9) {
+				    $number -= 9;
+				}
+				}
 				$sum += $number;
 			}
 
 			// le numéro est valide si la somme des chiffres est multiple de 10
-			if (($sum % 10) != 0) return -1;
+			if (($sum % 10) != 0) {
+			    return -1;
+			}
 		}
 
 		// Verifie SIRET si pays FR
@@ -2984,8 +3159,12 @@ 
 			$chaine=trim($this->idprof2);
 			$chaine=preg_replace('/(\s)/','',$chaine);
 
-			if (!is_numeric($chaine)) return -1;
-			if (dol_strlen($chaine) != 14) return -1;
+			if (!is_numeric($chaine)) {
+			    return -1;
+			}
+			if (dol_strlen($chaine) != 14) {
+			    return -1;
+			}
 
 			// on prend chaque chiffre un par un
 			// si son index (position dans la chaîne en commence à 0 au premier caractère) est pair
@@ -2995,12 +3174,17 @@ 
 			for ($index = 0; $index < 14; $index ++)
 			{
 				$number = (int) $chaine[$index];
-				if (($index % 2) == 0) { if (($number *= 2) > 9) $number -= 9; }
+				if (($index % 2) == 0) { if (($number *= 2) > 9) {
+				    $number -= 9;
+				}
+				}
 				$sum += $number;
 			}
 
 			// le numéro est valide si la somme des chiffres est multiple de 10
-			if (($sum % 10) != 0) return -1;
+			if (($sum % 10) != 0) {
+			    return -1;
+			}
 		}
 
 		//Verify CIF/NIF/NIE if pays ES
@@ -3011,53 +3195,61 @@ 
 			$string=preg_replace('/(\s)/','',$string);
 			$string = strtoupper($string);
 
-			for ($i = 0; $i < 9; $i ++)
-			$num[$i] = substr($string, $i, 1);
+			for ($i = 0; $i < 9; $i ++) {
+						$num[$i] = substr($string, $i, 1);
+			}
 
 			//Check format
-			if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string))
-			return 0;
+			if (!preg_match('/((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)/', $string)) {
+						return 0;
+			}
 
 			//Check NIF
-			if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string))
-				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
+			if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string)) {
+							if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
 				return 1;
-				else
-				return -1;
+			} else {
+								return -1;
+				}
 
 			//algorithm checking type code CIF
 			$sum = $num[2] + $num[4] + $num[6];
-			for ($i = 1; $i < 8; $i += 2)
-			$sum += intval(substr((2 * $num[$i]),0,1)) + intval(substr((2 * $num[$i]),1,1));
+			for ($i = 1; $i < 8; $i += 2) {
+						$sum += intval(substr((2 * $num[$i]),0,1)) + intval(substr((2 * $num[$i]),1,1));
+			}
 			$n = 10 - substr($sum, strlen($sum) - 1, 1);
 
 			//Chek special NIF
-			if (preg_match('/^[KLM]{1}/', $string))
-				if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
+			if (preg_match('/^[KLM]{1}/', $string)) {
+							if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
 				return 1;
-				else
-				return -1;
+			} else {
+								return -1;
+				}
 
 			//Check CIF
-			if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string))
-				if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
+			if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string)) {
+							if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
 				return 2;
-				else
-				return -2;
+			} else {
+								return -2;
+				}
 
 			//Check NIE T
-			if (preg_match('/^[T]{1}/', $string))
-				if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
+			if (preg_match('/^[T]{1}/', $string)) {
+							if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
 				return 3;
-				else
-				return -3;
+			} else {
+								return -3;
+				}
 
 			//Check NIE XYZ
-			if (preg_match('/^[XYZ]{1}/', $string))
-				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X','Y','Z'), array('0','1','2'), $string), 0, 8) % 23, 1))
+			if (preg_match('/^[XYZ]{1}/', $string)) {
+							if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X','Y','Z'), array('0','1','2'), $string), 0, 8) % 23, 1))
 				return 3;
-				else
-				return -3;
+			} else {
+								return -3;
+				}
 
 			//Can not be verified
 			return -4;
@@ -3077,8 +3269,7 @@ 
 			//Check NIF
 			if (preg_match('/(^[0-9]{9}$)/', $string)) {
 				return 1;
-			}
-			else {
+			} else {
 				return -1;
 			}
 		}
@@ -3132,8 +3323,7 @@ 
 			if ($url) {
 				return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
 			}
-		}
-		else {
+		} else {
 			return $hookmanager->resPrint;
 		}
 
@@ -3155,8 +3345,7 @@ 
 		{
 			$obj = $this->db->fetch_object($resql);
 			$count = $obj->numproj;
-		}
-		else
+		} else
 		{
 			$count = 0;
 			print $this->db->error();
@@ -3206,8 +3395,7 @@ 
 			}
 
 			$this->db->free($result);
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -3224,12 +3412,16 @@ 
 
 		// Define if third party is treated as company (or not) when nature is unknown
 		$isacompany=empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES)?0:1; // 0 by default
-		if (! empty($this->tva_intra)) $isacompany=1;
-		else if (! empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN')
+		if (! empty($this->tva_intra)) {
+		    $isacompany=1;
+		} else if (! empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN')
 		{
 			// TODO Add a field is_a_company into dictionary
-			if (preg_match('/^TE_PRIVATE/', $this->typent_code)) $isacompany=0;
-			else $isacompany=1;
+			if (preg_match('/^TE_PRIVATE/', $this->typent_code)) {
+			    $isacompany=0;
+			} else {
+			    $isacompany=1;
+			}
 		}
 
 		return $isacompany;
@@ -3268,8 +3460,7 @@ 
 				$this->SupplierCategories[$obj->rowid] = $obj->label;
 			}
 			return 0;
-		}
-		else
+		} else
 		{
 			return -1;
 		}
@@ -3290,9 +3481,10 @@ 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
 			$sql.= " VALUES (".$categorie_id.", ".$this->id.")";
 
-			if ($resql=$this->db->query($sql)) return 0;
-		}
-		else
+			if ($resql=$this->db->query($sql)) {
+			    return 0;
+			}
+		} else
 		{
 			return 0;
 		}
@@ -3318,7 +3510,9 @@ 
 		dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
 
 		$name = $socname?$socname:$member->societe;
-		if (empty($name)) $name=$member->getFullName($langs);
+		if (empty($name)) {
+		    $name=$member->getFullName($langs);
+		}
 
 		$alias = $socalias?$socalias:'';
 
@@ -3356,16 +3550,14 @@ 
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->error();
 
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			// $this->error deja positionne
 			dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',',$this->errors), LOG_ERR);
@@ -3404,12 +3596,13 @@ 
 		{
 			$tmp=explode(':',$conf->global->MAIN_INFO_SOCIETE_COUNTRY);
 			$country_id=$tmp[0];
-			if (! empty($tmp[1]))   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
+			if (! empty($tmp[1])) {
+			    // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
 			{
 				$country_code=$tmp[1];
-				$country_label=$tmp[2];
 			}
-			else                    // For backward compatibility
+				$country_label=$tmp[2];
+			} else                    // For backward compatibility
 			{
 				dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_ERR);
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -3420,7 +3613,9 @@ 
 		$this->country_id=$country_id;
 		$this->country_code=$country_code;
 		$this->country=$country_label;
-		if (is_object($langs)) $this->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
+		if (is_object($langs)) {
+		    $this->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
+		}
 
 		$this->phone=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL;
 		$this->fax=empty($conf->global->MAIN_INFO_SOCIETE_FAX)?'':$conf->global->MAIN_INFO_SOCIETE_FAX;
@@ -3514,17 +3709,22 @@ 
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
 		$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($this->country_code)."'";
 		$sql .= " AND t.active = 1";
-		if (empty($localTaxNum))   $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
-		elseif ($localTaxNum == 1) $sql .= " AND t.localtax1_type <> '0'";
-		elseif ($localTaxNum == 2) $sql .= " AND t.localtax2_type <> '0'";
+		if (empty($localTaxNum)) {
+		    $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
+		} elseif ($localTaxNum == 1) {
+		    $sql .= " AND t.localtax1_type <> '0'";
+		} elseif ($localTaxNum == 2) {
+		    $sql .= " AND t.localtax2_type <> '0'";
+		}
 
 		dol_syslog("useLocalTax", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
    			return ($this->db->num_rows($resql) > 0);
+		} else {
+		    return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -3544,8 +3744,9 @@ 
 		if ($resql)
 		{
 			return ($this->db->num_rows($resql) > 0);
+		} else {
+		    return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -3566,8 +3767,7 @@ 
 		{
 			$obj=$this->db->fetch_object($resql);
    			return (($obj->nb > 0)?true:false);
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return false;
@@ -3649,36 +3849,51 @@ 
 
 		if ($mode == 2)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
-			else
+			if ($statut == '-1' || $statut == 'ST_NO') {
+			    return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
+			} elseif ($statut ==  '0' || $statut == 'ST_NEVER') {
+			    return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+			} elseif ($statut ==  '1' || $statut == 'ST_TODO') {
+			    return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+			} elseif ($statut ==  '2' || $statut == 'ST_PEND') {
+			    return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+			} elseif ($statut ==  '3' || $statut == 'ST_DONE') {
+			    return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+			} else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
 			}
 		}
 		if ($mode == 3)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1);
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0);
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1);
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2);
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3);
-			else
+			if ($statut == '-1' || $statut == 'ST_NO') {
+			    return img_action($langs->trans("StatusProspect-1"),-1);
+			} elseif ($statut ==  '0' || $statut == 'ST_NEVER') {
+			    return img_action($langs->trans("StatusProspect0"), 0);
+			} elseif ($statut ==  '1' || $statut == 'ST_TODO') {
+			    return img_action($langs->trans("StatusProspect1"), 1);
+			} elseif ($statut ==  '2' || $statut == 'ST_PEND') {
+			    return img_action($langs->trans("StatusProspect2"), 2);
+			} elseif ($statut ==  '3' || $statut == 'ST_DONE') {
+			    return img_action($langs->trans("StatusProspect3"), 3);
+			} else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0);
 			}
 		}
 		if ($mode == 4)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut ==  '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($statut ==  '1' || $statut == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($statut ==  '2' || $statut == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($statut ==  '3' || $statut == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
-			else
+			if ($statut == '-1' || $statut == 'ST_NO') {
+			    return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
+			} elseif ($statut ==  '0' || $statut == 'ST_NEVER') {
+			    return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+			} elseif ($statut ==  '1' || $statut == 'ST_TODO') {
+			    return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+			} elseif ($statut ==  '2' || $statut == 'ST_PEND') {
+			    return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+			} elseif ($statut ==  '3' || $statut == 'ST_DONE') {
+			    return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+			} else
 			{
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
 			}
@@ -3710,7 +3925,9 @@ 
 	function getOutstandingProposals($mode='customer')
 	{
 		$table='propal';
-		if ($mode == 'supplier') $table = 'supplier_proposal';
+		if ($mode == 'supplier') {
+		    $table = 'supplier_proposal';
+		}
 
 		$sql  = "SELECT rowid, total_ht, total as total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
 		$sql .= " WHERE fk_soc = ". $this->id;
@@ -3730,15 +3947,17 @@ 
 			while($obj=$this->db->fetch_object($resql)) {
 				$outstandingTotal+= $obj->total_ht;
 				$outstandingTotalIncTax+= $obj->total_ttc;
-				if ($obj->fk_statut != 0)    // Not a draft
+				if ($obj->fk_statut != 0) {
+				    // Not a draft
 				{
 					$outstandingOpened+=$obj->total_ttc;
 				}
+				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+		} else {
+					return array();
 		}
-		else
-			return array();
 	}
 
 	/**
@@ -3750,7 +3969,9 @@ 
 	function getOutstandingOrders($mode='customer')
 	{
 		$table='commande';
-		if ($mode == 'supplier') $table = 'commande_fournisseur';
+		if ($mode == 'supplier') {
+		    $table = 'commande_fournisseur';
+		}
 
 		$sql  = "SELECT rowid, total_ht, total_ttc, fk_statut FROM ".MAIN_DB_PREFIX.$table." as f";
 		$sql .= " WHERE fk_soc = ". $this->id;
@@ -3770,15 +3991,17 @@ 
 			while($obj=$this->db->fetch_object($resql)) {
 				$outstandingTotal+= $obj->total_ht;
 				$outstandingTotalIncTax+= $obj->total_ttc;
-				if ($obj->fk_statut != 0)    // Not a draft
+				if ($obj->fk_statut != 0) {
+				    // Not a draft
 				{
 					$outstandingOpened+=$obj->total_ttc;
 				}
+				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
+		} else {
+					return array();
 		}
-		else
-			return array();
 	}
 
 	/**
@@ -3790,7 +4013,9 @@ 
 	function getOutstandingBills($mode='customer')
 	{
 		$table='facture';
-		if ($mode == 'supplier') $table = 'facture_fourn';
+		if ($mode == 'supplier') {
+		    $table = 'facture_fourn';
+		}
 
 		/* Accurate value of remain to pay is to sum remaintopay for each invoice
 		 $paiement = $invoice->getSommePaiement();
@@ -3799,8 +4024,11 @@ 
 		 $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
 		 $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 		 */
-		if ($mode == 'supplier') $sql  = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
-		else $sql  = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		if ($mode == 'supplier') {
+		    $sql  = "SELECT rowid, total_ht as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		} else {
+		    $sql  = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
+		}
 		$sql .= " WHERE fk_soc = ". $this->id;
 		if ($mode == 'supplier') {
 			$sql .= " AND entity IN (".getEntity('facture_fourn').")";
@@ -3819,8 +4047,7 @@ 
 			{
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 				$tmpobject=new FactureFournisseur($this->db);
-			}
-			else
+			} else
 			{
 				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$tmpobject=new Facture($this->db);
@@ -3837,18 +4064,19 @@ 
 				if ($obj->paye == 0
 					&& $obj->fk_statut != 0    // Not a draft
 					&& $obj->fk_statut != 3	   // Not abandonned
-					&& $obj->fk_statut != 2)   // Not classified as paid
+					&& $obj->fk_statut != 2) {
+				    // Not classified as paid
 				//$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
 				{
 					$paiement = $tmpobject->getSommePaiement();
+				}
 					$creditnotes = $tmpobject->getSumCreditNotesUsed();
 					$deposits = $tmpobject->getSumDepositsUsed();
 					$outstandingOpened+=$obj->total_ttc - $paiement - $creditnotes - $deposits;
 				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax);	// 'opened' is 'incl taxes'
-		}
-		else
+		} else
 		{
 			return array();
 		}
@@ -3895,9 +4123,9 @@ 
 				$outstandingAmount+= $obj->total_ttc - $paiement - $creditnotes - $deposits;
 			}
 			return $outstandingAmount;
+		} else {
+					return 0;
 		}
-		else
-			return 0;
 	}
 
 	/**
@@ -3923,10 +4151,18 @@ 
 		global $langs;
 		$langs->load('companies');
 
-		if ($statut==0) return $langs->trans("NorProspectNorCustomer");
-		if ($statut==1) return $langs->trans("Customer");
-		if ($statut==2) return $langs->trans("Prospect");
-		if ($statut==3) return $langs->trans("ProspectCustomer");
+		if ($statut==0) {
+		    return $langs->trans("NorProspectNorCustomer");
+		}
+		if ($statut==1) {
+		    return $langs->trans("Customer");
+		}
+		if ($statut==2) {
+		    return $langs->trans("Prospect");
+		}
+		if ($statut==3) {
+		    return $langs->trans("ProspectCustomer");
+		}
 	}
 
 
@@ -3952,10 +4188,11 @@ 
 			include_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 			$companybankaccount = new CompanyBankAccount($this->db);
 			$result = $companybankaccount->fetch($moreparams['use_companybankid']);
-			if (! $result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+			if (! $result) {
+			    dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
+			}
 			$result=$companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-		}
-		else
+		} else
 		{
 			// Positionne le modele sur le nom du modele a utiliser
 			if (! dol_strlen($modele))
@@ -3963,8 +4200,7 @@ 
 				if (! empty($conf->global->COMPANY_ADDON_PDF))
 				{
 					$modele = $conf->global->COMPANY_ADDON_PDF;
-				}
-				else
+				} else
 				{
 					print $langs->trans("Error")." ".$langs->trans("Error_COMPANY_ADDON_PDF_NotDefined");
 					return 0;