From 19085ed200d89ee974d18afae0e1ce4d07d37fc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 19 May 2019 09:08:59 +0200
Subject: [PATCH 01/30] dol_print_object_info return void

---
 htdocs/bom/bom_agenda.php | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index a1db711dd3e..a4bf134e3ce 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -23,25 +23,12 @@
  */
 
 // Load Dolibarr environment
-$res=0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1;
-while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; }
-if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include substr($tmp, 0, ($i+1))."/main.inc.php";
-if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include dirname(substr($tmp, 0, ($i+1)))."/main.inc.php";
-// Try main.inc.php using relative path
-if (! $res && file_exists("../main.inc.php")) $res=@include "../main.inc.php";
-if (! $res && file_exists("../../main.inc.php")) $res=@include "../../main.inc.php";
-if (! $res && file_exists("../../../main.inc.php")) $res=@include "../../../main.inc.php";
-if (! $res) die("Include of main fails");
-
+require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-dol_include_once('/bom/class/bom.class.php');
-dol_include_once('/bom/lib/bom.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
+require_once DOL_DOCUMENT_ROOT.'/bom/lib/bom.lib.php';
 
 
 // Load translation files required by the page
@@ -196,7 +183,7 @@ if ($object->id > 0)
     print '<div class="underbanner clearboth"></div>';
 
     $object->info($object->id);
-	print dol_print_object_info($object, 1);
+	dol_print_object_info($object, 1);
 
 	print '</div>';
 

From 06421c200dbba9e4d79bb2c91f889734bd9c6b90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 19 May 2019 09:13:46 +0200
Subject: [PATCH 02/30] Update agenda.php

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

diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index 5b2c3e912dd..105251ec114 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -137,7 +137,7 @@ if ($object->id > 0)
 	print '<div class="underbanner clearboth"></div>';
 
 	$object->info($id);
-	print dol_print_object_info($object, 1);
+	dol_print_object_info($object, 1);
 
 	print '</div>';
 

From 7d66cc1ab1bd0a4905515d36edfec5b4126e119c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 19 May 2019 09:14:29 +0200
Subject: [PATCH 03/30] Update agenda.php

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

diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 2bf407ec88d..a9283f6e236 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -127,7 +127,7 @@ if ($socid > 0)
     print '<div class="underbanner clearboth"></div>';
 
     $object->info($socid);
-	print dol_print_object_info($object, 1);
+	dol_print_object_info($object, 1);
 
 	print '</div>';
 

From c8027ccf1a2aac850dfa62064e36d0c633dc7799 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 19 May 2019 09:15:10 +0200
Subject: [PATCH 04/30] Update agenda.php

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

diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 6e093a934dd..2b135c3cc37 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -227,7 +227,7 @@ else
         print '<div class="underbanner clearboth"></div>';
 
         $object->info($id);
-        print dol_print_object_info($object, 1);
+        dol_print_object_info($object, 1);
 
         print '</div>';
 

From 53a09a0dd46f06b77357bb3174ec701956e53090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 19 May 2019 09:15:51 +0200
Subject: [PATCH 05/30] Update agenda.php

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

diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php
index 28b3c06ffa1..2ec5345009e 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -141,7 +141,7 @@ if ($id > 0 || $ref)
     print '<div class="underbanner clearboth"></div>';
 
     $object->info($object->id);
-	print dol_print_object_info($object, 1);
+	dol_print_object_info($object, 1);
 
 	print '</div>';
 

From ff37fddcf16a14407403d3364b6b2a3a16377e62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 19 May 2019 09:16:45 +0200
Subject: [PATCH 06/30] Update myobject_agenda.php

---
 htdocs/modulebuilder/template/myobject_agenda.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 924db3b8632..b536b264952 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -196,7 +196,7 @@ if ($object->id > 0)
     print '<div class="underbanner clearboth"></div>';
 
     $object->info($object->id);
-	print dol_print_object_info($object, 1);
+	dol_print_object_info($object, 1);
 
 	print '</div>';
 

From 7b317c4cbfc8c0ce38b2fec02fc6bcffbc6cf189 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 19 May 2019 09:28:34 +0200
Subject: [PATCH 07/30] printObjectLines return void

---
 htdocs/modulebuilder/template/myobject_card.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index e5223c86608..ed6a421ac86 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -389,7 +389,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
     	if (! empty($object->lines))
     	{
-    	    $ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
+            // printObjectLines return void
+    	    $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
     	}
 
     	// Form to add new line

From a09584ae4ba93a995db3780870cf83b071d47f58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 19 May 2019 09:46:47 +0200
Subject: [PATCH 08/30] The method _load_ldap_dn() cannot be called...

The method _load_ldap_dn() cannot be called from this context as it is declared private in class AdherentType.
---
 htdocs/adherents/class/adherent_type.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index c310bb18627..d51bbfef28a 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -462,7 +462,7 @@ class AdherentType extends CommonObject
         return '';
     }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
 	/**
 	 *	Retourne chaine DN complete dans l'annuaire LDAP pour l'objet
 	 *
@@ -472,7 +472,7 @@ class AdherentType extends CommonObject
 	 *									2=Return key only (uid=qqq)
 	 *	@return		string				DN
 	 */
-	private function _load_ldap_dn($info, $mode = 0)
+	public function _load_ldap_dn($info, $mode = 0)
 	{
         // phpcs:enable
 		global $conf;

From 5a05cc184beacdcfba01480b433613b99e5f33d9 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 19 May 2019 10:48:43 +0200
Subject: [PATCH 09/30] Fix Accountancy Export OpenConcerto

---
 htdocs/accountancy/class/accountancyexport.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index b9339a8150b..8ca2de4a132 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -616,7 +616,7 @@ class AccountancyExport
             $date = dol_print_date($line->doc_date, '%d/%m/%Y');
 
             print $date . $separator;
-            print $line->code_journal;
+            print $line->code_journal . $separator;
             if (empty($line->subledger_account)) {
                 print length_accountg($line->numero_compte) . $separator;
             } else {

From a368a6a43ed8b59570289ac855976f5012783e65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 19 May 2019 09:51:54 +0200
Subject: [PATCH 10/30] Update adherent_type.class.php

---
 htdocs/adherents/class/adherent_type.class.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index d51bbfef28a..5e7847efa82 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -65,7 +65,7 @@ class AdherentType extends CommonObject
      * @var string Adherent type label
      */
     public $label;
-    
+
     /**
      * @var string Adherent type nature
      */
@@ -410,7 +410,7 @@ class AdherentType extends CommonObject
 			return -1;
 		}
 	}
-  
+
   /**
 	 *	Return translated label by the nature of a adherent (physical or moral)
 	 *
@@ -422,7 +422,7 @@ class AdherentType extends CommonObject
 		global $langs;
 		if ($morphy == 'phy') { return $langs->trans("Physical"); }
 		elseif ($morphy == 'mor') { return $langs->trans("Moral"); }
-    else return $langs->trans("Physical & Morale");
+        else return $langs->trans("Physical & Morale");
 		//return $morphy;
 	}
 
@@ -462,7 +462,8 @@ class AdherentType extends CommonObject
         return '';
     }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *	Retourne chaine DN complete dans l'annuaire LDAP pour l'objet
 	 *
@@ -485,12 +486,13 @@ class AdherentType extends CommonObject
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *	Initialize the info array (array of LDAP values) that will be used to call LDAP functions
 	 *
 	 *	@return		array		Tableau info des attributs
 	 */
-	private function _load_ldap_info()
+	public function _load_ldap_info()
 	{
         // phpcs:enable
 		global $conf,$langs;

From 5def839813af872aa7fff871cf945174fe59540a Mon Sep 17 00:00:00 2001
From: ATM-Nicolas <nicolas.prevost@atm-consulting.fr>
Date: Mon, 20 May 2019 11:56:26 +0200
Subject: [PATCH 11/30] FIX : Padding on create project icon

---
 htdocs/comm/propal/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 4950efb19ab..c8cba5c3dda 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1679,7 +1679,7 @@ if ($action == 'create')
 		print '<tr>';
 		print '<td>' . $langs->trans("Project") . '</td><td>';
 		$numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 1);
-		print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="valignmiddle text-plus-circle">' . $langs->trans("AddProject") . '</span><span class="fa fa-plus-circle valignmiddle"></span></a>';
+		print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="valignmiddle text-plus-circle">' . $langs->trans("AddProject") . '</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
 		print '</td>';
 		print '</tr>';
 	}

From 6365c7cd00b0a0c05d5fbc7685228395ba2a504a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 May 2019 12:17:07 +0200
Subject: [PATCH 12/30] Bad cut and paste

---
 htdocs/compta/facture/fiche-rec.php | 135 ----------------------------
 1 file changed, 135 deletions(-)

diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 867b4e8df30..5eedb9b5740 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -281,141 +281,6 @@ if (empty($reshook))
 	// Set mode
 	elseif ($action == 'setmode' && $user->rights->facture->creer)
 	{
-		// Add custom code and origin country into description
-		if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (! empty($prod->customcode) || ! empty($prod->country_code)))
-		{
-			$tmptxt = '(';
-			// Define output language
-			if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
-				$outputlangs = $langs;
-				$newlang = '';
-				if (empty($newlang) && GETPOST('lang_id', 'alpha')) $newlang = GETPOST('lang_id', 'alpha');
-				if (empty($newlang)) $newlang = $object->thirdparty->default_lang;
-				if (! empty($newlang)) {
-					$outputlangs = new Translate("", $conf);
-					$outputlangs->setDefaultLang($newlang);
-					$outputlangs->load('products');
-				}
-				if (! empty($prod->customcode)) $tmptxt .= $outputlangs->transnoentitiesnoconv("CustomCode") . ': ' . $prod->customcode;
-				if (! empty($prod->customcode) && ! empty($prod->country_code)) $tmptxt .= ' - ';
-				if (! empty($prod->country_code)) $tmptxt .= $outputlangs->transnoentitiesnoconv("CountryOrigin") . ': ' . getCountry($prod->country_code, 0, $db, $outputlangs, 0);
-			} else {
-				if (! empty($prod->customcode)) $tmptxt .= $langs->transnoentitiesnoconv("CustomCode") . ': ' . $prod->customcode;
-				if (! empty($prod->customcode) && ! empty($prod->country_code))	$tmptxt .= ' - ';
-				if (! empty($prod->country_code)) $tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin") . ': ' . getCountry($prod->country_code, 0, $db, $langs, 0);
-			}
-			$tmptxt .= ')';
-			$desc = dol_concatdesc($desc, $tmptxt);
-		}
-
-		$type = $prod->type;
-		$fk_unit = $prod->fk_unit;
-	}
-	else
-	{
-		$pu_ht = price2num($price_ht, 'MU');
-		$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
-		$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
-		$tva_tx = str_replace('*', '', $tva_tx);
-		if (empty($tva_tx)) $tva_npr=0;
-		$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
-		$desc = $product_desc;
-		$type = GETPOST('type');
-		$fk_unit= GETPOST('units', 'alpha');
-	}
-
-	$date_start_fill = GETPOST('date_start_fill', 'int');
-	$date_end_fill = GETPOST('date_end_fill', 'int');
-
-	// Margin
-	$fournprice = price2num(GETPOST('fournprice' . $predef) ? GETPOST('fournprice' . $predef) : '');
-	$buyingprice = price2num(GETPOST('buying_price' . $predef) != '' ? GETPOST('buying_price' . $predef) : '');    // If buying_price is '0', we must keep this value
-
-	// Local Taxes
-	$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty, $mysoc, $tva_npr);
-	$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $mysoc, $tva_npr);
-
-	$info_bits = 0;
-	if ($tva_npr)
-		$info_bits |= 0x01;
-
-		if ($usercanproductignorepricemin && (! empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min)))) {
-			$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
-			setEventMessages($mesg, null, 'errors');
-		}
-		else
-		{
-			// Insert line
-			$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $info_bits, '', $pu_ttc, $type, - 1, $special_code, $label, $fk_unit, 0, $date_start_fill, $date_end_fill, $fournprice, $buyingprice);
-
-			if ($result > 0)
-			{
-				// Define output language and generate document
-				/*if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-				 {
-				 // Define output language
-				 $outputlangs = $langs;
-				 $newlang = '';
-				 if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
-				 if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-				 if (! empty($newlang)) {
-				 $outputlangs = new Translate("", $conf);
-				 $outputlangs->setDefaultLang($newlang);
-				 }
-				 $model=$object->modelpdf;
-				 $ret = $object->fetch($id); // Reload to get new records
-
-				 $result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-				 if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
-				 }*/
-				$object->fetch($object->id);    // Reload lines
-
-				unset($_POST['prod_entry_mode']);
-
-				unset($_POST['qty']);
-				unset($_POST['type']);
-				unset($_POST['remise_percent']);
-				unset($_POST['price_ht']);
-				unset($_POST['multicurrency_price_ht']);
-				unset($_POST['price_ttc']);
-				unset($_POST['tva_tx']);
-				unset($_POST['product_ref']);
-				unset($_POST['product_label']);
-				unset($_POST['product_desc']);
-				unset($_POST['fournprice']);
-				unset($_POST['buying_price']);
-				unset($_POST['np_marginRate']);
-				unset($_POST['np_markRate']);
-				unset($_POST['dp_desc']);
-				unset($_POST['idprod']);
-				unset($_POST['units']);
-
-				unset($_POST['date_starthour']);
-				unset($_POST['date_startmin']);
-				unset($_POST['date_startsec']);
-				unset($_POST['date_startday']);
-				unset($_POST['date_startmonth']);
-				unset($_POST['date_startyear']);
-				unset($_POST['date_endhour']);
-				unset($_POST['date_endmin']);
-				unset($_POST['date_endsec']);
-				unset($_POST['date_endday']);
-				unset($_POST['date_endmonth']);
-				unset($_POST['date_endyear']);
-
-				unset($_POST['date_start_fill']);
-				unset($_POST['date_end_fill']);
-
-				unset($_POST['situations']);
-				unset($_POST['progress']);
-			}
-			else
-			{
-				setEventMessages($object->error, $object->errors, 'errors');
-			}
-
-			$action = '';
-		}
 		$result=$object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
 	}
 	// Set project

From 54441a1abda3ef245ec5ea202e81cb251c81033c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 May 2019 12:36:18 +0200
Subject: [PATCH 13/30] Fix css

---
 htdocs/main.inc.php                |  6 +++---
 htdocs/theme/eldy/dropdown.inc.php |  6 +++---
 htdocs/theme/md/dropdown.inc.php   | 18 ++++++++++++++++++
 htdocs/theme/md/style.css.php      |  6 ++++--
 4 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 htdocs/theme/md/dropdown.inc.php

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index b0036b01ed4..a7d0669db22 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1811,11 +1811,11 @@ function top_menu_user(User $user, Translate $langs)
 
     $btnUser = '
     <div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu">
-        <a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="dropdown-toggle" data-toggle="dropdown">
+        <a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="dropdown-toggle login-dropdown-a" data-toggle="dropdown">
             '.$userImage.'
             <span class="hidden-xs maxwidth200 atoploginusername">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 10).'</span>
-            <span class="fa fa-chevron-down" id="dropdown-icon-down"></span>
-            <span class="fa fa-chevron-up hidden" id="dropdown-icon-up"></span>
+            <span class="fa fa-chevron-down login-dropdown-btn" id="dropdown-icon-down"></span>
+            <span class="fa fa-chevron-up login-dropdown-btn hidden" id="dropdown-icon-up"></span>
         </a>
         <div class="dropdown-menu">
             <!-- User image -->
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index 50a042d1390..b20db935154 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -1,9 +1,9 @@
 <?php
 if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
-/* <style type="text/css" > */
+
 /*
- Dropdown
-*/
+ * Dropdown
+ */
 
 .open>.dropdown-menu{ /*, #topmenu-login-dropdown:hover .dropdown-menu*/
     display: block;
diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
new file mode 100644
index 00000000000..8d38df188f3
--- /dev/null
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -0,0 +1,18 @@
+<?php
+if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
+
+/*
+ * Dropdown
+ */
+
+/* Not supported yet by this theme */
+
+#dropdown-icon-up, #dropdown-icon-down, .login-dropdown-btn {
+	display: none !important;
+}
+
+/* Disable the hover underline on the login */
+a.login-dropdown-a:hover, a.login-dropdown-a span:hover {
+	text-decoration: none !important;
+	cursor: default;
+}
\ No newline at end of file
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 6e569fa93d3..1ef5417b4c3 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -5808,8 +5808,10 @@ border-top-right-radius: 6px;
 
 <?php if (! defined('DISABLE_FONT_AWSOME') && empty($conf->global->MAIN_DISABLE_FONT_AWESOME_5)) { ?>
         <?php include dol_buildpath($path.'/theme/'.$theme.'/main_menu_fa_icons.inc.php', 0); ?>
-<?php } ?>
+<?php }
+
+include dol_buildpath($path.'/theme/'.$theme.'/dropdown.inc.php', 0);
+
 
 
-<?php
 if (is_object($db)) $db->close();

From eafc35b00f4785b8536ab788f9bde49a0d867f71 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 May 2019 13:27:45 +0200
Subject: [PATCH 14/30] Look and feel v10

---
 htdocs/comm/card.php                   |   4 +-
 htdocs/contrat/note.php                |   2 +-
 htdocs/core/lib/company.lib.php        |   8 +-
 htdocs/core/modules/modIFTTT.class.php | 251 -------------------------
 htdocs/core/tpl/notes.tpl.php          |   4 +-
 htdocs/expedition/shipment.php         |   4 +-
 htdocs/langs/en_US/main.lang           |   1 +
 htdocs/societe/consumption.php         |   2 +-
 htdocs/societe/project.php             |   2 +-
 htdocs/theme/eldy/global.inc.php       |  15 +-
 htdocs/theme/md/style.css.php          |  14 +-
 htdocs/ticket/class/ticket.class.php   |   4 +-
 htdocs/ticket/img/statut7.png          | Bin 0 -> 341 bytes
 htdocs/ticket/img/statut8.png          | Bin 341 -> 272 bytes
 htdocs/ticket/img/statut9.png          | Bin 272 -> 0 bytes
 htdocs/ticket/list.php                 |   4 +-
 htdocs/variants/combinations.php       |   3 +-
 17 files changed, 45 insertions(+), 273 deletions(-)
 delete mode 100644 htdocs/core/modules/modIFTTT.class.php
 create mode 100644 htdocs/ticket/img/statut7.png
 delete mode 100644 htdocs/ticket/img/statut9.png

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 384727d60b0..721aba20de8 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -245,7 +245,7 @@ if ($object->id > 0)
 	print '<div class="fichecenter"><div class="fichehalfleft">';
 
     print '<div class="underbanner clearboth"></div>';
-	print '<table class="border" width="100%">';
+	print '<table class="border centpercent tableforfield">';
 
 	// Prospect/Customer
 	print '<tr><td class="titlefield">'.$langs->trans('ProspectCustomer').'</td><td>';
@@ -534,7 +534,7 @@ if ($object->id > 0)
     	print '<br>';
 
     	print '<div class="underbanner clearboth"></div>';
-    	print '<table class="border" width="100%">';
+    	print '<table class="border centpercent tableforfield">';
 
 	    // Level of prospect
 	    print '<tr><td class="titlefield nowrap">';
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index 886e836f10e..3451e14ae2a 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -145,7 +145,7 @@ if ($id > 0 || ! empty($ref))
     print '<div class="fichecenter">';
     print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border" width="100%">';
+    print '<table class="border centpercent tableforfield">';
 
 
     // Ligne info remises tiers
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index e080cc89796..99344b12dc1 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -187,11 +187,13 @@ function societe_prepare_head(Societe $object)
 		$foundonexternalonlinesystem=0;
     	$langs->load("banks");
 
-        $title = $langs->trans("BankAccounts");
+        //$title = $langs->trans("BankAccounts");
+    	$title = $langs->trans("PaymentInformation");
+
 		if (! empty($conf->stripe->enabled))
 		{
-			$langs->load("stripe");
-			$title = $langs->trans("BankAccountsAndGateways");
+			//$langs->load("stripe");
+			//$title = $langs->trans("BankAccountsAndGateways");
 
 			$servicestatus = 0;
 			if (! empty($conf->global->STRIPE_LIVE) && ! GETPOST('forcesandbox', 'alpha')) $servicestatus = 1;
diff --git a/htdocs/core/modules/modIFTTT.class.php b/htdocs/core/modules/modIFTTT.class.php
deleted file mode 100644
index c3bab06ed93..00000000000
--- a/htdocs/core/modules/modIFTTT.class.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-/* Copyright (C) 2019 Laurent Destailleur		<eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * 	\defgroup   ifttt     Module IFTTT
- *  \brief      Descriptor file for IFTTT module
- *  \file       htdocs/core/modules/modIFTTT.class.php
- *  \ingroup    ifttt
- *  \brief      Description and activation file for module IFTTT
- */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
-
-
-/**
- *  Description and activation class for module IFTTT
- */
-class modIFTTT extends DolibarrModules
-{
-	/**
-	 *  Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *  @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        global $langs,$conf;
-
-        $this->db = $db;
-
-		// Id for module (must be unique).
-		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 2620;
-		// Key text used to identify module (for permissions, menus, etc...)
-		$this->rights_class = 'ifttt';
-
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-		// It is used to group modules in module setup page
-		$this->family = "interface";
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i', '', get_class($this));
-		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "IFTTT interface";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
-		$this->version = 'development';
-		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Can be enabled / disabled only in the main company with superadmin account
-		$this->core_enabled = 1;
-		// Name of image file used for this module.
-		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='technic';
-
-		$this->module_parts = array();
-
-		// Data directories to create when module is enabled.
-		// Example: this->dirs = array("/api/temp");
-		$this->dirs = array();
-
-		// Config pages. Put here list of php page, stored into api/admin directory, to use to setup module.
-		$this->config_page_url = array("index.php@ifttt");
-
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of modules id that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of modules id to disable if this one is disabled
-		$this->conflictwith = array();	// List of modules id this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-		$this->langfiles = array("other");
-
-		// Constants
-		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
-		// );
-		$this->const = array();
-
-		// Array to add new pages in new tabs
-		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@api:$user->rights->ifttt->read:/api/mynewtab1.php?id=__ID__',  					// To add a new tab identified by code tabname1
-        //                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@api:$user->rights->othermodule->read:/api/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
-        //                              'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
-		// where objecttype can be
-		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
-		// 'contact'          to add a tab in contact view
-		// 'contract'         to add a tab in contract view
-		// 'group'            to add a tab in group view
-		// 'intervention'     to add a tab in intervention view
-		// 'invoice'          to add a tab in customer invoice view
-		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
-		// 'opensurveypoll'	  to add a tab in opensurvey poll view
-		// 'order'            to add a tab in customer order view
-		// 'order_supplier'   to add a tab in supplier order view
-		// 'payment'		  to add a tab in payment view
-		// 'payment_supplier' to add a tab in supplier payment view
-		// 'product'          to add a tab in product view
-		// 'propal'           to add a tab in propal view
-		// 'project'          to add a tab in project view
-		// 'stock'            to add a tab in stock view
-		// 'thirdparty'       to add a tab in third party view
-		// 'user'             to add a tab in user view
-        $this->tabs = array();
-
-        // Dictionaries
-        if (! isset($conf->ifttt->enabled))
-        {
-        	$conf->ifttt=new stdClass();
-        	$conf->ifttt->enabled=0;
-        }
-        $this->dictionaries=array();
-
-        // Boxes
-		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
-        $this->boxes = array();			// List of boxes
-		// Example:
-		//$this->boxes=array(array(0=>array('file'=>'myboxa.php','note'=>'','enabledbydefaulton'=>'Home'),1=>array('file'=>'myboxb.php','note'=>''),2=>array('file'=>'myboxc.php','note'=>'')););
-
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
-
-		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
-		// Example:
-		// $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		// $this->rights[$r][1] = 'Permision label';	// Permission label
-		// $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $r++;
-
-
-		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r=0;
-
-		// Add here entries to declare new menus
-		//
-		// Example to declare a new Top Menu entry and its Left menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>0,			                // Put 0 if this is a top menu
-		//							'type'=>'top',			                // This is a Top menu entry
-		//							'titre'=>'Api top menu',
-		//							'mainmenu'=>'api',
-		//							'leftmenu'=>'api',
-		//							'url'=>'/api/pagetop.php',
-		//							'langs'=>'mylangfile@api',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'enabled'=>'$conf->ifttt->enabled',	// Define condition to show or hide menu entry. Use '$conf->ifttt->enabled' if entry must be visible if module is enabled.
-		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->ifttt->level1->level2' if you want your menu with a permission rules
-		//							'target'=>'',
-		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-		//
-		// Example to declare a Left Menu entry into an existing Top menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=xxx',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-		//							'type'=>'left',			                // This is a Left menu entry
-		//							'titre'=>'Api left menu',
-		//							'mainmenu'=>'xxx',
-		//							'leftmenu'=>'api',
-		//							'url'=>'/api/pagelevel2.php',
-		//							'langs'=>'mylangfile@api',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'enabled'=>'$conf->ifttt->enabled',  // Define condition to show or hide menu entry. Use '$conf->ifttt->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->ifttt->level1->level2' if you want your menu with a permission rules
-		//							'target'=>'',
-		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-
-
-		// Exports
-		$r=1;
-
-		// Example:
-		// $this->export_code[$r]=$this->rights_class.'_'.$r;
-		// $this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-        // $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
-		// $this->export_permission[$r]=array(array("facture","facture","export"));
-		// $this->export_fields_array[$r]=array(
-		//	's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone',
-		//	's.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode',
-		//	's.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",
-		//	'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus',
-		//	'f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",
-		//	'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",
-		//	'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef'
-		//);
-		// $this->export_entities_array[$r]=array(
-		//	's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company',
-		//	's.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company',
-		//	'f.rowid'=>"invoice",'f.ref'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",
-		//	'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",
-		//	'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",
-		//	'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product'
-		//);
-		// $this->export_sql_start[$r]='SELECT DISTINCT ';
-		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
-		// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
-		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
-		// $this->export_sql_order[$r] .=' ORDER BY s.nom';
-		// $r++;
-	}
-
-	/**
-	 *  Function called when module is enabled.
-	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *  It also creates data directories
-	 *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *  @return     int             	1 if OK, 0 if KO
-	 */
-	public function init($options = '')
-	{
-		$sql = array();
-
-		$result=$this->_load_tables('/ifttt/sql/');
-
-		return $this->_init($sql, $options);
-	}
-
-    /**
-     *  Function called when module is disabled.
-     *  Remove from database constants, boxes and permissions from Dolibarr database.
-     *  Data directories are not deleted.
-     *
-     *  @param string $options Options when enabling module ('', 'noboxes')
-     *  @return int 1 if OK, 0 if KO
-     */
-    public function remove($options = '')
-    {
-        // Remove old constants with entity fields different of 0
-        $sql = array(
-            "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = ".$this->db->encrypt('MAIN_MODULE_IFTTT', 1),
-            "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = ".$this->db->encrypt('IFTTT_PRODUCTION_MODE', 1)
-        );
-
-        return $this->_remove($sql, $options);
-    }
-}
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index fa972d38c71..7cf5f6ba5df 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -77,7 +77,7 @@ print '<!-- BEGIN PHP TEMPLATE NOTES -->'."\n";
 print '<div class="tagtable border table-border tableforfield centpercent">'."\n";
 if ($module != 'product') {
 	// No public note yet on products
-	print '<div class="tagtr pair table-border-row">'."\n";
+	print '<div class="tagtr table-border-row">'."\n";
 	print '<div class="tagtd tagtdnote tdtop table-key-border-col'.(empty($cssclass)?'':' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
 	print $form->editfieldkey("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, $moreparam, '', 0);
 	print '</div>'."\n";
@@ -87,7 +87,7 @@ if ($module != 'product') {
 	print '</div>'."\n";
 }
 if (empty($user->societe_id)) {
-	print '<div class="tagtr '.($module != 'product'?'impair':'pair').' table-border-row">'."\n";
+	print '<div class="tagtr table-border-row">'."\n";
 	print '<div class="tagtd tagtdnote tdtop table-key-border-col'.(empty($cssclass)?'':' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
 	print $form->editfieldkey("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, $moreparam, '', 0);
 	print '</div>'."\n";
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 812d1b9eccf..84681f049c4 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -324,7 +324,7 @@ if ($id > 0 || ! empty($ref))
 	    print '<div class="fichehalfleft">';
 	    print '<div class="underbanner clearboth"></div>';
 
-	    print '<table class="border" width="100%">';
+	    print '<table class="border centpercent tableforfield">';
 
 		// Discounts for third party
 	    if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
@@ -549,7 +549,7 @@ if ($id > 0 || ! empty($ref))
 		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
 
-		print '<table class="border centpercent">';
+		print '<table class="border centpercent tableforfield">';
 
 		if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
 		{
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index f91cbd8f1eb..233861a2f0e 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -970,3 +970,4 @@ TMenuMRP=MRP
 ShowMoreInfos=Show More Infos
 NoFilesUploadedYet=Please upload a document first
 SeePrivateNote=See private note
+PaymentInformation=Payment information
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index d158fb49698..afd3a51ec8e 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -114,7 +114,7 @@ dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'n
 print '<div class="fichecenter">';
 
 print '<div class="underbanner clearboth"></div>';
-print '<table class="border" width="100%">';
+print '<table class="border centpercent tableforfield">';
 
 if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
 {
diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php
index 08783fa16ad..0a345fc6369 100644
--- a/htdocs/societe/project.php
+++ b/htdocs/societe/project.php
@@ -87,7 +87,7 @@ if ($socid)
     print '<div class="fichecenter">';
 
     print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
+	print '<table class="border centpercent tableforfield">';
 
     if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
     {
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 691daebf894..a0687454ab9 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -181,6 +181,10 @@ input.buttonpaymentstripe {
 	background-repeat: no-repeat;
 	background-position: 8px 11px;
 }
+a.buttonticket {
+	padding-left: 5px;
+	padding-right: 5px;
+}
 
 /* Used by timesheets */
 span.timesheetalreadyrecorded input {
@@ -3084,8 +3088,8 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 }
 .boxstats130 {
     width: 158px;
-    height: 48px;
-    padding: 3px;
+    height: 59px;
+    /* padding: 3px; */
 }
 .boxstats {
     padding-left: 3px;
@@ -3094,6 +3098,10 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
     padding-bottom: 2px;
     width: 121px;
 }
+.tabBar .fichehalfright .boxstats {
+    padding-top: 8px;
+    padding-bottom: 4px;
+}
 .boxstatscontent {
 	padding: 3px;
 }
@@ -3193,7 +3201,8 @@ span.dashboardlineko {
 	float: right;
 	position: relative;
     text-align: right;
-    top: -26px;
+    top: -27px;
+    right: 2px;
     padding: 0px 5px 0px 5px;
     border-radius: .25em;
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 1ef5417b4c3..a8efdc3f3f3 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -409,6 +409,11 @@ input.buttonpaymentstripe {
 	background-repeat: no-repeat;
 	background-position: 8px 7px;
 }
+a.buttonticket {
+	padding-left: 5px;
+	padding-right: 5px;
+}
+
 /* Used for timesheets */
 span.timesheetalreadyrecorded input {
     border: none;
@@ -1358,11 +1363,11 @@ div.fichetwothirdright {
 }
 div.fichehalfleft {
 	<?php if ($conf->browser->layout != 'phone')   { print "float: ".$left.";\n"; } ?>
-	<?php if ($conf->browser->layout != 'phone')   { print "width: 50%;\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone')   { print "width: calc(50% - 10px);\n"; } ?>
 }
 div.fichehalfright {
 	<?php if ($conf->browser->layout != 'phone')   { print "float: ".$right.";\n"; } ?>
-	<?php if ($conf->browser->layout != 'phone')   { print "width: 50%;\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone')   { print "width: calc(50% - 10px);\n"; } ?>
 }
 div.fichehalfright {
 	<?php if ($conf->browser->layout == 'phone')   { print "margin-top: 10px;\n"; } ?>
@@ -2585,6 +2590,10 @@ a.butActionNewRefused>span.fa-plus-circle { padding-left: 6px; font-size: 1.5em;
     background-repeat: repeat-x
 }
 
+button.ui-button {
+    padding-top: 5px;
+}
+
 .butActionDelete, .buttonDelete {
 	color: #ffffff !important;
 	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
@@ -5806,6 +5815,7 @@ border-top-right-radius: 6px;
 }
 
 
+
 <?php if (! defined('DISABLE_FONT_AWSOME') && empty($conf->global->MAIN_DISABLE_FONT_AWESOME_5)) { ?>
         <?php include dol_buildpath($path.'/theme/'.$theme.'/main_menu_fa_icons.inc.php', 0); ?>
 <?php }
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 5430932f53d..132cce1e52b 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -224,8 +224,8 @@ class Ticket extends CommonObject
     {
         $this->db = $db;
 
-        $this->statuts_short = array(self::STATUS_NOT_READ => 'Unread', self::STATUS_READ => 'Read', self::STATUS_ASSIGNED => 'Assigned', self::STATUS_IN_PROGRESS => 'InProgress', self::STATUS_NEED_MORE_INFO => 'NeedMoreInformation', self::STATUS_WAITING => 'Waiting', self::STATUS_CLOSED => 'Closed', self::STATUS_CANCELED => 'Canceled');
-        $this->statuts       = array(self::STATUS_NOT_READ => 'Unread', self::STATUS_READ => 'Read', self::STATUS_ASSIGNED => 'Assigned', self::STATUS_IN_PROGRESS => 'InProgress', self::STATUS_NEED_MORE_INFO => 'NeedMoreInformation', self::STATUS_WAITING => 'Waiting', self::STATUS_CLOSED => 'Closed', self::STATUS_CANCELED => 'Canceled');
+        $this->statuts_short = array(self::STATUS_NOT_READ => 'Unread', self::STATUS_READ => 'Read', self::STATUS_ASSIGNED => 'Assigned', self::STATUS_IN_PROGRESS => 'InProgress', self::STATUS_NEED_MORE_INFO => 'NeedMoreInformation', self::STATUS_WAITING => 'Suspended', self::STATUS_CLOSED => 'Closed', self::STATUS_CANCELED => 'Canceled');
+        $this->statuts       = array(self::STATUS_NOT_READ => 'Unread', self::STATUS_READ => 'Read', self::STATUS_ASSIGNED => 'Assigned', self::STATUS_IN_PROGRESS => 'InProgress', self::STATUS_NEED_MORE_INFO => 'NeedMoreInformation', self::STATUS_WAITING => 'Suspended', self::STATUS_CLOSED => 'Closed', self::STATUS_CANCELED => 'Canceled');
     }
 
     /**
diff --git a/htdocs/ticket/img/statut7.png b/htdocs/ticket/img/statut7.png
new file mode 100644
index 0000000000000000000000000000000000000000..af7f6d433dc839f6d416e67af74dd2fd2ec9cf74
GIT binary patch
literal 341
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z@Rfov<IdzjBcR}SPZ!4!i{86|hF&a=0&8Z?{UBFh|3NTm!<%zWjS^i8^*^|r+56`}
z^$9jMHly8*yyCwaxOva+O_5&co5tSy_)dtn<gyj7vQ{<P^ZN;!`X>MWA))+t3ZvmM
z84;%ng`Er=7#Zp{6d&3h+riSXYu$QJy)!wBS1qqR@V!N4PwBa}m&#{5=`pN1o3naV
zy3!`*ZzTdw7Hl7Uiqg_vuX~-hYL!*_xvdQMLcY4V+;g|BH&*|rT<D+n&Fa<feeutP
zPH(bdx-e-DV@Bv#z2y^De`)%&)5LxA_kXQVWE`w{4lnJfk<&0c%<K>-(y#J7ZCmiw
k)hnOvIe5kRUvLd$`rhmx>TwU<fI-0E>FVdQ&MBb@02u&^1poj5

literal 0
HcmV?d00001

diff --git a/htdocs/ticket/img/statut8.png b/htdocs/ticket/img/statut8.png
index af7f6d433dc839f6d416e67af74dd2fd2ec9cf74..84f3c5e7fc505eac2b593d7005623dd6294e53cb 100644
GIT binary patch
delta 207
zcmV;=05Jd60+0fbNq@3QL_t(Ijipnu4Z|=DqXhre41w&ipR^y?`5@<L$dbp@F1DKh
zN#MBLB#;Ct*c3we;69S7P5|HlKvk(#DI$@X>&zG2Cj4#ST8ZBK7ZJ^67LftKyV-z<
z=IyQWEuPh29LI-qZfG?u*d;KtQzA1%MB-*OnAy)@S(X*RdPpQLLS{~<39c%bS>3BD
z<^Jhbg@O=51W=Q-Rsev*bUhC#?WVh*Nkn3<(Vbui*OLO98ecuVI9;WzMpys<002ov
JPDHLkV1hEeUi1I}

delta 277
zcmV+w0qXvc0@VVLNq_fAL_t(Ijonc(N(4a=teTzh9&kVK5n{0H&Vqp$ilHy?M9jVX
zz<bCB1_m;_fejb>fC~-Hy<{7qO=bs$<J?p$8K$V}YN~-h4^9y^O=J7`7$g0Z0WroL
z6he3)xd5;M0DmYU;XcN=1c17(uSqV<Y@@2DdBFFCB)oObt$)&Yn?f!Ctj%nzs%Ijy
z1NL+fLO2HSOmb#s>#pl=s;WA7&b0vERP{te-bX!uGbjEdaZhIUI_mqrU*;0avOEIN
zlAHl(RrM~XkgN29{JAtov-kdm<Qzad48x^}d>$w^!vjE36ptk5X0}t+tEuL^!PGPU
bQ+xquy=(X<UJl_#00000NkvXXu0mjfANPR0

diff --git a/htdocs/ticket/img/statut9.png b/htdocs/ticket/img/statut9.png
deleted file mode 100644
index 84f3c5e7fc505eac2b593d7005623dd6294e53cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 272
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z@Rfov<IdzjBcR|WPZ!4!i{7Qd8+i{K@GNHef0d{4&Bpm#<Zt{`c%E@$((x;L+h#L(
zKG<<bWde)l4H2gw59}tb@?&_w;1IepR8wi<%-3hc@2LIBeGt`o@3*+%*;KKKj0bk#
zZ0LCQcI_wKc~=u;j<*-*Wti&RP&L>btYqx$@+i%8#?A8yk<&yERH^7WrTH!AT&Fc7
z^6qM_r~h7twKfSju>?%s62{PQxWtxU^X;<T^F3XX)?J*Nz<zx)(`>1D+r1XCOV_wX
Q0A0`E>FVdQ&MBb@052G5fdBvi

diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 1c3995391de..78fca5c7212 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -34,7 +34,7 @@ include_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
 include_once DOL_DOCUMENT_ROOT . '/core/lib/project.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("ticket","companies","other","projects"));
+$langs->loadLangs(array("ticket", "companies", "other", "projects"));
 
 
 // Get parameters
@@ -314,7 +314,7 @@ if ($socid && !$projectid && $user->rights->societe->lire) {
         print '<div class="fichecenter">';
 
         print '<div class="underbanner clearboth"></div>';
-        print '<table class="border centpercent">';
+        print '<table class="border centpercent tableforfield">';
 
         // Customer code
         if ($socstat->client && !empty($socstat->code_client)) {
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index c29b2aae51e..3239dbb5060 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -307,7 +307,8 @@ if (! empty($id) || ! empty($ref))
     $head=product_prepare_head($object);
     $titre=$langs->trans("CardProduct".$object->type);
     $picto=($object->type== Product::TYPE_SERVICE?'service':'product');
-    dol_fiche_head($head, 'combinations', $titre, 0, $picto);
+
+    dol_fiche_head($head, 'combinations', $titre, -1, $picto);
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
     $object->next_prev_filter=" fk_product_type = ".$object->type;

From f283e24b4806246cf7b115af699d21d7142be116 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 May 2019 13:53:12 +0200
Subject: [PATCH 15/30] Fix the noexe must be added for dangerous extension
 like js and shells

---
 htdocs/core/actions_linkedfiles.inc.php |  2 +-
 htdocs/core/lib/files.lib.php           |  2 +-
 htdocs/core/lib/functions.lib.php       | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index f23844e5d3d..25ef74127bf 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -194,7 +194,7 @@ elseif ($action == 'renamefile' && GETPOST('renamefilesave','alpha'))
 	        // Security:
 	        // Disallow file with some extensions. We rename them.
 	        // Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
-	        if (preg_match('/\.htm|\.html|\.php|\.pl|\.cgi$/i',$filenameto) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
+            if (isAFileWithExecutableContent($filenameto) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
 	        {
 	            $filenameto.= '.noexe';
 	        }
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index fae8353052f..63b13dd493d 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1053,7 +1053,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 		// Security:
 		// Disallow file with some extensions. We rename them.
 		// Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
-		if (preg_match('/\.htm|\.html|\.php|\.pl|\.cgi$/i',$dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
+		if (isAFileWithExecutableContent($dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
 		{
 			$file_name.= '.noexe';
 		}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 570d00ef2bd..ad910ca6885 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1,4 +1,6 @@
 <?php
+use PhpOffice\PhpSpreadsheet\NamedRange;
+
 /* Copyright (C) 2000-2007	Rodolphe Quiedeville			<rodolphe@quiedeville.org>
  * Copyright (C) 2003		Jean-Louis Bergamo			<jlb@j1b.org>
  * Copyright (C) 2004-2018	Laurent Destailleur			<eldy@users.sourceforge.net>
@@ -7925,3 +7927,18 @@ function roundUpToNextMultiple($n, $x=5)
 {
 	return (ceil($n)%$x === 0) ? ceil($n) : round(($n+$x/2)/$x)*$x;
 }
+
+/**
+ * Return if a file can contains executable content
+ *
+ * @param   string  $filename       File NamedRange
+ * @return  boolean                 True if yes, False if no
+ */
+function isAFileWithExecutableContent($filename)
+{
+    if (preg_match('/\.(htm|html|js|php|phtml|pl|py|cgi|ksh|sh|bash)$/i', $filename))
+    {
+        return true;
+    }
+    return false;
+}

From 479f8616e13c41bd15b020d7aa49bb61e48951b6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 May 2019 14:03:28 +0200
Subject: [PATCH 16/30] Fix sanitize data

---
 htdocs/admin/external_rss.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 048d002a3b7..c4dd642dfee 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -66,8 +66,8 @@ else
 
 if ($action == 'add' || GETPOST("modify"))
 {
-    $external_rss_title = "external_rss_title_" . GETPOST("norss");
-    $external_rss_urlrss = "external_rss_urlrss_" . GETPOST("norss");
+    $external_rss_title = "external_rss_title_" . GETPOST("norss", 'int');
+    $external_rss_urlrss = "external_rss_urlrss_" . GETPOST("norss", 'int');
 
     if (! empty($_POST[$external_rss_urlrss]))
     {
@@ -95,7 +95,7 @@ if ($action == 'add' || GETPOST("modify"))
 		{
 			// Ajoute boite box_external_rss dans definition des boites
 	        $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (file, note)";
-			$sql.= " VALUES ('box_external_rss.php','".$db->escape(GETPOST("norss").' ('.GETPOST($external_rss_title)).")')";
+			$sql.= " VALUES ('box_external_rss.php','".$db->escape(GETPOST("norss", 'int').' ('.GETPOST($external_rss_title, 'alpha')).")')";
 	        if (! $db->query($sql))
 	        {
 	        	dol_print_error($db);
@@ -103,8 +103,8 @@ if ($action == 'add' || GETPOST("modify"))
 	        }
 		}
 
-		$result1=dolibarr_set_const($db, "EXTERNAL_RSS_TITLE_" . GETPOST("norss"),GETPOST($external_rss_title),'chaine',0,'',$conf->entity);
-		if ($result1) $result2=dolibarr_set_const($db, "EXTERNAL_RSS_URLRSS_" . GETPOST("norss"),GETPOST($external_rss_urlrss),'chaine',0,'',$conf->entity);
+		$result1=dolibarr_set_const($db, "EXTERNAL_RSS_TITLE_" . GETPOST("norss", 'int'), GETPOST($external_rss_title, 'alpha'), 'chaine', 0, '', $conf->entity);
+		if ($result1) $result2=dolibarr_set_const($db, "EXTERNAL_RSS_URLRSS_" . GETPOST("norss", 'int'), GETPOST($external_rss_urlrss, 'alpha'), 'chaine', 0, '', $conf->entity);
 
         if ($result1 && $result2)
         {
@@ -122,13 +122,13 @@ if ($action == 'add' || GETPOST("modify"))
 
 if ($_POST["delete"])
 {
-    if(GETPOST("norss"))
+    if (GETPOST("norss", 'int'))
     {
         $db->begin();
 
 		// Supprime boite box_external_rss de definition des boites
         $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."boxes_def";
-        $sql.= " WHERE file = 'box_external_rss.php' AND note LIKE '".$db->escape(GETPOST("norss"))." %'";
+        $sql.= " WHERE file = 'box_external_rss.php' AND note LIKE '".$db->escape(GETPOST("norss", 'int'))." %'";
 
 		$resql=$db->query($sql);
 		if ($resql)
@@ -168,8 +168,8 @@ if ($_POST["delete"])
         }
 
 
-		$result1=dolibarr_del_const($db,"EXTERNAL_RSS_TITLE_" . GETPOST("norss"),$conf->entity);
-		if ($result1) $result2=dolibarr_del_const($db,"EXTERNAL_RSS_URLRSS_" . GETPOST("norss"),$conf->entity);
+		$result1=dolibarr_del_const($db,"EXTERNAL_RSS_TITLE_" . GETPOST("norss", 'int'), $conf->entity);
+		if ($result1) $result2=dolibarr_del_const($db,"EXTERNAL_RSS_URLRSS_" . GETPOST("norss", 'int'), $conf->entity);
 
         if ($result1 && $result2)
         {
@@ -270,13 +270,13 @@ if ($resql)
 
 		print '<tr class="oddeven">';
 		print "<td width=\"100px\">".$langs->trans("Title")."</td>";
-		print "<td><input type=\"text\" class=\"flat minwidth300\" name=\"external_rss_title_" . $idrss . "\" value=\"" . $conf->global->$keyrsstitle . "\"></td>";
+		print "<td><input type=\"text\" class=\"flat minwidth300\" name=\"external_rss_title_" . $idrss . "\" value=\"" . dol_escape_htmltag($conf->global->$keyrsstitle) . "\"></td>";
 		print "</tr>";
 
 
 		print '<tr class="oddeven">';
 		print "<td>".$langs->trans("URL")."</td>";
-		print "<td><input type=\"text\" class=\"flat minwidth300\" name=\"external_rss_urlrss_" . $idrss . "\" value=\"" . $conf->global->$keyrssurl . "\"></td>";
+		print "<td><input type=\"text\" class=\"flat minwidth300\" name=\"external_rss_urlrss_" . $idrss . "\" value=\"" . dol_escape_htmltag($conf->global->$keyrssurl) . "\"></td>";
 		print "</tr>";
 
 

From 61ead06950b7a6577da0159c89e860ebaae802a4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 May 2019 14:33:28 +0200
Subject: [PATCH 17/30] Fix Injection

---
 htdocs/admin/system/database-tables.php | 19 +++++++++++++++----
 htdocs/admin/tools/export_files.php     | 15 +++++++++------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index addeb3793c6..2da8561d30c 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -36,7 +36,13 @@ $action=GETPOST('action','alpha');
 
 if ($action == 'convert')
 {
-	$db->query("alter table ".$_GET["table"]." ENGINE=INNODB");
+    $sql="ALTER TABLE ".$db->escape(GETPOST("table", "aZ09"))." ENGINE=INNODB";
+	$db->query($sql);
+}
+if ($action == 'convertutf8')
+{
+    $sql="ALTER TABLE ".$db->escape(GETPOST("table", "aZ09"))." CHARACTER SET utf8 COLLATE utf8_unicode_ci";
+    $db->query($sql);
 }
 
 
@@ -111,9 +117,9 @@ else
 
 				print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a></td>';
 				print '<td>'.$obj->Engine.'</td>';
-				if (isset($row[1]) && $row[1] == "MyISAM")
+				if (isset($obj->Engine) && $obj->Engine == "MyISAM")
 				{
-					print '<td><a href="database-tables.php?action=convert&amp;table='.$row[0].'">'.$langs->trans("Convert").'</a></td>';
+				    print '<td><a class="reposition" href="database-tables.php?action=convert&amp;table='.$obj->Name.'">'.$langs->trans("Convert").' InnoDB</a></td>';
 				}
 				else
 				{
@@ -127,7 +133,12 @@ else
 				print '<td align="right">'.$obj->Index_length.'</td>';
 				print '<td align="right">'.$obj->Auto_increment.'</td>';
 				print '<td align="right">'.$obj->Check_time.'</td>';
-				print '<td align="right">'.$obj->Collation.'</td>';
+				print '<td align="right">'.$obj->Collation;
+				if (isset($obj->Collation) && ($obj->Collation == "utf8mb4_general_ci" || $obj->Collation == "utf8mb4_unicode_ci"))
+				{
+				    print '<br><a class="reposition" href="database-tables.php?action=convertutf8&amp;table='.$obj->Name.'">'.$langs->trans("Convert").' UTF8</a>';
+				}
+				print '</td>';
 				print '</tr>';
 				$i++;
 			}
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index 809cea3b271..4a19fd0e9a6 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -36,6 +36,8 @@ $export_type=GETPOST('export_type','alpha');
 $file=GETPOST('zipfilename_template','alpha');
 $compression = GETPOST('compression');
 
+$file = dol_sanitizeFileName($file);
+
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST("page",'int');
@@ -57,10 +59,11 @@ $errormsg='';
 
 if ($action == 'delete')
 {
-	$file=$conf->admin->dir_output.'/'.GETPOST('urlfile');
-	$ret=dol_delete_file($file, 1);
-	if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-	else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+    $filerelative = dol_sanitizeFileName(GETPOST('urlfile', 'alpha'));
+    $filepath=$conf->admin->dir_output.'/'.$filerelative;
+	$ret=dol_delete_file($filepath, 1);
+	if ($ret) setEventMessages($langs->trans("FileWasRemoved", $filerelative), null, 'mesgs');
+	else setEventMessages($langs->trans("ErrorFailToDeleteFile", $filerelative), null, 'errors');
 	$action='';
 }
 
@@ -122,7 +125,7 @@ elseif (in_array($compression, array('gz', 'bz')))
     $cmd = 'tar -cf '.$outputdir."/".$file." --exclude=documents/admin/documents -C ".DOL_DATA_ROOT." ".DOL_DATA_ROOT."/../documents/";
     exec($cmd, $out, $retval);
     //var_dump($cmd, DOL_DATA_ROOT);exit;
-    
+
     if ($retval != 0)
     {
         $langs->load("errors");
@@ -139,7 +142,7 @@ elseif (in_array($compression, array('gz', 'bz')))
         {
             $cmd = "bzip2 " . $outputdir."/".$file;
         }
-        
+
         exec($cmd, $out, $retval);
         if ($retval != 0)
         {

From bea4647107335e819fdd6c3ca6627c7a6147b6a3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 May 2019 14:36:16 +0200
Subject: [PATCH 18/30] Fix auto swith on utf8 when using utf8mb4

---
 htdocs/core/db/mysqli.class.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 6b546f5dfc3..a0dede0a895 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -141,12 +141,14 @@ class DoliDBMysqli extends DoliDB
             	// If client is old latin, we force utf8
             	$clientmustbe=empty($conf->db->dolibarr_main_db_character_set)?'utf8':$conf->db->dolibarr_main_db_character_set;
             	if (preg_match('/latin1/', $clientmustbe)) $clientmustbe='utf8';
+            	if (preg_match('/utf8mb4/', $clientmustbe)) $clientmustbe='utf8';
 
-				if ($this->db->character_set_name() != $clientmustbe) {
-					$this->db->set_charset($clientmustbe);	// This set utf8_general_ci
+            	if ($this->db->character_set_name() != $clientmustbe) {
+            		$this->db->set_charset($clientmustbe);	// This set utf8_unicode_ci
 
-					$collation = $conf->db->dolibarr_main_db_collation;
-					if (preg_match('/latin1/', $collation)) $collation='utf8_unicode_ci';
+            		$collation = $conf->db->dolibarr_main_db_collation;
+            		if (preg_match('/latin1/', $collation)) $collation='utf8_unicode_ci';
+            		if (preg_match('/utf8mb4/', $collation)) $collation='utf8_unicode_ci';
 
 					if (! preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
 				}

From 5131e7a5b789d2108e41623d19a74cb5a03ad146 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 May 2019 14:39:38 +0200
Subject: [PATCH 19/30] Fix SQL injection

---
 htdocs/cashdesk/facturation_verif.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php
index 6aa81d991df..7187b56738a 100644
--- a/htdocs/cashdesk/facturation_verif.php
+++ b/htdocs/cashdesk/facturation_verif.php
@@ -49,11 +49,11 @@ switch($action)
 			// Recuperation des donnees en fonction de la source (liste deroulante ou champ texte) ...
 			if ( $_POST['hdnSource'] == 'LISTE' )
 			{
-				$sql.= " AND p.rowid = ".$_POST['selProduit'];
+				$sql.= " AND p.rowid = ".((int) GETPOST('selProduit', 'int'));
 			}
 			else if ( $_POST['hdnSource'] == 'REF' )
 			{
-				$sql.= " AND p.ref = '".$_POST['txtRef']."'";
+				$sql.= " AND p.ref = '".$db->escape(GETPOST('txtRef', 'alpha'))."'";
 			}
 
 			$result = $db->query($sql);

From e463b17c155a572acdd04b83512829d33b7942b0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 May 2019 15:31:56 +0200
Subject: [PATCH 20/30] Fix look and feel v10

---
 htdocs/accountancy/admin/account.php          |  4 ++--
 htdocs/accountancy/admin/index.php            | 24 +++++++++----------
 htdocs/accountancy/bookkeeping/card.php       |  4 ++--
 htdocs/admin/bom.php                          |  2 +-
 htdocs/admin/chequereceipts.php               |  2 +-
 htdocs/admin/contract.php                     |  2 +-
 htdocs/admin/expedition.php                   |  2 +-
 htdocs/admin/expensereport.php                |  2 +-
 htdocs/admin/facture.php                      |  2 +-
 htdocs/admin/fichinter.php                    |  2 +-
 htdocs/admin/holiday.php                      |  2 +-
 htdocs/admin/livraison.php                    |  2 +-
 htdocs/admin/mailman.php                      |  2 +-
 htdocs/admin/payment.php                      |  2 +-
 htdocs/admin/propal.php                       |  2 +-
 htdocs/admin/reception_setup.php              |  2 +-
 htdocs/admin/spip.php                         | 20 ++++++++--------
 htdocs/admin/supplier_invoice.php             |  2 +-
 htdocs/admin/supplier_order.php               |  8 +++----
 htdocs/admin/supplier_payment.php             |  2 +-
 htdocs/admin/supplier_proposal.php            |  2 +-
 htdocs/admin/ticket.php                       |  2 +-
 htdocs/admin/workflow.php                     |  4 ++--
 htdocs/api/admin/index.php                    |  4 ++--
 htdocs/modulebuilder/template/admin/setup.php |  2 +-
 htdocs/paypal/admin/paypal.php                |  4 ++--
 htdocs/product/admin/product.php              |  4 ++--
 htdocs/projet/admin/project.php               |  4 ++--
 htdocs/societe/admin/societe.php              | 20 ++++++++--------
 htdocs/societe/ajaxcompanies.php              |  2 +-
 htdocs/stripe/admin/stripe.php                |  8 +++----
 31 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 8daae94efe6..0193d9c1f75 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -389,11 +389,11 @@ if ($resql)
 		{
 			print '<td>';
 			if (empty($obj->active)) {
-				print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $obj->rowid . '&action=enable">';
+				print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $obj->rowid . '&action=enable">';
 				print img_picto($langs->trans("Disabled"), 'switch_off');
 				print '</a>';
 			} else {
-				print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $obj->rowid . '&action=disable">';
+				print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $obj->rowid . '&action=disable">';
 				print img_picto($langs->trans("Activated"), 'switch_on');
 				print '</a>';
 			}
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 965b63ba9b9..984a5b08e90 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -214,11 +214,11 @@ if (! empty($user->admin))
     print '<tr class="oddeven">';
     print '<td>' . $langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_TODO") . '</td>';
     if (! empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO)) {
-        print '<td class="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setlistsorttodo&value=0">';
+        print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?action=setlistsorttodo&value=0">';
         print img_picto($langs->trans("Activated"), 'switch_on');
         print '</a></td>';
     } else {
-        print '<td class="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setlistsorttodo&value=1">';
+        print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?action=setlistsorttodo&value=1">';
         print img_picto($langs->trans("Disabled"), 'switch_off');
         print '</a></td>';
     }
@@ -227,11 +227,11 @@ if (! empty($user->admin))
     print '<tr class="oddeven">';
     print '<td>' . $langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_DONE") . '</td>';
     if (! empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE)) {
-        print '<td class="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setlistsortdone&value=0">';
+        print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?action=setlistsortdone&value=0">';
         print img_picto($langs->trans("Activated"), 'switch_on');
         print '</a></td>';
     } else {
-        print '<td class="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setlistsortdone&value=1">';
+        print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?action=setlistsortdone&value=1">';
         print img_picto($langs->trans("Disabled"), 'switch_off');
         print '</a></td>';
     }
@@ -240,11 +240,11 @@ if (! empty($user->admin))
 	print '<tr class="oddeven">';
 	print '<td>' . $langs->trans("ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL") . '</td>';
 	if (! empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL)) {
-		print '<td class="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setenabledraftexport&value=0">';
+		print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?action=setenabledraftexport&value=0">';
 		print img_picto($langs->trans("Activated"), 'switch_on');
 		print '</a></td>';
 	} else {
-		print '<td class="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setenabledraftexport&value=1">';
+		print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?action=setenabledraftexport&value=1">';
 		print img_picto($langs->trans("Disabled"), 'switch_off');
 		print '</a></td>';
 	}
@@ -253,11 +253,11 @@ if (! empty($user->admin))
 	print '<tr class="oddeven">';
 	print '<td>' . $langs->trans("BANK_DISABLE_DIRECT_INPUT") . '</td>';
 	if (! empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
-		print '<td class="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setdisabledirectinput&value=0">';
+		print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?action=setdisabledirectinput&value=0">';
 		print img_picto($langs->trans("Activated"), 'switch_on');
 		print '</a></td>';
 	} else {
-		print '<td class="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setdisabledirectinput&value=1">';
+		print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?action=setdisabledirectinput&value=1">';
 		print img_picto($langs->trans("Disabled"), 'switch_off');
 		print '</a></td>';
 	}
@@ -266,11 +266,11 @@ if (! empty($user->admin))
     print '<tr class="oddeven">';
     print '<td>' . $langs->trans("ACCOUNTANCY_COMBO_FOR_AUX") . '</td>';
     if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
-        print '<td class="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setenablesubsidiarylist&value=0">';
+        print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?action=setenablesubsidiarylist&value=0">';
         print img_picto($langs->trans("Activated"), 'switch_on');
         print '</a></td>';
     } else {
-        print '<td class="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setenablesubsidiarylist&value=1">';
+        print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?action=setenablesubsidiarylist&value=1">';
         print img_picto($langs->trans("Disabled"), 'switch_off');
         print '</a></td>';
     }
@@ -279,11 +279,11 @@ if (! empty($user->admin))
     print '<tr class="oddeven">';
     print '<td>' . $langs->trans("ACCOUNTING_MANAGE_ZERO") . '</td>';
     if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
-        print '<td class="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setmanagezero&value=0">';
+        print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?action=setmanagezero&value=0">';
         print img_picto($langs->trans("Activated"), 'switch_on');
         print '</a></td>';
     } else {
-        print '<td class="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setmanagezero&value=1">';
+        print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?action=setmanagezero&value=1">';
         print img_picto($langs->trans("Disabled"), 'switch_off');
         print '</a></td>';
     }
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 8974b65a68f..d94ce0ec315 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -531,11 +531,11 @@ if ($action == 'create')
 		print '<td class="titlefield">' . $langs->trans("Status") . '</td>';
 		print '<td>';
 			if (empty($object->validated)) {
-				print '<a href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $line->rowid . '&action=enable">';
+				print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $line->rowid . '&action=enable">';
 				print img_picto($langs->trans("Disabled"), 'switch_off');
 				print '</a>';
 			} else {
-				print '<a href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $line->rowid . '&action=disable">';
+				print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $line->rowid . '&action=disable">';
 				print img_picto($langs->trans("Activated"), 'switch_on');
 				print '</a>';
 			}
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index b7f1f0e6db9..b6e62973cf7 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -275,7 +275,7 @@ foreach ($dirmodels as $reldir)
 						}
 						else
 						{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index e8e035f8b49..efc192e6de1 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -184,7 +184,7 @@ foreach ($dirmodels as $reldir)
 							}
 							else
 							{
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							}
 							print '</td>';
 
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index bf02df80b5b..63597eaa22b 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -256,7 +256,7 @@ foreach ($dirmodels as $reldir)
 						}
 						else
 						{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 04dcf3ddc36..23a154511c1 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -261,7 +261,7 @@ foreach ($dirmodels as $reldir)
 						}
 						else
 						{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;value='.$file.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;value='.$file.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index cac83ef8d8b..da77c0e78d3 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -267,7 +267,7 @@ foreach ($dirmodels as $reldir)
 						}
 						else
 						{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 57a18afcbd3..765f2e6f995 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -352,7 +352,7 @@ foreach ($dirmodels as $reldir)
                             }
                             else
                             {
-                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+                                print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                             }
                             print '</td>';
 
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index a407edd3864..27f105435d5 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -331,7 +331,7 @@ foreach ($dirmodels as $reldir)
 						}
 						else
 						{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 						}
 						print '</td>';
 
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index 347d45d729d..e3571fdb253 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -257,7 +257,7 @@ foreach ($dirmodels as $reldir)
 						}
 						else
 						{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index d11d07c5f38..7635c9a3c19 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -252,7 +252,7 @@ foreach ($dirmodels as $reldir)
                         }
                         else
                         {
-                            print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+                            print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                         }
                         print '</td>';
 
diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php
index 517ec9b9dc5..4ee9e214890 100644
--- a/htdocs/admin/mailman.php
+++ b/htdocs/admin/mailman.php
@@ -162,7 +162,7 @@ if (! empty($conf->global->ADHERENT_USE_MAILMAN))
     dol_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user');
 
     //$link=img_picto($langs->trans("Active"),'tick').' ';
-    $link='<a href="'.$_SERVER["PHP_SELF"].'?action=unset&value=0&name=ADHERENT_USE_MAILMAN">';
+    $link='<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=unset&value=0&name=ADHERENT_USE_MAILMAN">';
     //$link.=$langs->trans("Disable");
     $link.=img_picto($langs->trans("Activated"), 'switch_on');
     $link.='</a>';
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index aaba339e30e..4e80fe55e25 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -183,7 +183,7 @@ foreach ($dirmodels as $reldir)
                             }
                             else
                             {
-                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+                                print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                             }
                             print '</td>';
 
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index db41876b02c..843de325e73 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -314,7 +314,7 @@ foreach ($dirmodels as $reldir)
 						}
 						else
 						{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index f97c1d7823b..a1fd76e0d5d 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -266,7 +266,7 @@ foreach ($dirmodels as $reldir)
 						}
 						else
 						{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;value='.$file.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;value='.$file.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php
index 96552ed2c0d..e0b4b986969 100644
--- a/htdocs/admin/spip.php
+++ b/htdocs/admin/spip.php
@@ -64,10 +64,10 @@ if ($action == 'update' || $action == 'add')
     		$constnote=$_POST["constnote"][$key];
 
         	$res=dolibarr_set_const($db, $constname, $constvalue, $type[$consttype], 0, $constnote, $conf->entity);
-    		
+
     		if (! $res > 0) $error++;
     	}
-    
+
      	if (! $error)
         {
             setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -123,9 +123,9 @@ $head = mailmanspip_admin_prepare_head();
 if (! empty($conf->global->ADHERENT_USE_SPIP))
 {
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-	
+
 	dol_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user');
-    
+
     //$link=img_picto($langs->trans("Active"),'tick').' ';
     $link='<a href="'.$_SERVER["PHP_SELF"].'?action=unset&value=0&name=ADHERENT_USE_SPIP">';
     //$link.=$langs->trans("Disable");
@@ -141,25 +141,25 @@ if (! empty($conf->global->ADHERENT_USE_SPIP))
 
     print load_fiche_titre($langs->trans('SPIPTitle'), $link, '');
 	print '<br>';
-    
+
 	form_constantes($constantes, 2);
-	
+
     dol_fiche_end();
 
     print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
-    
+
     print '</form>';
 }
 else
 {
     dol_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user');
-    
-    $link='<a href="'.$_SERVER["PHP_SELF"].'?action=set&value=1&name=ADHERENT_USE_SPIP">';
+
+    $link='<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&value=1&name=ADHERENT_USE_SPIP">';
     //$link.=$langs->trans("Activate");
     $link.=img_picto($langs->trans("Disabled"), 'switch_off');
     $link.='</a>';
     print load_fiche_titre($langs->trans('SPIPTitle'), $link, '');
-    
+
     dol_fiche_end();
 }
 
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 6d8936fbe71..836afc27a7c 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -276,7 +276,7 @@ foreach ($dirmodels as $reldir)
                         }
                         else
                         {
-                            print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+                            print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                         }
                         print '</td>';
 
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index c414eca8158..e895a0b4005 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -178,7 +178,7 @@ elseif ($action == 'set_SUPPLIER_ORDER_OTHER')
     // TODO We add/delete permission here until permission can have a condition on a global var
     include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php';
     $newmodule=new modFournisseur($db);
-    
+
     if ($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)
     {
     	// clear default rights array
@@ -191,7 +191,7 @@ elseif ($action == 'set_SUPPLIER_ORDER_OTHER')
     	$newmodule->rights[$r][3] = 0;
     	$newmodule->rights[$r][4] = 'commande';
     	$newmodule->rights[$r][5] = 'approve2';
-    	
+
     	// Insert
     	$newmodule->insert_permissions(1);
     }
@@ -199,7 +199,7 @@ elseif ($action == 'set_SUPPLIER_ORDER_OTHER')
     {
     	// Remove all rights with Permission1190
     	$newmodule->delete_permissions();
-    	
+
     	// Add all right without Permission1190
     	$newmodule->insert_permissions(1);
     }
@@ -306,7 +306,7 @@ foreach ($dirmodels as $reldir)
                         }
                         else
                         {
-                            print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+                            print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                         }
                         print '</td>';
 
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index 4cf53e6d82f..49af65bd786 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -268,7 +268,7 @@ foreach ($dirmodels as $reldir)
                             }
                             else
                             {
-                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+                                print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                             }
                             print '</td>';
 
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index b757fb66673..8b17c860fd4 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -283,7 +283,7 @@ foreach ($dirmodels as $reldir)
 						}
 						else
 						{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index f9e985cec94..331d7e992ba 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -259,7 +259,7 @@ foreach ($dirmodels as $reldir) {
                         if ($conf->global->TICKET_ADDON == 'mod_' . $classname) {
                             print img_picto($langs->trans("Activated"), 'switch_on');
                         } else {
-                            print '<a href="' . $_SERVER["PHP_SELF"] . '?action=setmod&amp;value=mod_' . $classname . '" alt="' . $langs->trans("Default") . '">' . img_picto($langs->trans("Disabled"), 'switch_off') . '</a>';
+                            print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?action=setmod&amp;value=mod_' . $classname . '" alt="' . $langs->trans("Default") . '">' . img_picto($langs->trans("Disabled"), 'switch_off') . '</a>';
                         }
                         print '</td>';
 
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index b1e8c310ed0..806f53c463c 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -171,13 +171,13 @@ foreach($workflowcodes as $key => $params)
    	{
    		if (! empty($conf->global->$key))
    		{
-   			print '<a href="'.$_SERVER['PHP_SELF'].'?action=del'.$key.'">';
+   			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=del'.$key.'">';
   			print img_picto($langs->trans("Activated"), 'switch_on');
    			print '</a>';
    		}
    		else
    		{
-   			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set'.$key.'">';
+   			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=set'.$key.'">';
   			print img_picto($langs->trans("Disabled"), 'switch_off');
    			print '</a>';
    		}
diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index 6d7ac9d2f85..ed23151d99b 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -108,13 +108,13 @@ print '<td>'.$langs->trans("ApiProductionMode").'</td>';
 $production_mode=(empty($conf->global->API_PRODUCTION_MODE)?false:true);
 if ($production_mode)
 {
-    print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i+1).'&status=0">';
+    print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i+1).'&status=0">';
     print img_picto($langs->trans("Activated"), 'switch_on');
     print '</a></td>';
 }
 else
 {
-    print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i+1).'&status=1">';
+    print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i+1).'&status=1">';
     print img_picto($langs->trans("Disabled"), 'switch_off');
     print '</a></td>';
 }
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index a434833c792..fea88479abf 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -119,7 +119,7 @@ else
 {
 	if (! empty($arrayofparameters))
 	{
-		print '<table class="noborder" width="100%">';
+		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 		foreach($arrayofparameters as $key => $val)
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index b2491b74b72..aefcb50369a 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -149,12 +149,12 @@ print '<td class="titlefield">';
 print $langs->trans("PaypalLiveEnabled").'</td><td>';
 if (empty($conf->global->PAYPAL_API_SANDBOX))
 {
-    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=0">';
+    print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=0">';
     print img_picto($langs->trans("Activated"), 'switch_on');
 }
 else
 {
-    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=1">';
+    print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=1">';
     print img_picto($langs->trans("Disabled"), 'switch_off');
 }
 print '</td></tr>';
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 2efd3ab14f1..888863e5e66 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -143,7 +143,7 @@ if ($action == 'other')
 
 	$value = GETPOST('activate_usesearchtoselectproduct', 'alpha');
 	$res = dolibarr_set_const($db, "PRODUIT_USE_SEARCH_TO_SELECT", $value, 'chaine', 0, '', $conf->entity);
-	
+
 	$value = GETPOST('activate_useProdFournDesc', 'alpha');
 	$res = dolibarr_set_const($db, "PRODUIT_FOURN_TEXTS", $value, 'chaine', 0, '', $conf->entity);
 	if ($value) {
@@ -354,7 +354,7 @@ foreach ($dirproduct as $dirroot)
     				$disabled = false;
     				if (! empty($conf->multicompany->enabled) && (is_object($mc) && ! empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true);
     				print '<td class="center">';
-    				if (! $disabled) print '<a href="'.$_SERVER['PHP_SELF'].'?action=setcodeproduct&value='.$file.'">';
+    				if (! $disabled) print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeproduct&value='.$file.'">';
     				print img_picto($langs->trans("Disabled"), 'switch_off');
     				if (! $disabled) print '</a>';
     				print '</td>';
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index ca4663bd43e..4e76f954717 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -405,7 +405,7 @@ foreach ($dirmodels as $reldir)
 						}
 						else
 						{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 						}
 						print '</td>';
 
@@ -506,7 +506,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 							}
 							else
 							{
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmodtask&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodtask&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							}
 							print '</td>';
 
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 4a614c02312..d07ddfc2b4f 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -404,7 +404,7 @@ foreach ($dirsociete as $dirroot)
     				$disabled = false;
     				if (! empty($conf->multicompany->enabled) && (is_object($mc) && ! empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true);
     				print '<td class="center">';
-    				if (! $disabled) print '<a href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&value='.$file.'">';
+    				if (! $disabled) print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&value='.$file.'">';
     				print img_picto($langs->trans("Disabled"), 'switch_off');
     				if (! $disabled) print '</a>';
     				print '</td>';
@@ -478,7 +478,7 @@ foreach ($dirsociete as $dirroot)
     			}
     			else
     			{
-    				print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setcodecompta&value='.$file.'">';
+    				print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodecompta&value='.$file.'">';
     				print img_picto($langs->trans("Disabled"), 'switch_off');
     				print '</a></td>';
     			}
@@ -813,12 +813,12 @@ print '<td>&nbsp</td>';
 print '<td class="center">';
 if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST))
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=0">';
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
 }
 else
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=1">';
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=1">';
 	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
 print '</a></td>';
@@ -830,12 +830,12 @@ print '<td>&nbsp</td>';
 print '<td class="center">';
 if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST))
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=0">';
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
 }
 else
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=1">';
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=1">';
 	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
 print '</a></td>';
@@ -849,12 +849,12 @@ print '<td>&nbsp</td>';
 print '<td class="center">';
 if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD))
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=0">';
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
 }
 else
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=1">';
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=1">';
 	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
 print '</a></td>';
@@ -867,12 +867,12 @@ print '<td>&nbsp</td>';
 print '<td class="center">';
 if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS))
 {
-    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&value=0">';
+    print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&value=0">';
     print img_picto($langs->trans("Activated"), 'switch_on');
 }
 else
 {
-    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&value=1">';
+    print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&value=1">';
     print img_picto($langs->trans("Disabled"), 'switch_off');
 }
 print '</a></td>';
diff --git a/htdocs/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php
index 4323a4c57ac..a5d88de422a 100644
--- a/htdocs/societe/ajaxcompanies.php
+++ b/htdocs/societe/ajaxcompanies.php
@@ -81,7 +81,7 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
 		if (! empty($conf->global->SOCIETE_ALLOW_SEARCH_ON_ROWID)) $sql.=" OR rowid = '" . $db->escape($socid) . "'";
 		$sql.=")";
 	}
-	if (GETPOST("filter")) $sql.= " AND ".GETPOST("filter", "alpha"); // Add other filters
+	//if (GETPOST("filter")) $sql.= " AND ".GETPOST("filter", "alpha"); // Add other filters
 	$sql.= " ORDER BY nom ASC";
 
 	//dol_syslog("ajaxcompanies", LOG_DEBUG);
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 2bc257e1f77..3966a3f439f 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -225,12 +225,12 @@ if (empty($conf->stripeconnect->enabled))
             $endpoint->save();
             if ($endpoint->status == 'enabled')
             {
-            	print '<a href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';
+            	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';
             	print img_picto($langs->trans("Activated"), 'switch_on');
             }
             else
             {
-            	print '<a href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=1">';
+            	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=1">';
             	print img_picto($langs->trans("Disabled"), 'switch_off');
             }
         //print $endpoint;
@@ -298,12 +298,12 @@ if (empty($conf->stripeconnect->enabled))
             $endpoint->save();
             if ($endpoint->status == 'enabled')
             {
-                print '<a href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';
+                print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';
                 print img_picto($langs->trans("Activated"), 'switch_on');
             }
             else
             {
-                print '<a href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=1">';
+                print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=1">';
                 print img_picto($langs->trans("Disabled"), 'switch_off');
             }
         //print $endpoint;

From 657bd5c2fe8476b7daf48099010af8d24ad26eea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 May 2019 15:50:16 +0200
Subject: [PATCH 21/30] Move module from develop to experimental

---
 htdocs/admin/emailcollector_card.php           |   5 ++---
 htdocs/core/modules/modDataPolicy.class.php    |   2 +-
 htdocs/datapolicy/admin/setup.php              |   2 +-
 htdocs/datapolicy/img/datapolicy.png           | Bin 683 -> 0 bytes
 htdocs/datapolicy/img/gfdl.png                 | Bin 4709 -> 0 bytes
 htdocs/datapolicy/img/gplv3.png                | Bin 2666 -> 0 bytes
 htdocs/datapolicy/img/object_datapolicy.png    | Bin 2226 -> 0 bytes
 htdocs/datapolicy/img/object_inoveaconseil.png | Bin 764 -> 0 bytes
 8 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 htdocs/datapolicy/img/datapolicy.png
 delete mode 100644 htdocs/datapolicy/img/gfdl.png
 delete mode 100644 htdocs/datapolicy/img/gplv3.png
 delete mode 100644 htdocs/datapolicy/img/object_datapolicy.png
 delete mode 100644 htdocs/datapolicy/img/object_inoveaconseil.png

diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index a27be02acb0..6d1b640f45b 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -608,9 +608,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 		print '</td>';
 		// Delete
-		print '<td class="right">';
-		print ' <a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editoperation&operationid='.$ruleaction['id'].'">'.img_edit().'</a>';
-		print ' &nbsp; ';
+		print '<td class="right nowraponall">';
+		print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editoperation&operationid='.$ruleaction['id'].'">'.img_edit().'</a>';
 		print ' <a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deleteoperation&operationid='.$ruleaction['id'].'">'.img_delete().'</a>';
 		print '</td>';
 		print '</tr>';
diff --git a/htdocs/core/modules/modDataPolicy.class.php b/htdocs/core/modules/modDataPolicy.class.php
index be88c709090..a08ce2f7873 100644
--- a/htdocs/core/modules/modDataPolicy.class.php
+++ b/htdocs/core/modules/modDataPolicy.class.php
@@ -70,7 +70,7 @@ class modDataPolicy extends DolibarrModules {
         $this->descriptionlong = "";
 
         // Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-        $this->version = 'development';
+        $this->version = 'experimental';
         // Key used in llx_const table to save module status enabled/disabled (where datapolicy is value of property name of module in uppercase)
         $this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
         // Name of image file used for this module.
diff --git a/htdocs/datapolicy/admin/setup.php b/htdocs/datapolicy/admin/setup.php
index ba41de80a72..ab737f679ca 100644
--- a/htdocs/datapolicy/admin/setup.php
+++ b/htdocs/datapolicy/admin/setup.php
@@ -122,7 +122,7 @@ llxHeader('', $langs->trans($page_name));
 // Subheader
 $linkback = '<a href="'.($backtopage?$backtopage:DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
 
-print load_fiche_titre($langs->trans($page_name), $linkback, 'object_datapolicy@datapolicy');
+print load_fiche_titre($langs->trans($page_name), $linkback, 'object_generic');
 
 // Configuration header
 $head = datapolicyAdminPrepareHead();
diff --git a/htdocs/datapolicy/img/datapolicy.png b/htdocs/datapolicy/img/datapolicy.png
deleted file mode 100644
index 2681ccc1d3a7d33593e8502daa447b8c816ddb08..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 683
zcmV;c0#yBpP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm001AO001AO0d^~rqyPW_8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10w_sDK~z|U?U&0-RZ$eif6Gj16oCkZ5<+1}P!UCPF?v7<(OB?*
zXxeiS)Wn8G2q6(fuR#z|P(nEnL85_^ia>&bpol<(u!rW?;H+EQ%enXNbFO(BxM6em
zT6?Xvzwg`ooU^Y<qR7@%=<2Hg{s#cf<$;-<26m*xypnVwPjNFV0moCOrX*biKob5W
z+yy>){|U(ZFQBI!m!$&}L7j!5{;fYTRT7^Ei2`otSo}~$jn`>$_0GV8{|=a0ceV}S
zT##S2)dC>kW)OEac4ad=0PF{D)D5n&1&hE|5*Fn>+!87O7%&6uq>(L<G);0i0oKH*
zU}k;5LEthl+mHf2-bV5y2$%=D>ac(63vU3r8dAUkz5(vJ*$kYi!M+3>2Chh&smne_
z0k^l4oC%S<BQ{sb8wI`sZEiQNfP;Jq+;?*=a4LoUKHvy2Ea^)W`&b3sw<}=t1L&xj
ze+<k4?SXH36mXzZz(Y4%LKVzxFVGKMmGn89eHI1Wzb9by9oXdlN5D5=V@3S(Dd1pV
z08iX(1x}dRZr~_zP146q?6WH1bG-qpIbfWWGx1LpaKMwmGdI@(eZX}|A2PEi|BdK;
zFrEj7a@P5KBg)bwjhopWpa&S0^ln7~IEcZ#xv2om>=;mTvomp7S=zUfMq-Pa*-4U*
z(fYvM9@LwZ^Z;0LC%nYcD^%FWV(tM!t@kx*iR5*SB+L^EYlZ(WSOrixfZrRuvN}?F
RO?LnQ002ovPDHLkV1iP-B{u*7

diff --git a/htdocs/datapolicy/img/gfdl.png b/htdocs/datapolicy/img/gfdl.png
deleted file mode 100644
index f2bacfd179a99f051654eaa6ba30089dd8691d7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4709
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

diff --git a/htdocs/datapolicy/img/gplv3.png b/htdocs/datapolicy/img/gplv3.png
deleted file mode 100644
index ba78d4c4941dabf2fcac5409a92ac4c57920c69f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2666
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
Y19h*OP%`Tk_W%F@07*qoM6N<$g8#_jNdN!<

diff --git a/htdocs/datapolicy/img/object_datapolicy.png b/htdocs/datapolicy/img/object_datapolicy.png
deleted file mode 100644
index 5d65c309ccaef535bcf8619b40a45b6b4489206b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2226
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
An*aa+

diff --git a/htdocs/datapolicy/img/object_inoveaconseil.png b/htdocs/datapolicy/img/object_inoveaconseil.png
deleted file mode 100644
index 292a9c75ef2efec13eda20eee1c7c2666785ab2a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 764
zcmV<Y0t5YtP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru;0y*73^~%2&sP8d0*OgP
zK~yNueUeQ`6mbB>-^~1-S!dmL4a99(KL`@K1-6%nR8lYIp_6s!poi!K2`q?C9r{2I
zb`m;v2!x1mgAP$rx=7_zj^ygDn;*-ryXv^>XFK!X|BU<ZB!pDI<9qM&9uN2noO6lN
zVkQ2Aa9CJhU+*SFx<E+TQO<eP=kxU*c+ri`%C)`i!5vDY<UlN#=8=_DYNS{!o`Ima
zI0tyC)SO5pMjIL$UIRdSXX~PAv+h~LND=_hb-nVNrj2;L-X_K6g3W9&&cGPMhGDD$
z!1qk1ZgDO5Cbqp9pU<v-A!B1>Vj_{aswhfRg~tQN7%a<5Q%a}v#>P-{d)tqX$z=ar
zE`K+jU1`1F*>Ms8NGuks5P)k{RaMyE--lrs(<_<G<x5>%@vZ&RiEw;Ayu6ujUr1-3
zrgVMkpc=7lyNX&?{SmJhj^kib)9&5w>x%=xlkv#lwq><vlgXY}H?KeYb3|em3e}WS
zIE=w&4Eog6>VY}+S?k$Z&H5t!4~*G!XKyja^v1@<2mnZ-P{_qO@0Dd4ZnqnLzrPR;
zhu;Cf&kyg-iQ(shJ{NmwQF?=O-YozxbY0I8$8iivlClNU3>1q+1OkEH(b3VgzuN!S
zqSmp*a`KL8nys934nUA3DF`4g)z{TIvMiSqLRwT+g~#KO2qEWf+wLrtN>`|5ouZV2
z*|xB>w6xSeFwh5pOEb|Zmt}dz=k=YIh<MzkxS*=4B#L6CB#Npm%P3b>?CtLE%tWIt
znx^FdKmveNDn%!?$>Exs+8VdpT`SA7SVo8-2!bPs;$A+N`!pVjbPNp*E&TJVp-`xy
ut*xyo7!3LqMgFzCxcv3u<3|&RbH4!rJ4K(QHqWR40000<MNUMnLSTZXerNOm


From 2c0c1dbef3c8a6123ff08321eb501d028038097a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 May 2019 16:16:19 +0200
Subject: [PATCH 22/30] Debug modulebuilder

---
 htdocs/langs/en_US/modulebuilder.lang |  1 +
 htdocs/modulebuilder/index.php        | 25 ++++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index c3f75301f67..cc55c7ba10a 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -68,6 +68,7 @@ PageForLib=File for PHP library
 PageForObjLib=File for PHP library dedicated to object 
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
+SqlFileKeyExtraFields=Sql file for keys of complementary attributes
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index e5024f6949f..e2ab8d964a3 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -1203,9 +1203,11 @@ print load_fiche_titre($text, '', 'title_setup');
 print '<span class="opacitymedium">'.$langs->trans("ModuleBuilderDesc", 'https://wiki.dolibarr.org/index.php/Module_development#Create_your_module').'</span><br>';
 
 $dirsrootforscan=array($dirread);
-if ($dirread != DOL_DOCUMENT_ROOT && $conf->global->MAIN_FEATURES_LEVEL >=2) { $dirsrootforscan[]=DOL_DOCUMENT_ROOT; }
+// Add also the core modules into the list of modules to show/edit
+if ($dirread != DOL_DOCUMENT_ROOT && ($conf->global->MAIN_FEATURES_LEVEL >=2 || ! empty($conf->global->MODULEBUILDER_ADD_DOCUMENT_ROOT))) { $dirsrootforscan[]=DOL_DOCUMENT_ROOT; }
 
 // Search modules to edit
+print '<!-- Scanned dir -->'."\n";
 $listofmodules=array();
 foreach($dirsrootforscan as $dirread)
 {
@@ -1873,6 +1875,12 @@ elseif (! empty($module))
 						$realpathtopicto    = dol_buildpath($pathtopicto, 0, 2);
 						$realpathtoscript   = dol_buildpath($pathtoscript, 0, 2);
 
+						if (empty($realpathtoapi)) 	// For compatibility with some old modules
+						{
+							$pathtoapi = strtolower($module).'/class/api_'.strtolower($module).'s.class.php';
+							$realpathtoapi = dol_buildpath($pathtoapi, 0, 2);
+						}
+
 						print '<div class="fichehalfleft">';
 						print '<span class="fa fa-file-o"></span> '.$langs->trans("ClassFile").' : <strong>'.($realpathtoclass?'':'<strike>').$pathtoclass.($realpathtoclass?'':'</strike>').'</strong>';
 						print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtoclass).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
@@ -1962,12 +1970,27 @@ elseif (! empty($module))
 						print '<br>';
 						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForAgendaTab").' : <strong>'.($realpathtoagenda?'':'<strike>').$pathtoagenda.($realpathtoagenda?'':'</strike>').'</strong>';
 						print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtoagenda).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+						if ($realpathtoagenda)
+						{
+							print ' &nbsp; ';
+							print '<a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=confirm_removefile&file='.urlencode($pathtoagenda).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
+						}
 						print '<br>';
 						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForDocumentTab").' : <strong>'.($realpathtodocument?'':'<strike>').$pathtodocument.($realpathtodocument?'':'</strike>').'</strong>';
 						print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtodocument).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+						if ($realpathtodocument)
+						{
+							print ' &nbsp; ';
+							print '<a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=confirm_removefile&file='.urlencode($pathtodocument).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
+						}
 						print '<br>';
 						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForNoteTab").' : <strong>'.($realpathtonote?'':'<strike>').$pathtonote.($realpathtonote?'':'</strike>').'</strong>';
 						print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtonote).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+						if ($realpathtonote)
+						{
+							print ' &nbsp; ';
+							print '<a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=confirm_removefile&file='.urlencode($pathtonote).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
+						}
 						print '<br>';
 
 						/* This is already on Tab CLI

From 0415edb8cd74b372af782d50d45f343d44fd4abe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 May 2019 16:17:32 +0200
Subject: [PATCH 23/30] Fix phpcs

---
 htdocs/admin/external_rss.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 7a82459f845..94abf8df2ab 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -168,8 +168,8 @@ if ($_POST["delete"])
         }
 
 
-		$result1=dolibarr_del_const($db,"EXTERNAL_RSS_TITLE_" . GETPOST("norss", 'int'), $conf->entity);
-		if ($result1) $result2=dolibarr_del_const($db,"EXTERNAL_RSS_URLRSS_" . GETPOST("norss", 'int'), $conf->entity);
+		$result1=dolibarr_del_const($db, "EXTERNAL_RSS_TITLE_".GETPOST("norss", 'int'), $conf->entity);
+		if ($result1) $result2=dolibarr_del_const($db, "EXTERNAL_RSS_URLRSS_".GETPOST("norss", 'int'), $conf->entity);
 
         if ($result1 && $result2)
         {

From bb864286638d2f8da492ae2184c43807015f4222 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 May 2019 16:20:30 +0200
Subject: [PATCH 24/30] Fix line too long

---
 scripts/bank/export-bank-receipts.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php
index 1fb0058610a..8fe3129a9f3 100755
--- a/scripts/bank/export-bank-receipts.php
+++ b/scripts/bank/export-bank-receipts.php
@@ -127,7 +127,21 @@ $objmodel = new $classname($db);
 $dirname = $conf->bank->dir_temp;
 $filename = 'export-bank-receipts-' . $bankref . '-' . $num . '.' . $objmodel->extension;
 
-$array_fields = array('bankreceipt' => $outputlangs->transnoentitiesnoconv("AccountStatementShort"),'bankaccount' => $outputlangs->transnoentitiesnoconv("BankAccount"),'dateop' => $outputlangs->transnoentitiesnoconv("DateOperationShort"),'dateval' => $outputlangs->transnoentitiesnoconv("DateValueShort"),'type' => $outputlangs->transnoentitiesnoconv("Type"),'description' => $outputlangs->transnoentitiesnoconv("Description"),'thirdparty' => $outputlangs->transnoentitiesnoconv("Tiers"),'accountelem' => $outputlangs->transnoentitiesnoconv("Piece"),'debit' => $outputlangs->transnoentitiesnoconv("Debit"),'credit' => $outputlangs->transnoentitiesnoconv("Credit"),'soldbefore' => $outputlangs->transnoentitiesnoconv("BankBalanceBefore"),'soldafter' => $outputlangs->transnoentitiesnoconv("BankBalanceAfter"),'comment' => $outputlangs->transnoentitiesnoconv("Comment"));
+$array_fields = array(
+	'bankreceipt' => $outputlangs->transnoentitiesnoconv("AccountStatementShort"),
+	'bankaccount' => $outputlangs->transnoentitiesnoconv("BankAccount"),
+	'dateop' => $outputlangs->transnoentitiesnoconv("DateOperationShort"),
+	'dateval' => $outputlangs->transnoentitiesnoconv("DateValueShort"),
+	'type' => $outputlangs->transnoentitiesnoconv("Type"),
+	'description' => $outputlangs->transnoentitiesnoconv("Description"),
+	'thirdparty' => $outputlangs->transnoentitiesnoconv("Tiers"),
+	'accountelem' => $outputlangs->transnoentitiesnoconv("Piece"),
+	'debit' => $outputlangs->transnoentitiesnoconv("Debit"),
+	'credit' => $outputlangs->transnoentitiesnoconv("Credit"),
+	'soldbefore' => $outputlangs->transnoentitiesnoconv("BankBalanceBefore"),
+	'soldafter' => $outputlangs->transnoentitiesnoconv("BankBalanceAfter"),
+	'comment' => $outputlangs->transnoentitiesnoconv("Comment")
+);
 $array_selected = array('bankreceipt' => 'bankreceipt','bankaccount' => 'bankaccount','dateop' => 'dateop','dateval' => 'dateval','type' => 'type','description' => 'description','thirdparty' => 'thirdparty','accountelem' => 'accountelem','debit' => 'debit','credit' => 'credit','soldbefore' => 'soldbefore','soldafter' => 'soldafter','comment' => 'comment');
 $array_export_TypeFields = array('bankreceipt' => 'Text','bankaccount' => 'Text','dateop' => 'Date','dateval' => 'Date','type' => 'Text','description' => 'Text','thirdparty' => 'Text','accountelem' => 'Text','debit' => 'Number','credit' => 'Number','soldbefore' => 'Number','soldafter' => 'Number','comment' => 'Text');
 

From 22e897b1a16846bd269b5af57d6b2bcacf89c040 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 May 2019 17:22:38 +0200
Subject: [PATCH 25/30] Clean and prepare code to fix a SQL injection

---
 htdocs/adherents/stats/index.php      |  3 +-
 htdocs/cashdesk/admin/cashdesk.php    |  2 +-
 htdocs/cashdesk/index.php             |  2 +-
 htdocs/cashdesk/tpl/menu.tpl.php      |  2 +-
 htdocs/comm/propal/stats/index.php    |  2 +-
 htdocs/commande/stats/index.php       |  2 +-
 htdocs/compta/facture/card.php        |  2 +-
 htdocs/core/class/html.form.class.php |  7 +--
 htdocs/don/stats/index.php            | 27 +++-----
 htdocs/expedition/stats/index.php     | 26 ++------
 htdocs/expensereport/stats/index.php  |  3 +-
 htdocs/fichinter/stats/index.php      |  2 +-
 htdocs/fourn/commande/card.php        |  4 +-
 htdocs/fourn/facture/card.php         |  2 +-
 htdocs/margin/customerMargins.php     |  6 +-
 htdocs/product/fournisseurs.php       |  2 +-
 htdocs/product/price.php              |  2 +-
 htdocs/projet/stats/index.php         | 10 ++-
 htdocs/projet/tasks/stats/index.php   |  4 +-
 htdocs/reception/stats/index.php      | 27 +++-----
 htdocs/societe/ajaxcompanies.php      |  2 +-
 htdocs/societe/card.php               |  2 +-
 htdocs/supplier_proposal/card.php     |  2 +-
 htdocs/takepos/admin/setup.php        | 91 ---------------------------
 htdocs/takepos/admin/terminal.php     |  2 +-
 htdocs/ticket/stats/index.php         | 12 ++--
 26 files changed, 55 insertions(+), 193 deletions(-)

diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index 4a7229af5ef..5cad21cdd71 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -151,8 +151,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 print '<table class="border" width="100%">';
 print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 print '<tr><td>'.$langs->trans("Member").'</td><td>';
-$filter='s.client in (1,2,3)';
-print $form->select_company($id,'memberid',$filter,1);
+print $form->select_company($id,'memberid','',1);
 print '</td></tr>';
 print '<tr><td>'.$langs->trans("User").'</td><td>';
 print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index 4fcb7450e9d..cdba572f96c 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -121,7 +121,7 @@ print "</tr>\n";
 
 print '<tr class="oddeven"><td width=\"50%\">'.$langs->trans("CashDeskThirdPartyForSell").'</td>';
 print '<td colspan="2">';
-print $form->select_company($conf->global->CASHDESK_ID_THIRDPARTY, 'socid', 's.client in (1,3) AND s.status = 1', 1, 0, 0, array(), 0);
+print $form->select_company($conf->global->CASHDESK_ID_THIRDPARTY, 'socid', '(s.client in (1,3) AND s.status = 1)', 1, 0, 0, array(), 0);
 print '</td></tr>';
 if (! empty($conf->banque->enabled))
 {
diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php
index 56da8496b9f..8bd64c76e2b 100644
--- a/htdocs/cashdesk/index.php
+++ b/htdocs/cashdesk/index.php
@@ -134,7 +134,7 @@ print '<td>';
 $disabled=0;
 $langs->load("companies");
 if (! empty($conf->global->CASHDESK_ID_THIRDPARTY)) $disabled=1; // If a particular third party is defined, we disable choice
-print $form->select_company(GETPOST('socid', 'int')?GETPOST('socid', 'int'):$conf->global->CASHDESK_ID_THIRDPARTY, 'socid', 's.client in (1,3) AND s.status = 1', !$disabled, $disabled, 1);
+print $form->select_company(GETPOST('socid', 'int')?GETPOST('socid', 'int'):$conf->global->CASHDESK_ID_THIRDPARTY, 'socid', '(s.client IN (1,3) AND s.status = 1)', !$disabled, $disabled, 1);
 //print '<input name="warehouse_id" class="texte_login" type="warehouse_id" value="" />';
 print '</td>';
 print "</tr>\n";
diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php
index d65a39fc6aa..bc8bb1bcaed 100644
--- a/htdocs/cashdesk/tpl/menu.tpl.php
+++ b/htdocs/cashdesk/tpl/menu.tpl.php
@@ -78,7 +78,7 @@ print '<li class="menu_choix0">'.$langs->trans("User").': '.$_SESSION['firstname
 print ' <a href="deconnexion.php">'.img_picto($langs->trans('Logout'), 'logout.png').'</a><br>';
 print '<form id="frmThirdparty" class="formulaire1 inline-block" method="post" action="facturation_verif.php?action=change_thirdparty">';
 print $langs->trans("CashDeskThirdParty").': ';
-print $form->select_company($_SESSION["CASHDESK_ID_THIRDPARTY"], 'CASHDESK_ID_THIRDPARTY', 's.client IN (1,3) AND s.status = 1', '', 0, 0, null, 0, 'valignmiddle inline-block');
+print $form->select_company($_SESSION["CASHDESK_ID_THIRDPARTY"], 'CASHDESK_ID_THIRDPARTY', '(s.client IN (1,3) AND s.status = 1)', '', 0, 0, null, 0, 'valignmiddle inline-block');
 print '<input class="button bouton_change_thirdparty inline-block valignmiddle" type="submit" id="bouton_change_thirdparty" value="'.$langs->trans("Modify").'">';
 //print $companyLink;
 print '<br>';
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index 48138246824..aa47f1c226d 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -252,7 +252,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 	// Company
 	print '<tr><td class="left">'.$langs->trans("ThirdParty").'</td><td class="left">';
-	$filter='s.client in (1,2,3)';
+	$filter='s.client IN (1,2,3)';
 	print $form->select_company($socid, 'socid', $filter, 1, 0, 0, array(), 0, '', 'style="width: 95%"');
 	print '</td></tr>';
 	// User
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 3a40f6b1863..81a477d07c5 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -264,7 +264,7 @@ 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 class="left">'.$langs->trans("ThirdParty").'</td><td class="left">';
-if ($mode == 'customer') $filter='s.client in (1,2,3)';
+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>';
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 894e14eefa7..722976890c0 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2736,7 +2736,7 @@ if ($action == 'create')
 	else
 	{
 		print '<td colspan="2">';
-		print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
+		print $form->select_company($soc->id, 'socid', '((s.client = 1 OR s.client = 3) AND s.status=1)', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// Option to reload page to retrieve customer informations. Note, this clear other input
 		if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
 		{
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e7d8742a3f5..0c22b463975 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1046,7 +1046,7 @@ class Form
 	 *
 	 *	@param	string	$selected       		Preselected type
 	 *	@param  string	$htmlname       		Name of field in form
-	 *  @param  string	$filter         		optional filters criteras (example: 's.rowid <> x', 's.client IN (1,3)')
+	 *  @param  string	$filter         		Optional filters criteras. WARNING: To avoid SQL injection, only few chars [.a-z0-9 =<>] are allowed here (example: 's.rowid <> x', 's.client IN (1,3)')
 	 *	@param	string	$showempty				Add an empty field (Can be '1' or text key to use on empty line like 'SelectThirdParty')
 	 * 	@param	int		$showtype				Show third party type in combolist (customer, prospect or supplier)
 	 * 	@param	int		$forcecombo				Force to load all values and output a standard combobox (with no beautification)
@@ -1080,7 +1080,7 @@ class Form
 				unset($societetmp);
 			}
 			// mode 1
-			$urloption='htmlname='.$htmlname.'&outjson=1&filter='.$filter.($showtype?'&showtype='.$showtype:'');
+			$urloption='htmlname='.urlencode($htmlname).'&outjson=1&filter='.urlencode($filter).($showtype?'&showtype='.urlencode($showtype):'');
 			$out.=  ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
 			$out.='<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';
 			if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';
@@ -1138,7 +1138,7 @@ class Form
 
 		// Clean $filter that may contains sql conditions so sql code
 		if (function_exists('testSqlAndScriptInject')) {
-			if (testSqlAndScriptInject($filter, 3)>0) {
+			if (testSqlAndScriptInject($filter, 3) > 0) {
 				$filter ='';
 			}
 		}
@@ -5704,7 +5704,6 @@ class Form
 		{
 			$objectdesc=$classname.':'.$classpath;
 			$urlforajaxcall = DOL_URL_ROOT.'/core/ajax/selectobject.php';
-			//if ($objecttmp->element == 'societe') $urlforajaxcall = DOL_URL_ROOT.'/societe/ajax/company.php';
 
 			// No immediate load of all database
 			$urloption='htmlname='.$htmlname.'&outjson=1&objectdesc='.$objectdesc.($moreparams?$moreparams:'');
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index cc25ea8ae7b..34c505cf849 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -64,7 +64,7 @@ print load_fiche_titre($langs->trans("StatisticsOfSendings"), $mesg);
 
 dol_mkdir($dir);
 
-$stats = new DonationStats($db, $socid, $mode, ($userid>0?$userid:0));
+$stats = new DonationStats($db, $socid, '', ($userid>0?$userid:0));
 
 // Build graphic number of object
 $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
@@ -75,14 +75,10 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 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
 {
     $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';
 }
 
 $px1 = new DolGraph();
@@ -121,14 +117,10 @@ $data = $stats->getAmountByMonthWithPrevYear($endyear,$startyear);
 if (!$user->rights->societe->client->voir || $user->societe_id)
 {
     $filenameamount = $dir.'/shipmentsamountinyear-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstats&file=shipmentsamountinyear-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstatssupplier&file=shipmentsamountinyear-'.$user->id.'-'.$year.'.png';
 }
 else
 {
     $filenameamount = $dir.'/shipmentsamountinyear-'.$year.'.png';
-    if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstats&file=shipmentsamountinyear-'.$year.'.png';
-    if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstatssupplier&file=shipmentsamountinyear-'.$year.'.png';
 }
 
 $px2 = new DolGraph();
@@ -164,14 +156,10 @@ $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 if (!$user->rights->societe->client->voir || $user->societe_id)
 {
     $filename_avg = $dir.'/shipmentsaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstats&file=shipmentsaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstatssupplier&file=shipmentsaverage-'.$user->id.'-'.$year.'.png';
 }
 else
 {
     $filename_avg = $dir.'/shipmentsaverage-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstats&file=shipmentsaverage-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstatssupplier&file=shipmentsaverage-'.$year.'.png';
 }
 
 $px3 = new DolGraph();
@@ -214,7 +202,7 @@ if (! count($arrayyears)) $arrayyears[$nowyear]=$nowyear;
 
 $h=0;
 $head = array();
-$head[$h][0] = DOL_URL_ROOT . '/don/stats/index.php?mode='.$mode;
+$head[$h][0] = DOL_URL_ROOT . '/don/stats/index.php';
 $head[$h][1] = $langs->trans("ByMonthYear");
 $head[$h][2] = 'byyear';
 $h++;
@@ -233,14 +221,13 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 //{
 	// Show filter box
 	print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="mode" value="'.$mode.'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
 	print '<table class="border" width="100%">';
 	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 	// Company
 	print '<tr><td class="left">'.$langs->trans("ThirdParty").'</td><td class="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 $form->select_company($socid, 'socid', '', 1, 0, 0, array(), 0, '', 'style="width: 95%"');
 	print '</td></tr>';
 	// User
 	print '<tr><td class="left">'.$langs->trans("CreatedBy").'</td><td class="left">';
@@ -276,7 +263,7 @@ foreach ($data as $val)
 	{ // If we have empty year
 		$oldyear--;
 		print '<tr height="24">';
-		print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.'">'.$oldyear.'</a></td>';
+		print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'">'.$oldyear.'</a></td>';
 
 		print '<td class="right">0</td>';
 		/*print '<td class="right">0</td>';
@@ -285,7 +272,7 @@ foreach ($data as $val)
 	}
 
 	print '<tr height="24">';
-	print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.'">'.$year.'</a></td>';
+	print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'">'.$year.'</a></td>';
 	print '<td class="right">'.$val['nb'].'</td>';
 	/*print '<td class="right">'.price(price2num($val['total'],'MT'),1).'</td>';
 	print '<td class="right">'.price(price2num($val['avg'],'MT'),1).'</td>';*/
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index c678c6d934d..7fb7f647258 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -63,7 +63,7 @@ print load_fiche_titre($langs->trans("StatisticsOfSendings"), $mesg);
 
 dol_mkdir($dir);
 
-$stats = new ExpeditionStats($db, $socid, $mode, ($userid>0?$userid:0));
+$stats = new ExpeditionStats($db, $socid, '', ($userid>0?$userid:0));
 
 // Build graphic number of object
 $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
@@ -74,14 +74,10 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 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
 {
     $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';
 }
 
 $px1 = new DolGraph();
@@ -120,14 +116,10 @@ $data = $stats->getAmountByMonthWithPrevYear($endyear,$startyear);
 if (!$user->rights->societe->client->voir || $user->societe_id)
 {
     $filenameamount = $dir.'/shipmentsamountinyear-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstats&file=shipmentsamountinyear-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstatssupplier&file=shipmentsamountinyear-'.$user->id.'-'.$year.'.png';
 }
 else
 {
     $filenameamount = $dir.'/shipmentsamountinyear-'.$year.'.png';
-    if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstats&file=shipmentsamountinyear-'.$year.'.png';
-    if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstatssupplier&file=shipmentsamountinyear-'.$year.'.png';
 }
 
 $px2 = new DolGraph();
@@ -163,14 +155,10 @@ $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 if (!$user->rights->societe->client->voir || $user->societe_id)
 {
     $filename_avg = $dir.'/shipmentsaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstats&file=shipmentsaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstatssupplier&file=shipmentsaverage-'.$user->id.'-'.$year.'.png';
 }
 else
 {
     $filename_avg = $dir.'/shipmentsaverage-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstats&file=shipmentsaverage-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstatssupplier&file=shipmentsaverage-'.$year.'.png';
 }
 
 $px3 = new DolGraph();
@@ -213,7 +201,7 @@ if (! count($arrayyears)) $arrayyears[$nowyear]=$nowyear;
 
 $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';
 $head[$h][1] = $langs->trans("ByMonthYear");
 $head[$h][2] = 'byyear';
 $h++;
@@ -232,15 +220,13 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 //{
 	// Show filter box
 	print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="mode" value="'.$mode.'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
 	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 class="left">'.$langs->trans("ThirdParty").'</td><td class="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 $form->select_company($socid, 'socid', '', 1, 0, 0, array(), 0, '', 'style="width: 95%"');
 	print '</td></tr>';
 	// User
 	print '<tr><td class="left">'.$langs->trans("CreatedBy").'</td><td class="left">';
@@ -279,7 +265,7 @@ foreach ($data as $val)
 
 
 		print '<tr class="oddeven" height="24">';
-		print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.'">'.$oldyear.'</a></td>';
+		print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'">'.$oldyear.'</a></td>';
 
 		print '<td class="right">0</td>';
 		/*print '<td class="right">0</td>';
@@ -289,7 +275,7 @@ foreach ($data as $val)
 
 	print '<tr class="oddeven" height="24">';
 	print '<td class="center">';
-	if ($year) print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.'">'.$year.'</a>';
+	if ($year) print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'">'.$year.'</a>';
 	else print $langs->trans("ValidationDateNotDefinedEvenIfShipmentValidated");
 	print '</td>';
 	print '<td class="right">'.$val['nb'].'</td>';
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index 2be1409bd45..d79dd624e4f 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -221,8 +221,7 @@ print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->tra
 // Company
 /*
 print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
-$filter='';
-print $form->select_company($socid,'socid',$filter,1,1,0,array(),0,'','style="width: 95%"');
+print $form->select_company($socid,'socid','',1,1,0,array(),0,'','style="width: 95%"');
 print '</td></tr>';
 */
 // User
diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php
index 824dfff8c84..9b0ceb754ee 100644
--- a/htdocs/fichinter/stats/index.php
+++ b/htdocs/fichinter/stats/index.php
@@ -234,7 +234,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 	// Company
 	print '<tr><td class="left">'.$langs->trans("ThirdParty").'</td><td class="left">';
-    $filter = 's.client in (1,2,3)';
+    $filter = 's.client IN (1,2,3)';
 	print $form->select_company($socid, 'socid', $filter, 1, 0, 0, array(), 0, '', 'style="width: 95%"');
 	print '</td></tr>';
 	// User
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 98048552911..da2930ed667 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1545,7 +1545,7 @@ if ($action=='create')
 	}
 	else
 	{
-		print $form->select_company((empty($socid)?'':$socid), 'socid', 's.fournisseur = 1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
+		print $form->select_company((empty($socid)?'':$socid), 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// reload page to retrieve customer informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE))
 		{
@@ -1895,7 +1895,7 @@ elseif (! empty($object->id))
         $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '">';
         $morehtmlref .= '<input type="hidden" name="action" value="set_thirdparty">';
         $morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-        $morehtmlref .= $form->select_company($object->thirdparty->id, 'new_socid', 's.fournisseur = 1', '', 0, 0, array(), 0, 'minwidth300');
+        $morehtmlref .= $form->select_company($object->thirdparty->id, 'new_socid', 's.fournisseur=1', '', 0, 0, array(), 0, 'minwidth300');
         $morehtmlref .= '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';
         $morehtmlref .= '</form>';
     }
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index f7a1c800443..5ec65444746 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1741,7 +1741,7 @@ if ($action == 'create')
 	}
 	else
 	{
-		print $form->select_company($societe->id, 'socid', 's.fournisseur = 1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
+		print $form->select_company($societe->id, 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// reload page to retrieve supplier informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE))
 		{
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 7a3777ecfb5..b3a2c59e63f 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -99,8 +99,7 @@ if ($socid > 0) {
 	{
 		print '<tr><td class="titlefield">'.$langs->trans('ThirdPartyName').'</td>';
 		print '<td class="maxwidthonsmartphone" colspan="4">';
-		print $form->select_company($socid, 'socid', 'client=1 OR client=3', 1, 0, 0);
-		//$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$socid,$socid,'socid','client=1 OR client=3',1,0,1);
+		print $form->select_company($socid, 'socid', '(client=1 OR client=3)', 1, 0, 0);
 		print '</td></tr>';
 
 		$client = true;
@@ -111,8 +110,7 @@ if ($socid > 0) {
 else {
 	print '<tr><td class="titlefield">'.$langs->trans('ThirdPartyName').'</td>';
 	print '<td class="maxwidthonsmartphone" colspan="4">';
-	print $form->select_company(null, 'socid', 'client=1 OR client=3', 1, 0, 0);
-	//$form->form_thirdparty($_SERVER['PHP_SELF'],null,'socid','client=1 OR client=3',1,0,1);
+	print $form->select_company(null, 'socid', '(client=1 OR client=3)', 1, 0, 0);
 	print '</td></tr>';
 }
 
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 6d43e4d4a3f..dbcdec666e3 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -440,7 +440,7 @@ if ($id > 0 || $ref)
 				{
 					$events=array();
 					$events[]=array('method' => 'getVatRates', 'url' => dol_buildpath('/core/ajax/vatrates.php', 1), 'htmlname' => 'tva_tx', 'params' => array());
-					print $form->select_company(GETPOST("id_fourn"), 'id_fourn', 'fournisseur=1', 'SelectThirdParty', 0, 0, $events);
+					print $form->select_company(GETPOST("id_fourn", 'alpha'), 'id_fourn', 'fournisseur=1', 'SelectThirdParty', 0, 0, $events);
 
 					$parameters=array('filtre'=>"fournisseur=1",'html_name'=>'id_fourn','selected'=>GETPOST("id_fourn"),'showempty'=>1,'prod_id'=>$object->id);
 				    $reshook=$hookmanager->executeHooks('formCreateThirdpartyOptions', $parameters, $object, $action);
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index ccde05d1e24..5b5b9ad48fa 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1666,7 +1666,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '<tr>';
 		print '<td class="fieldrequired">' . $langs->trans('ThirdParty') . '</td>';
 		print '<td>';
-		print $form->select_company('', 'socid', 's.client in (1,2,3)', 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
+		print $form->select_company('', 'socid', 's.client IN (1,2,3)', 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
 		print '</td>';
 		print '</tr>';
 
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
index e7e06e93352..cfacde6566b 100644
--- a/htdocs/projet/stats/index.php
+++ b/htdocs/projet/stats/index.php
@@ -264,7 +264,7 @@ if (! count($arrayyears)) $arrayyears[$nowyear]=$nowyear;
 
 $h=0;
 $head = array();
-$head[$h][0] = DOL_URL_ROOT . '/projet/stats/index.php?mode='.$mode;
+$head[$h][0] = DOL_URL_ROOT . '/projet/stats/index.php';
 $head[$h][1] = $langs->trans("ByMonthYear");
 $head[$h][2] = 'byyear';
 $h++;
@@ -282,9 +282,7 @@ 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>'.$langs->trans("ThirdParty").'</td><td>';
-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 $form->select_company($socid, 'socid', '', 1, 0, 0, array(), 0, '', 'style="width: 95%"');
 print '</td></tr>';
 // User
 /*print '<tr><td>'.$langs->trans("ProjectCommercial").'</td><td>';
@@ -324,7 +322,7 @@ foreach ($data_all_year as $val)
 		$oldyear--;
 
 		print '<tr class="oddeven" height="24">';
-		print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
+		print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
 		if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 		{
 			print '<td class="right">0</td>';
@@ -336,7 +334,7 @@ foreach ($data_all_year as $val)
 	}
 
 	print '<tr class="oddeven" height="24">';
-	print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
+	print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
 	print '<td class="right">'.$val['nb'].'</td>';
 	if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 	{
diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php
index 6a715f5030e..3cae0571e6a 100644
--- a/htdocs/projet/tasks/stats/index.php
+++ b/htdocs/projet/tasks/stats/index.php
@@ -146,9 +146,7 @@ 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>'.$langs->trans("ThirdParty").'</td><td>';
-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 $form->select_company($socid,'socid','',1,0,0,array(),0,'','style="width: 95%"');
 print '</td></tr>';
 */
 // User
diff --git a/htdocs/reception/stats/index.php b/htdocs/reception/stats/index.php
index 94e77c3c4b5..cbffa3ef177 100644
--- a/htdocs/reception/stats/index.php
+++ b/htdocs/reception/stats/index.php
@@ -52,6 +52,7 @@ $langs->load("other");
 $langs->load("companies");
 
 
+
 /*
  * View
  */
@@ -65,7 +66,7 @@ print load_fiche_titre($langs->trans("StatisticsOfReceptions"), $mesg);
 
 dol_mkdir($dir);
 
-$stats = new ReceptionStats($db, $socid, $mode, ($userid>0?$userid:0));
+$stats = new ReceptionStats($db, $socid, '', ($userid>0?$userid:0));
 
 // Build graphic number of object
 $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
@@ -76,14 +77,10 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 if (!$user->rights->societe->client->voir || $user->societe_id)
 {
     $filenamenb = $dir.'/receptionsnbinyear-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=receptionstats&file=receptionsnbinyear-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=receptionstatssupplier&file=receptionsnbinyear-'.$user->id.'-'.$year.'.png';
 }
 else
 {
     $filenamenb = $dir.'/receptionsnbinyear-'.$year.'.png';
-    if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=receptionstats&file=receptionsnbinyear-'.$year.'.png';
-    if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=receptionstatssupplier&file=receptionsnbinyear-'.$year.'.png';
 }
 
 $px1 = new DolGraph();
@@ -122,14 +119,10 @@ $data = $stats->getAmountByMonthWithPrevYear($endyear,$startyear);
 if (!$user->rights->societe->client->voir || $user->societe_id)
 {
     $filenameamount = $dir.'/receptionsamountinyear-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=receptionstats&file=receptionsamountinyear-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=receptionstatssupplier&file=receptionsamountinyear-'.$user->id.'-'.$year.'.png';
 }
 else
 {
     $filenameamount = $dir.'/receptionsamountinyear-'.$year.'.png';
-    if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=receptionstats&file=receptionsamountinyear-'.$year.'.png';
-    if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=receptionstatssupplier&file=receptionsamountinyear-'.$year.'.png';
 }
 
 $px2 = new DolGraph();
@@ -165,14 +158,10 @@ $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 if (!$user->rights->societe->client->voir || $user->societe_id)
 {
     $filename_avg = $dir.'/receptionsaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=receptionstats&file=receptionsaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=receptionstatssupplier&file=receptionsaverage-'.$user->id.'-'.$year.'.png';
 }
 else
 {
     $filename_avg = $dir.'/receptionsaverage-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=receptionstats&file=receptionsaverage-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=receptionstatssupplier&file=receptionsaverage-'.$year.'.png';
 }
 
 $px3 = new DolGraph();
@@ -215,7 +204,7 @@ if (! count($arrayyears)) $arrayyears[$nowyear]=$nowyear;
 
 $h=0;
 $head = array();
-$head[$h][0] = DOL_URL_ROOT . '/commande/stats/index.php?mode='.$mode;
+$head[$h][0] = DOL_URL_ROOT . '/commande/stats/index.php';
 $head[$h][1] = $langs->trans("ByMonthYear");
 $head[$h][2] = 'byyear';
 $h++;
@@ -234,15 +223,13 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 //{
 	// Show filter box
 	print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="mode" value="'.$mode.'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
 	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 class="left">'.$langs->trans("ThirdParty").'</td><td class="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 $form->select_company($socid, 'socid', '', 1, 0, 0, array(), 0, '', 'style="width: 95%"');
 	print '</td></tr>';
 	// User
 	print '<tr><td class="left">'.$langs->trans("CreatedBy").'</td><td class="left">';
@@ -279,7 +266,7 @@ foreach ($data as $val)
 
 
 		print '<tr class="oddeven" height="24">';
-		print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.'">'.$oldyear.'</a></td>';
+		print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'">'.$oldyear.'</a></td>';
 
 		print '<td class="right">0</td>';
 		/*print '<td class="right">0</td>';
@@ -289,7 +276,7 @@ foreach ($data as $val)
 
 	print '<tr class="oddeven" height="24">';
 	print '<td class="center">';
-	if ($year) print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.'">'.$year.'</a>';
+	if ($year) print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'">'.$year.'</a>';
 	else print $langs->trans("ValidationDateNotDefinedEvenIfReceptionValidated");
 	print '</td>';
 	print '<td class="right">'.$val['nb'].'</td>';
diff --git a/htdocs/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php
index a5d88de422a..acf10428717 100644
--- a/htdocs/societe/ajaxcompanies.php
+++ b/htdocs/societe/ajaxcompanies.php
@@ -81,7 +81,7 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
 		if (! empty($conf->global->SOCIETE_ALLOW_SEARCH_ON_ROWID)) $sql.=" OR rowid = '" . $db->escape($socid) . "'";
 		$sql.=")";
 	}
-	//if (GETPOST("filter")) $sql.= " AND ".GETPOST("filter", "alpha"); // Add other filters
+	//if (GETPOST("filter")) $sql.= " AND (".GETPOST("filter", "alpha").")"; // Add other filters
 	$sql.= " ORDER BY nom ASC";
 
 	//dol_syslog("ajaxcompanies", LOG_DEBUG);
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 0cf2ae21790..af134dcd354 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2213,7 +2213,7 @@ else
 				    'name' => 'soc_origin',
 			    	'label' => $langs->trans('MergeOriginThirdparty'),
 				    'type' => 'other',
-				    'value' => $form->select_company('', 'soc_origin', 's.rowid != '.$object->id, 'SelectThirdParty', 0, 0, array(), 0, 'minwidth200')
+				    'value' => $form->select_company('', 'soc_origin', 's.rowid <> '.$object->id, 'SelectThirdParty', 0, 0, array(), 0, 'minwidth200')
 			    )
 		    );
 
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index f52a846f4c2..56473959a39 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1083,7 +1083,7 @@ if ($action == 'create')
 		print '</td>';
 	} else {
 		print '<td colspan="2">';
-		print $form->select_company('', 'socid', 's.fournisseur = 1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
+		print $form->select_company('', 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&client=0&fournisseur=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="valignmiddle text-plus-circle">'.$langs->trans("AddThirdParty").'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
 		print '</td>';
 	}
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index b685d9e97d2..f331587723b 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -64,21 +64,6 @@ if (GETPOST('action', 'alpha') == 'set')
 	$db->begin();
 	if (GETPOST('socid', 'int') < 0) $_POST["socid"]='';
 
-	/*
-	$res = dolibarr_set_const($db, "CASHDESK_ID_THIRDPARTY", (GETPOST('socid', 'int') > 0 ? GETPOST('socid', 'int') : ''), 'chaine', 0, '', $conf->entity);
-
-    $res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CASH", (GETPOST('CASHDESK_ID_BANKACCOUNT_CASH', 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CASH', 'alpha') : ''), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CHEQUE", (GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE', 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE', 'alpha') : ''), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CB", (GETPOST('CASHDESK_ID_BANKACCOUNT_CB', 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CB', 'alpha') : ''), 'chaine', 0, '', $conf->entity);
-    foreach($paiements as $modep) {
-        if (in_array($modep->code, array('LIQ', 'CB', 'CHQ'))) continue;
-		$name="CASHDESK_ID_BANKACCOUNT_".$modep->code;
-		$res = dolibarr_set_const($db, $name, (GETPOST($name, 'alpha') > 0 ? GETPOST($name, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
-    }
-	$res = dolibarr_set_const($db, "CASHDESK_ID_WAREHOUSE", (GETPOST('CASHDESK_ID_WAREHOUSE', 'alpha') > 0 ? GETPOST('CASHDESK_ID_WAREHOUSE', 'alpha') : ''), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", GETPOST('CASHDESK_NO_DECREASE_STOCK', 'alpha'), 'chaine', 0, '', $conf->entity);
-    */
-
 	$res = dolibarr_set_const($db, "CASHDESK_SERVICES", GETPOST('CASHDESK_SERVICES', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_ROOT_CATEGORY_ID", GETPOST('TAKEPOS_ROOT_CATEGORY_ID', 'alpha'), 'chaine', 0, '', $conf->entity);
 
@@ -270,82 +255,6 @@ print '</table>';
 
 print '<br>';
 
-/*
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-if (!$conf->global->TAKEPOS_NUM_TERMINALS || $conf->global->TAKEPOS_NUM_TERMINALS=="1") print '<td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
-else print '<td>'.$langs->trans("Terminal").' 1</td><td>'.$langs->trans("Value").'</td>';
-print "</tr>\n";
-
-print '<tr class="oddeven"><td width=\"50%\">'.$langs->trans("CashDeskThirdPartyForSell").'</td>';
-print '<td colspan="2">';
-print $form->select_company($conf->global->CASHDESK_ID_THIRDPARTY, 'socid', 's.client in (1, 3) AND s.status = 1', 1, 0, 0, array(), 0);
-print '</td></tr>';
-if (! empty($conf->banque->enabled))
-{
-    print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForSell").'</td>';
-	print '<td colspan="2">';
-	$form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CASH, 'CASHDESK_ID_BANKACCOUNT_CASH', 0, "courant=2", 1);
-	print '</td></tr>';
-	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForCheque").'</td>';
-	print '<td colspan="2">';
-	$form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE, 'CASHDESK_ID_BANKACCOUNT_CHEQUE', 0, "courant=1", 1);
-	print '</td></tr>';
-	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForCB").'</td>';
-	print '<td colspan="2">';
-	$form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CB, 'CASHDESK_ID_BANKACCOUNT_CB', 0, "courant=1", 1);
-	print '</td></tr>';
-
-	foreach($paiements as $modep) {
-        if (in_array($modep->code, array('LIQ', 'CB', 'CHQ'))) continue;
-		$name="CASHDESK_ID_BANKACCOUNT_".$modep->code;
-		print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountFor").' '.$langs->trans($modep->libelle).'</td>';
-		print '<td colspan="2">';
-		$cour=preg_match('|^LIQ.*|', $modep->code)?2:1;
-		$form->select_comptes($conf->global->$name, $name, 0, "courant=".$cour, 1);
-		print '</td></tr>';
-	}
-}
-
-if (! empty($conf->stock->enabled))
-{
-
-	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskDoNotDecreaseStock").'</td>';	// Force warehouse (this is not a default value)
-	print '<td colspan="2">';
-	if (empty($conf->productbatch->enabled)) {
-	   print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK', $conf->global->CASHDESK_NO_DECREASE_STOCK, 1);
-	}
-	else
-	{
-	    if (!$conf->global->CASHDESK_NO_DECREASE_STOCK) {
-	       $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", 1, 'chaine', 0, '', $conf->entity);
-	    }
-	    print $langs->trans("Yes").'<br>';
-	    print '<span class="opacitymedium">'.$langs->trans('StockDecreaseForPointOfSaleDisabledbyBatch').'</span>';
-	}
-	print '</td></tr>';
-
-	$disabled=$conf->global->CASHDESK_NO_DECREASE_STOCK;
-
-
-	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskIdWareHouse").'</td>';	// Force warehouse (this is not a default value)
-	print '<td colspan="2">';
-	if (! $disabled)
-	{
-		print $formproduct->selectWarehouses($conf->global->CASHDESK_ID_WAREHOUSE, 'CASHDESK_ID_WAREHOUSE', '', 1, $disabled);
-		print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">('.$langs->trans("Create").')</a>';
-	}
-	else
-	{
-		print '<span class="opacitymedium">'.$langs->trans("StockDecreaseForPointOfSaleDisabled").'</span>';
-	}
-	print '</td></tr>';
-}
-
-print '</table>';
-print '<br>';
-*/
-
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
 
 print "</form>\n";
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index 66a8a90f528..2b29f46120d 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -127,7 +127,7 @@ print "</tr>\n";
 
 print '<tr class="oddeven"><td width=\"50%\">'.$langs->trans("CashDeskThirdPartyForSell").'</td>';
 print '<td colspan="2">';
-print $form->select_company($conf->global->{'CASHDESK_ID_THIRDPARTY'.$terminaltouse}, 'socid', 's.client in (1, 3) AND s.status = 1', 1, 0, 0, array(), 0);
+print $form->select_company($conf->global->{'CASHDESK_ID_THIRDPARTY'.$terminaltouse}, 'socid', '(s.client IN (1, 3) AND s.status = 1)', 1, 0, 0, array(), 0);
 print '</td></tr>';
 if (! empty($conf->banque->enabled))
 {
diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php
index de4ad035faf..3990540ab9d 100644
--- a/htdocs/ticket/stats/index.php
+++ b/htdocs/ticket/stats/index.php
@@ -214,7 +214,7 @@ if (! count($arrayyears)) $arrayyears[$nowyear]=$nowyear;
 
 $h=0;
 $head = array();
-$head[$h][0] = DOL_URL_ROOT . '/ticket/stats/index.php?mode='.$mode;
+$head[$h][0] = DOL_URL_ROOT . '/ticket/stats/index.php';
 $head[$h][1] = $langs->trans("ByMonthYear");
 $head[$h][2] = 'byyear';
 $h++;
@@ -231,12 +231,14 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 // Show filter box
 print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-print '<input type="hidden" name="mode" value="'.$mode.'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+
 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 class="left">'.$langs->trans("ThirdParty").'</td><td class="left">';
-print $form->select_company($socid, 'socid', $filter, 1, 0, 0, array(), 0, '', 'style="width: 95%"');
+print $form->select_company($socid, 'socid', '', 1, 0, 0, array(), 0, '', 'style="width: 95%"');
 print '</td></tr>';
 // User
 print '<tr><td class="left">'.$langs->trans("CreatedBy").'</td><td class="left">';
@@ -280,7 +282,7 @@ foreach ($data as $val)
 		$oldyear--;
 
 		print '<tr class="oddeven" height="24">';
-		print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
+		print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
 		print '<td class="right">0</td>';
 		print '<td class="right"></td>';
 		//print '<td class="right">0</td>';
@@ -292,7 +294,7 @@ foreach ($data as $val)
 
 
 	print '<tr class="oddeven" height="24">';
-	print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
+	print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
 	print '<td class="right">'.$val['nb'].'</td>';
 	print '<td class="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['nb_diff']).'</td>';
 	//print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';

From bfa4483722b510f028e60492783b9e90e128374e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 May 2019 17:41:41 +0200
Subject: [PATCH 26/30] More robust test against sql injections

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index a7d0669db22..b0d34db43eb 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -91,7 +91,7 @@ function testSqlAndScriptInject($val, $type)
 	}
 	if ($type == 3)
 	{
-		$inj += preg_match('/select|update|delete|replace|group\s+by|concat|count|from/i', $val);
+		$inj += preg_match('/select|update|delete|truncate|replace|group\s+by|concat|count|from|union/i', $val);
 	}
 	if ($type != 2)	// Not common key strings, so we can check them both on GET and POST
 	{

From dcf77520eae3c82b044ebbba0a1744cd9c085497 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 May 2019 21:16:06 +0200
Subject: [PATCH 27/30] FIX Error management when MAILING_NO_USING_PHPMAIL is
 set

---
 htdocs/comm/mailing/card.php          |  4 ++--
 htdocs/core/class/CMailFile.class.php | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 97746ad9d82..ce5fff9c543 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -471,13 +471,13 @@ if (empty($reshook))
 			if ($result)
 			{
 				setEventMessages($langs->trans("MailSuccessfulySent",$mailfile->getValidAddress($object->email_from,2),$mailfile->getValidAddress($object->sendto,2)), null, 'mesgs');
+				$action = '';
 			}
 			else
 			{
 				setEventMessages($langs->trans("ResultKo").'<br>'.$mailfile->error.' '.$result, null, 'errors');
+				$action = 'test';
 			}
-
-			$action='';
 		}
 	}
 
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index facc8104740..6401d4ce903 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -517,6 +517,31 @@ class CMailFile
 				return true;
 			}
 
+			$sendingmode = $this->sendmode;
+			if (! empty($conf->global->MAILING_NO_USING_PHPMAIL) && $sendingmode == 'mail')
+			{
+			    // List of sending methods
+			    $listofmethods=array();
+			    $listofmethods['mail']='PHP mail function';
+			    //$listofmethods['simplemail']='Simplemail class';
+			    $listofmethods['smtps']='SMTP/SMTPS socket library';
+
+			    // EMailing feature may be a spam problem, so when you host several users/instance, having this option may force each user to use their own SMTP agent.
+			    // You ensure that every user is using its own SMTP server when using the mass emailing module.
+			    $linktoadminemailbefore='';
+			    $linktoadminemailend='';
+			    $this->error = $langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]);
+			    $this->errors[] = $langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]);
+			    $this->error .= '<br>'.$langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']);
+			    $this->errors[] = $langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']);
+			    if (! empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS))
+			    {
+			        $this->error .= '<br>'.$langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS);
+			        $this->errors[] = $langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS);
+			    }
+                return false;
+			}
+
 			// Check number of recipient is lower or equal than MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL
 			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL=10;
 			$tmparray1 = explode(',', $this->addr_to);

From c3b9c08219df2bd0ef6a08918d6f818e49b41faf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 May 2019 21:36:48 +0200
Subject: [PATCH 28/30] CSS

---
 htdocs/comm/mailing/card.php     | 4 ++--
 htdocs/comm/mailing/cibles.php   | 5 ++---
 htdocs/theme/eldy/badges.inc.php | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 1310bf621df..9f31e8f64c1 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -746,7 +746,7 @@ if ($action == 'create')
 
 	dol_fiche_head();
 
-	print '<table class="border" width="100%">';
+	print '<table class="border centpercent">';
 	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("MailTitle").'</td><td><input class="flat minwidth300" name="titre" value="'.dol_escape_htmltag(GETPOST('titre')).'" autofocus="autofocus"></td></tr>';
 	print '<tr><td class="fieldrequired">'.$langs->trans("MailFrom").'</td><td><input class="flat minwidth200" name="from" value="'.$conf->global->MAILING_EMAIL_FROM.'"></td></tr>';
 	print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td><input class="flat minwidth200" name="errorsto" value="'.(!empty($conf->global->MAILING_EMAIL_ERRORSTO)?$conf->global->MAILING_EMAIL_ERRORSTO:$conf->global->MAIN_MAIL_ERRORS_TO).'"></td></tr>';
@@ -893,7 +893,7 @@ else
 			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
 
-			print '<table class="border" width="100%">';
+			print '<table class="border centpercent tableforfield">';
 
 			// Description
 			print '<tr><td class="titlefield">'.$form->editfieldkey("MailTitle", 'titre', $object->titre, $object, $user->rights->mailing->creer && $object->statut < 3, 'string').'</td><td colspan="3">';
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 619f61bdc67..61e49c4f180 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -196,7 +196,7 @@ if ($object->fetch($id) >= 0)
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-	print '<table class="border" width="100%">';
+	print '<table class="border centpercent tableforfield">';
 
 	print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
 
@@ -432,7 +432,6 @@ if ($object->fetch($id) >= 0)
 	$resql=$db->query($sql);
 	if ($resql)
 	{
-
 		$num = $db->num_rows($resql);
 
 		$param = "&amp;id=".$object->id;
@@ -471,7 +470,7 @@ if ($object->fetch($id) >= 0)
 		if ($page)	$param.= "&amp;page=".$page;
 
 		print '<div class="div-table-responsive">';
-		print '<table class="noborder" width="100%">';
+		print '<table class="noborder centpercent">';
 
 		// Ligne des champs de filtres
 		print '<tr class="liste_titre_filter">';
diff --git a/htdocs/theme/eldy/badges.inc.php b/htdocs/theme/eldy/badges.inc.php
index ab4be871d7c..984315b0bde 100644
--- a/htdocs/theme/eldy/badges.inc.php
+++ b/htdocs/theme/eldy/badges.inc.php
@@ -23,8 +23,8 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 }
 
 .badge-pill, .tabs .badge {
-    padding-right: .6em;
-    padding-left: .6em;
+    padding-right: .5em;
+    padding-left: .5em;
     border-radius: 0.25rem;
 }
 

From a93cbd4320d2ad05a7ebb95b0a5a1b35bef817cc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 May 2019 21:47:25 +0200
Subject: [PATCH 29/30] FIX Look and feel v10

---
 htdocs/comm/mailing/cibles.php | 41 +++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 61e49c4f180..3cc5f12566d 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -130,13 +130,12 @@ if ($action == 'delete')
 	$resql=$db->query($sql);
 	if ($resql)
 	{
-		if (!empty($id))
+		if (! empty($id))
 		{
 			$obj = new MailingTargets($db);
 			$obj->update_nb($id);
 
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-			exit;
+			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 		}
 		else
 		{
@@ -532,6 +531,15 @@ if ($object->fetch($id) >= 0)
 
 		if ($num)
 		{
+			include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+			$objectstaticmember=new Adherent($db);
+			$objectstaticuser=new User($db);
+			$objectstaticcompany=new Societe($db);
+			$objectstaticcontact=new Contact($db);
+
 			while ($i < min($num, $limit))
 			{
 				$obj = $db->fetch_object($resql);
@@ -550,32 +558,23 @@ if ($object->fetch($id) >= 0)
                 {
                     if ($obj->source_type == 'member')
                     {
-                        include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-                        $objectstatic=new Adherent($db);
-						$objectstatic->fetch($obj->source_id);
-                        print $objectstatic->getNomUrl(1);
+						$objectstaticmember->fetch($obj->source_id);
+                        print $objectstaticmember->getNomUrl(1);
                     }
                     elseif ($obj->source_type == 'user')
                     {
-                        include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-                        $objectstatic=new User($db);
-						$objectstatic->fetch($obj->source_id);
-                        $objectstatic->id=$obj->source_id;
-                        print $objectstatic->getNomUrl(1);
+						$objectstaticuser->fetch($obj->source_id);
+                        print $objectstaticuser->getNomUrl(1);
                     }
                     elseif ($obj->source_type == 'thirdparty')
                     {
-                        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-                        $objectstatic=new Societe($db);
-						$objectstatic->fetch($obj->source_id);
-                        print $objectstatic->getNomUrl(1);
+						$objectstaticcompany->fetch($obj->source_id);
+                        print $objectstaticcompany->getNomUrl(1);
                     }
                     elseif ($obj->source_type == 'contact')
                     {
-                    	include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-                    	$objectstatic=new Contact($db);
-                    	$objectstatic->fetch($obj->source_id);
-                    	print $objectstatic->getNomUrl(1);
+                    	$objectstaticcontact->fetch($obj->source_id);
+                    	print $objectstaticcontact->getNomUrl(1);
                     }
                     else
                     {
@@ -604,7 +603,7 @@ if ($object->fetch($id) >= 0)
 				if ($obj->statut == 0)	// Not sent yet
 				{
 					if ($user->rights->mailing->creer && $allowaddtarget) {
-						print '<a href="'.$_SERVER['PHP_SELF'].'?action=delete&rowid='.$obj->rowid.$param.'">'.img_delete($langs->trans("RemoveRecipient")).'</a>';
+						print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=delete&rowid='.$obj->rowid.$param.'">'.img_delete($langs->trans("RemoveRecipient")).'</a>';
 					}
 				}
 				/*if ($obj->statut == -1)	// Sent with error

From 5707aff7c494f787d0083f352144060ce22dd15d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 May 2019 21:52:04 +0200
Subject: [PATCH 30/30] Look and feel v10

---
 htdocs/admin/mails.php                | 2 +-
 htdocs/admin/mails_emailing.php       | 2 +-
 htdocs/core/class/CMailFile.class.php | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index d74f10ca58c..bc12fd5ddd6 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -519,7 +519,7 @@ else
 {
 	dol_fiche_head($head, 'common', '', -1);
 
-	print $langs->trans("EMailsDesc")."<br>\n";
+	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
 	print "<br>\n";
 
 	print '<table class="noborder" width="100%">';
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index 4ce8d8c0b72..1e54fdea3dd 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -396,7 +396,7 @@ else
 {
     dol_fiche_head($head, 'common_emailing', '', -1);
 
-    print $langs->trans("EMailsDesc")."<br>\n";
+    print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
     print "<br>\n";
 
 	print '<table class="noborder" width="100%">';
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index d701234336c..a58a768eace 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -516,8 +516,8 @@ class CMailFile
 
 			    // EMailing feature may be a spam problem, so when you host several users/instance, having this option may force each user to use their own SMTP agent.
 			    // You ensure that every user is using its own SMTP server when using the mass emailing module.
-			    $linktoadminemailbefore='';
-			    $linktoadminemailend='';
+			    $linktoadminemailbefore='<a href="'.DOL_URL_ROOT.'/admin/mails.php">';
+			    $linktoadminemailend='</a>';
 			    $this->error = $langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]);
 			    $this->errors[] = $langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]);
 			    $this->error .= '<br>'.$langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']);