From 090b0e90d20aceed65805bd0950dd45703142f37 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Feb 2020 23:52:48 +0100
Subject: [PATCH 01/69] FIX #13183

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

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index c5d1d7837e9..b5cf6e4c9dd 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -5024,7 +5024,7 @@ function migrate_users_socialnetworks()
                 $obj->socialnetworks = '[]';
             }
             $socialnetworks = array_merge($arraysocialnetworks, json_decode($obj->socialnetworks, true));
-            $sqlupd = 'UPDATE '.MAIN_DB_PREFIX.'user SET socialnetworks="'.$db->escape(json_encode($socialnetworks, true)).'"';
+            $sqlupd = 'UPDATE '.MAIN_DB_PREFIX."user SET socialnetworks='".$db->escape(json_encode($socialnetworks, true))."'";
             $sqlupd.= ', skype=null';
             $sqlupd.= ', twitter=null';
             $sqlupd.= ', facebook=null';

From 6366881f91e0a14cd3f9d02b5a8c3ad22448a95d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 00:41:25 +0100
Subject: [PATCH 02/69] FIX #13175

---
 .../bank/account_statement_document.php       |  6 +--
 htdocs/compta/bank/releve.php                 |  2 +-
 htdocs/core/photos_resize.php                 | 49 ++++++++++++-------
 .../tpl/document_actions_post_headers.tpl.php |  3 +-
 4 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/htdocs/compta/bank/account_statement_document.php b/htdocs/compta/bank/account_statement_document.php
index 08447216dda..bdb3ac4620e 100644
--- a/htdocs/compta/bank/account_statement_document.php
+++ b/htdocs/compta/bank/account_statement_document.php
@@ -137,9 +137,9 @@ if ($id > 0 || !empty($ref)) {
 		$modulepart = 'bank';
 		$permission = $user->rights->banque->modifier;
 		$permtoedit = $user->rights->banque->modifier;
-		$param = '&id='.$object->id.'&num='.$num;
-		$uri = '&num='.$num;
-		$relativepathwithnofile = $id."/statement/".$num."/";
+		$param = '&id='.$object->id.'&num='.urlencode($num);
+		$moreparam = '&num='.urlencode($num);;
+		$relativepathwithnofile = $id."/statement/".dol_sanitizeFileName($num)."/";
 		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 	}
 	else {
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 9ae1d5d7d83..a16927bda0b 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -49,7 +49,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 $langs->loadLangs(array("banks", "categories", "companies", "bills", "trips", "donations", "loan"));
 
 $action = GETPOST('action', 'alpha');
-$id = GETPOST('account', 'int');
+$id = GETPOST('account', 'int') ? GETPOST('account', 'int') : GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $dvid = GETPOST('dvid', 'alpha');
 $numref = GETPOST('num', 'alpha');
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 17c7cb9e974..dd59b20c964 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -38,6 +38,10 @@ $original_file = GETPOST("file");
 $backtourl = GETPOST('backtourl');
 $cancel = GETPOST('cancel', 'alpha');
 
+$file = GETPOST('file', 'alpha');
+$num = GETPOST('num', 'alpha');		// Used for document on bank statement
+
+
 // Security check
 if (empty($modulepart)) accessforbidden('Bad value for modulepart');
 $accessallowed = 0;
@@ -249,19 +253,25 @@ else {
 
 if (empty($backtourl))
 {
-    if (in_array($modulepart, array('product', 'produit', 'service', 'produit|service'))) $backtourl = DOL_URL_ROOT."/product/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('expensereport'))) $backtourl = DOL_URL_ROOT."/expensereport/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('holiday')))       $backtourl = DOL_URL_ROOT."/holiday/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('member')))        $backtourl = DOL_URL_ROOT."/adherents/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('project')))       $backtourl = DOL_URL_ROOT."/projet/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('propal')))        $backtourl = DOL_URL_ROOT."/comm/propal/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('societe')))       $backtourl = DOL_URL_ROOT."/societe/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('tax')))           $backtourl = DOL_URL_ROOT."/compta/sociales/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('ticket')))        $backtourl = DOL_URL_ROOT."/ticket/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('user')))          $backtourl = DOL_URL_ROOT."/user/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('bank')))          $backtourl = DOL_URL_ROOT."/compta/bank/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('mrp')))           $backtourl = DOL_URL_ROOT."/mrp/mo_document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    else $backtourl = DOL_URL_ROOT."/".$modulepart."/".$modulepart."_document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+	$regs = array();
+
+    if (in_array($modulepart, array('product', 'produit', 'service', 'produit|service'))) $backtourl = DOL_URL_ROOT."/product/document.php?id=".$id.'&file='.urldecode($file);
+    elseif (in_array($modulepart, array('expensereport'))) $backtourl = DOL_URL_ROOT."/expensereport/document.php?id=".$id.'&file='.urldecode($file);
+    elseif (in_array($modulepart, array('holiday')))       $backtourl = DOL_URL_ROOT."/holiday/document.php?id=".$id.'&file='.urldecode($file);
+    elseif (in_array($modulepart, array('member')))        $backtourl = DOL_URL_ROOT."/adherents/document.php?id=".$id.'&file='.urldecode($file);
+    elseif (in_array($modulepart, array('project')))       $backtourl = DOL_URL_ROOT."/projet/document.php?id=".$id.'&file='.urldecode($file);
+    elseif (in_array($modulepart, array('propal')))        $backtourl = DOL_URL_ROOT."/comm/propal/document.php?id=".$id.'&file='.urldecode($file);
+    elseif (in_array($modulepart, array('societe')))       $backtourl = DOL_URL_ROOT."/societe/document.php?id=".$id.'&file='.urldecode($file);
+    elseif (in_array($modulepart, array('tax')))           $backtourl = DOL_URL_ROOT."/compta/sociales/document.php?id=".$id.'&file='.urldecode($file);
+    elseif (in_array($modulepart, array('ticket')))        $backtourl = DOL_URL_ROOT."/ticket/document.php?id=".$id.'&file='.urldecode($file);
+    elseif (in_array($modulepart, array('user')))          $backtourl = DOL_URL_ROOT."/user/document.php?id=".$id.'&file='.urldecode($file);
+    elseif (in_array($modulepart, array('bank')) && preg_match('/\/statement\/([^\/]+)\//', $file, $regs)) {
+    	$num = $regs[1];
+    	$backtourl = DOL_URL_ROOT."/compta/bank/account_statement_document.php?id=".$id.'&num='.urlencode($num).'&file='.urldecode($file);
+    }
+    elseif (in_array($modulepart, array('bank')))          $backtourl = DOL_URL_ROOT."/compta/bank/document.php?id=".$id.'&file='.urldecode($file);
+    elseif (in_array($modulepart, array('mrp')))           $backtourl = DOL_URL_ROOT."/mrp/mo_document.php?id=".$id.'&file='.urldecode($file);
+    else $backtourl = DOL_URL_ROOT."/".$modulepart."/".$modulepart."_document.php?id=".$id.'&file='.urldecode($file);
 }
 
 
@@ -283,11 +293,11 @@ if ($cancel)
 	}
 }
 
-if ($action == 'confirm_resize' && (isset($_POST["file"]) != "") && (isset($_POST["sizex"]) != "") && (isset($_POST["sizey"]) != ""))
+if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex") && GETPOSTISSET("sizey"))
 {
 	$fullpath = $dir."/".$original_file;
 
-	$result = dol_imageResizeOrCrop($fullpath, 0, $_POST['sizex'], $_POST['sizey']);
+	$result = dol_imageResizeOrCrop($fullpath, 0, GETPOST('sizex', 'int'), GETPOST('sizey', 'int'));
 
 	if ($result == $fullpath)
 	{
@@ -357,7 +367,7 @@ if ($action == 'confirm_crop')
 	$fullpath = $dir."/".$original_file;
 
 	//var_dump($_POST['w'].'x'.$_POST['h'].'-'.$_POST['x'].'x'.$_POST['y']);exit;
-	$result = dol_imageResizeOrCrop($fullpath, 1, $_POST['w'], $_POST['h'], $_POST['x'], $_POST['y']);
+	$result = dol_imageResizeOrCrop($fullpath, 1, GETPOST('w', 'int'), GETPOST('h', 'int'), GETPOST('x', 'int'), GETPOST('y', 'int'));
 
 	if ($result == $fullpath)
 	{
@@ -445,7 +455,7 @@ print '<br>'."\n";
  */
 
 print '<!-- Form to resize -->'."\n";
-print '<form name="redim_file" action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="POST">';
+print '<form name="redim_file" action="'.$_SERVER["PHP_SELF"].'?id='.$id.($num ? '&num='.$num : '').'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
 print '<fieldset id="redim_file">';
@@ -454,7 +464,7 @@ print $langs->trans("ResizeDesc").'<br>';
 print $langs->trans("NewLength").': <input name="sizex" type="number" class="flat maxwidth50"> px  &nbsp; '.$langs->trans("or").' &nbsp; ';
 print $langs->trans("NewHeight").': <input name="sizey" type="number" class="flat maxwidth50"> px &nbsp; <br>';
 
-print '<input type="hidden" name="file" value="'.dol_escape_htmltag(GETPOST('file')).'" />';
+print '<input type="hidden" name="file" value="'.dol_escape_htmltag($file).'" />';
 print '<input type="hidden" name="action" value="confirm_resize" />';
 print '<input type="hidden" name="product" value="'.$id.'" />';
 print '<input type="hidden" name="modulepart" value="'.dol_escape_htmltag($modulepart).'" />';
@@ -497,7 +507,8 @@ if (!empty($conf->use_javascript_ajax))
 	print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$object->entity.'&file='.urlencode($original_file).'" alt="" id="cropbox" width="'.$widthforcrop.'px"/>';
 	print '</div>';
 	print '</div><br>';
-	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="POST">';
+
+	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.($num ? '&num='.$num : '').'" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '
 	      <div class="jc_coords">
diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index a3de72723a4..2a3d703d16f 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -23,6 +23,7 @@
 // $permissiontoadd = permission or not to add a file (can use also $permission) and permission or not to edit file name or crop file (can use also $permtoedit)
 // $modulepart  = for download
 // $param       = param to add to download links
+// $moreparam   = param to add to download link for the form_attach_new_file function
 // $upload_dir
 // $object
 // $filearray
@@ -109,7 +110,7 @@ if (!isset($savingdocmask) || !empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_
 
 // Show upload form (document and links)
 $formfile->form_attach_new_file(
-    $_SERVER["PHP_SELF"].'?id='.$object->id.(empty($withproject)?'':'&withproject=1'),
+    $_SERVER["PHP_SELF"].'?id='.$object->id.(empty($withproject)?'':'&withproject=1').(empty($moreparam)?'':$moreparam),
     '',
     0,
     0,

From 4b4d1bcce21fbfd959eaa1760ca4947e0c1e0eae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 03:05:58 +0100
Subject: [PATCH 03/69] Fix disable accountancy chart that is deprecated.

---
 htdocs/accountancy/admin/account.php             | 3 +++
 htdocs/install/mysql/migration/10.0.0-11.0.0.sql | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 333efefbc9d..d75d61e347f 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -278,6 +278,8 @@ if ($resql)
 			<script type="text/javascript">
 			$(document).ready(function () {
 		    	$("#searchFormList").on("submit", function (e) {
+					//event.preventDefault();
+				    //var form = this;
 					console.log("chartofaccounts focus = "+$("#chartofaccounts").is(":focus"));
 					console.log("change_chart focus = "+$("#change_chart").is(":focus"));
 					if ($("#change_chart").is(":focus"))
@@ -285,6 +287,7 @@ if ($resql)
 						console.log("We set valid_change_chart to 1");
 						$("#valid_change_chart").val(1);
 					}
+					//form.submit();
 					return true;
 			    });
 			});
diff --git a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
index 9f3d092e846..7ebec468457 100644
--- a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
+++ b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
@@ -59,11 +59,14 @@ ALTER TABLE llx_emailcollector_emailcollectoraction ADD COLUMN position integer
 
 -- For v11
 
+
 ALTER TABLE llx_product_price MODIFY COLUMN tva_tx double(6,3) DEFAULT 0 NOT NULL;
 
 ALTER TABLE llx_facturedet MODIFY COLUMN situation_percent real DEFAULT 100;
 UPDATE llx_facturedet SET situation_percent = 100 WHERE situation_percent IS NULL AND fk_prev_id IS NULL;
 
+-- Set country to null for deprecated accounting system (there is now one per country)
+UPDATE llx_accounting_system SET fk_country = NULL, active = 0 WHERE pcg_version = 'SYSCOHADA';
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 20, 'BAS-K1-MINI', 'The Swedish mini chart of accounts', 1);
 
 ALTER TABLE llx_c_action_trigger MODIFY COLUMN elementtype varchar(64) NOT NULL;

From 3682d9143e13d50d6fb4f0b42790ce79ad45f71a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 04:55:09 +0100
Subject: [PATCH 04/69] Fix showing bank account on PDF

---
 htdocs/core/modules/facture/doc/pdf_crabe.modules.php  | 7 +++----
 htdocs/core/modules/facture/doc/pdf_sponge.modules.php | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 6b6c6bb2beb..bfa15ebd4b1 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1102,10 +1102,9 @@ class pdf_crabe extends ModelePDFFactures
 			// If payment mode not forced or forced to VIR, show payment with BAN
 			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
 			{
-				if (!empty($object->fk_account) || !empty($object->fk_bank) || !empty($conf->global->FACTURE_RIB_NUMBER))
-				{
-					$bankid = (empty($object->fk_account) ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
-					if (!empty($object->fk_bank)) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+				if ($object->fk_account > 0 || $object->fk_bank > 0 || !empty($conf->global->FACTURE_RIB_NUMBER)) {
+					$bankid = ($object->fk_account <= 0 ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
+					if ($object->fk_bank > 0) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
 					$account = new Account($this->db);
 					$account->fetch($bankid);
 
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 0df384cdeb6..ecfd5818f51 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -1178,10 +1178,9 @@ class pdf_sponge extends ModelePDFFactures
 			// If payment mode not forced or forced to VIR, show payment with BAN
 			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
 			{
-				if (!empty($object->fk_account) || !empty($object->fk_bank) || !empty($conf->global->FACTURE_RIB_NUMBER))
-				{
-					$bankid = (empty($object->fk_account) ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
-					if (!empty($object->fk_bank)) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+				if ($object->fk_account > 0 || $object->fk_bank > 0 || !empty($conf->global->FACTURE_RIB_NUMBER)) {
+					$bankid = ($object->fk_account <= 0 ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
+					if ($object->fk_bank > 0) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
 					$account = new Account($this->db);
 					$account->fetch($bankid);
 

From 6c7a5340180ef663cfca09a1c2cbadfc7247f83f Mon Sep 17 00:00:00 2001
From: oscim <dom@oscim.fr>
Date: Mon, 24 Feb 2020 11:49:12 +0100
Subject: [PATCH 05/69] Update commonobject.class.php

Add support of project/projet in objectlinked
---
 htdocs/core/class/commonobject.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 80e9f4c8ab4..692fd484a16 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3391,6 +3391,9 @@ abstract class CommonObject
 					elseif ($objecttype == 'subscription') {
 						$classfile = 'subscription'; $classname = 'Subscription';
 					}
+					elseif ($objecttype == 'project' || $objecttype == 'projet') {
+						$classfile = 'project'; $classname = 'Project';
+					}
 
 					// Here $module, $classfile and $classname are set
 					if ($conf->$module->enabled && (($element != $this->element) || $alsosametype))

From 73da62d8425dfb7570da8fcd739633014f2555fe Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Mon, 24 Feb 2020 13:57:36 +0100
Subject: [PATCH 06/69] NEW Add product on key "Enter" in search bar

---
 htdocs/langs/en_US/admin.lang     |  1 +
 htdocs/langs/fr_FR/admin.lang     |  1 +
 htdocs/takepos/admin/terminal.php |  7 +++++++
 htdocs/takepos/takepos.php        | 19 +++++++++++++------
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 0f10ac291ff..2ed11212c49 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1688,6 +1688,7 @@ StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatib
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
 CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
 CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
+CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader.
 ##### Bookmark #####
 BookmarkSetup=Bookmark module setup
 BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu.
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 221d5032bfb..738f6ddea7a 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1685,6 +1685,7 @@ StockDecreaseForPointOfSaleDisabledbyBatch=La décrémentation de stock depuis c
 CashDeskYouDidNotDisableStockDecease=Vous n'avez pas désactivé la réduction de stock lors d'une vente depuis le Point de vente. Par conséquent, un entrepôt est nécessaire.
 CashDeskForceDecreaseStockLabel=Décrémentation des stocks pour les lots a été forcé.
 CashDeskForceDecreaseStockDesc=Décrémentation des lots par DLC et DLUO les plus anciennes.
+CashDeskReaderKeyCodeForEnter=Code pour la touche "Entrée" du lecteur de codes à barres.
 ##### Bookmark #####
 BookmarkSetup=Configuration du module Marque-pages
 BookmarkDesc=Ce module vous permet de gérer des liens et raccourcis. Il permet aussi d'ajouter n'importe quelle page de Dolibarr ou lien web dans le menu d'accès rapide sur la gauche.
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index 1d1c457c467..1107f9101c7 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -88,6 +88,8 @@ if (GETPOST('action', 'alpha') == 'set')
     $res = dolibarr_set_const($db, "TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES".$terminaltouse, GETPOST('TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
     $res = dolibarr_set_const($db, "TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS".$terminaltouse, GETPOST('TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
 
+	$res = dolibarr_set_const($db, 'CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse, (GETPOST('CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse, 'int') > 0 ? GETPOST('CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse, 'int') : ''), 'chaine', 0, '', $conf->entity);
+
 	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
 
 	if (!$res > 0) $error++;
@@ -244,6 +246,11 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
 	print '</td></tr>';
 }
 
+print '<tr class="oddeven"><td>' . $langs->trans('CashDeskReaderKeyCodeForEnter') . '</td>';
+print '<td>';
+print '<input type="text" name="' . 'CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse . '" value="' . $conf->global->{'CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse} . '" />';
+print '</td></tr>';
+
 print '</table>';
 print '</div>';
 
diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php
index bd559c043b4..d71faee9c47 100644
--- a/htdocs/takepos/takepos.php
+++ b/htdocs/takepos/takepos.php
@@ -438,9 +438,15 @@ function New() {
 	}
 }
 
-function Search2() {
+/**
+ * Search products
+ *
+ * @param   {int}			keyCodeForEnter     Key code for "enter"
+ * return   {void}
+ */
+function Search2(keyCodeForEnter) {
 	console.log("Search2 Call ajax search to replace products");
-	if(window.event.keyCode == 13) var key=13;
+	if(window.event.keyCode == keyCodeForEnter) var key=13;
 	pageproducts=0;
 	jQuery(".wrapper2 .catwatermark").hide();
 	$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=search&term='+$('#search').val(), function(data) {
@@ -459,8 +465,8 @@ function Search2() {
 			$("#prodiv"+i).data("rowid", data[i]['rowid']);
 			$("#prodiv"+i).data("iscat", 0);
 		}
-	}).always(function() {
-		if(key==13) ClickProduct(0);
+	}).always(function(data) {
+		if(key==13 && data.length==1) ClickProduct(0);
   });
 }
 
@@ -649,6 +655,7 @@ $( document ).ready(function() {
 <body class="bodytakepos" style="overflow: hidden;">
 <?php
 if ($conf->global->TAKEPOS_NUM_TERMINALS != "1" && $_SESSION["takeposterminal"] == "") print '<div id="dialog-info" title="TakePOS">'.$langs->trans('TerminalSelect').'</div>';
+$keyCodeForEnter = $conf->global->{'CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION['takeposterminal']} > 0 ? $conf->global->{'CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION['takeposterminal']} : 13;
 ?>
 <div class="container">
 
@@ -667,7 +674,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 			<a onclick="Customer();"><?php echo $langs->trans("Customer"); ?></a>
 			</div>
 			<div class="topnav-right">
-				<input type="text" id="search" name="search" onkeyup="Search2();"  placeholder="<?php echo $langs->trans("Search"); ?>" autofocus>
+				<input type="text" id="search" name="search" onkeyup="Search2(<?php echo $keyCodeForEnter; ?>);"  placeholder="<?php echo $langs->trans("Search"); ?>" autofocus>
 				<a onclick="ClearSearch();"><span class="fa fa-backspace"></span></a>
 				<a onclick="window.location.href='<?php echo DOL_URL_ROOT; ?>';"><span class="fas fa-sign-out-alt"></span></a>
 				<a onclick="window.location.href='<?php echo DOL_URL_ROOT; ?>/user/logout.php';"><span class="fas fa-user"></span></a>
@@ -828,7 +835,7 @@ if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 		if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 			print '<!-- Show the search input text -->'."\n";
 			print '<div class="margintoponly">';
-			print '<input type="text" id="search" name="search" onkeyup="Search2();" style="width:80%;width:calc(100% - 51px);font-size: 150%;" placeholder="'.$langs->trans("Search").'" autofocus> ';
+			print '<input type="text" id="search" name="search" onkeyup="Search2('.$keyCodeForEnter.');" style="width:80%;width:calc(100% - 51px);font-size: 150%;" placeholder="'.$langs->trans("Search").'" autofocus> ';
 			print '<a class="marginleftonly hideonsmartphone" onclick="ClearSearch();">'.img_picto('', 'searchclear').'</a>';
 			print '</div>';
 		}

From 7baba2ba43c69a886843ad0b0e738dad88bad770 Mon Sep 17 00:00:00 2001
From: Tobias Sekan <tobias.sekan@startmail.com>
Date: Mon, 24 Feb 2020 14:55:02 +0100
Subject: [PATCH 07/69] Add line number substitution

---
 htdocs/core/class/commondocgenerator.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 1bd051d4b55..54dfb294975 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -536,14 +536,16 @@ abstract class CommonDocGenerator
 	 *
 	 *	@param  Object			$line				Object line
 	 *	@param  Translate		$outputlangs        Lang object to use for output
+	 *  @param  int				$linenumber			The number of the line for the substitution of "object_line_pos"
 	 *  @return	array								Return a substitution array
 	 */
-	public function get_substitutionarray_lines($line, $outputlangs)
+	public function get_substitutionarray_lines($line, $outputlangs, $linenumber = 0)
 	{
         // phpcs:enable
 		global $conf;
 
 		$resarray = array(
+			'line_pos' => $linenumber,
 			'line_fulldesc'=>doc_getlinedesc($line, $outputlangs),
 			'line_product_ref'=>$line->product_ref,
 			'line_product_ref_fourn'=>$line->ref_fourn, // for supplier doc lines

From 4a5593e2136eae62faaa94c9a367aa3f5eb05c9e Mon Sep 17 00:00:00 2001
From: Tobias Sekan <tobias.sekan@startmail.com>
Date: Mon, 24 Feb 2020 14:56:26 +0100
Subject: [PATCH 08/69] Add position to ODT for bom

---
 htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
index 6e23160baf6..9755369793e 100644
--- a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
+++ b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
@@ -411,9 +411,11 @@ class doc_generic_bom_odt extends ModelePDFBom
 					}
 					if ($foundtagforlines)
 					{
+						$linenumber = 0;
 						foreach ($object->lines as $line)
 						{
-							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs);
+							$linenumber++;
+							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
 							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);

From b29d8e53ed1be6162681524ae356124601e49555 Mon Sep 17 00:00:00 2001
From: Tobias Sekan <tobias.sekan@startmail.com>
Date: Mon, 24 Feb 2020 14:58:01 +0100
Subject: [PATCH 09/69] Add position to ODT order template

---
 .../modules/commande/doc/doc_generic_order_odt.modules.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 4694cdaf6ee..75c5103c4ab 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -427,9 +427,11 @@ class doc_generic_order_odt extends ModelePDFCommandes
 					}
 					if ($foundtagforlines)
 					{
+						$linenumber = 0;
 						foreach ($object->lines as $line)
 						{
-							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs);
+							$linenumber++;
+							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
 							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);

From cdbe6c1e8102af8bdc94ed7c37fd1acef0ad1af2 Mon Sep 17 00:00:00 2001
From: Tobias Sekan <tobias.sekan@startmail.com>
Date: Mon, 24 Feb 2020 14:59:20 +0100
Subject: [PATCH 10/69] Add position to ODT contract template

---
 .../modules/contract/doc/doc_generic_contract_odt.modules.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
index 190abd86126..c938f40cfb2 100644
--- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
+++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
@@ -408,9 +408,11 @@ class doc_generic_contract_odt extends ModelePDFContract
 					}
 					if ($foundtagforlines)
 					{
+						$linenumber = 0;
 						foreach ($object->lines as $line)
 						{
-							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs);
+							$linenumber++;
+							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
 							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);

From 7469aa1f355141acf681c20f81ae8d546655f053 Mon Sep 17 00:00:00 2001
From: Tobias Sekan <tobias.sekan@startmail.com>
Date: Mon, 24 Feb 2020 15:00:37 +0100
Subject: [PATCH 11/69] Add position to ODT invoice template

---
 .../modules/facture/doc/doc_generic_invoice_odt.modules.php   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index 01070a6a6c7..acbebd54da8 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -435,9 +435,11 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 					}
 					if ($foundtagforlines)
 					{
+						$linenumber = 0;
 						foreach ($object->lines as $line)
 						{
-							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs);
+							$linenumber++;
+							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
 							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);

From 933b46790ac8a76dcea062d6de3aa31c197e8515 Mon Sep 17 00:00:00 2001
From: Tobias Sekan <tobias.sekan@startmail.com>
Date: Mon, 24 Feb 2020 15:02:11 +0100
Subject: [PATCH 12/69] Add position to ODT mo template

---
 htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index 398c8670a47..e276fe1f5f7 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -418,9 +418,11 @@ class doc_generic_mo_odt extends ModelePDFMo
 					}
 					if ($foundtagforlines)
 					{
+						$linenumber = 0;
 						foreach ($object->lines as $line)
 						{
-							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs);
+							$linenumber++;
+							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
 							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);

From 1f2203f0d6655f17f5d9245b84e5dc244866e01b Mon Sep 17 00:00:00 2001
From: Tobias Sekan <tobias.sekan@startmail.com>
Date: Mon, 24 Feb 2020 15:04:02 +0100
Subject: [PATCH 13/69] Add position to ODT propale template

---
 .../modules/propale/doc/doc_generic_proposal_odt.modules.php  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index fde5f08d318..33850c5d882 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -456,9 +456,11 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 					}
 					if ($foundtagforlines)
 					{
+						$linenumber = 0;
 						foreach ($object->lines as $line)
 						{
-							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs);
+							$linenumber++;
+							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
 							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);

From fc76586e2fc7f41b9e56a71c05c5a6231923c7b7 Mon Sep 17 00:00:00 2001
From: Tobias Sekan <tobias.sekan@startmail.com>
Date: Mon, 24 Feb 2020 15:05:04 +0100
Subject: [PATCH 14/69] Add position to ODT supplier order template

---
 .../doc/doc_generic_supplier_order_odt.modules.php            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
index c71fe8f59ec..d7f48915308 100644
--- a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
@@ -421,9 +421,11 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 					}
 					if ($foundtagforlines)
 					{
+						$linenumber = 0;
 						foreach ($object->lines as $line)
 						{
-							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs);
+							$linenumber++;
+							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
 							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);

From 2d9300cedbd623786dfb5c7d2dafa11d01c47a2a Mon Sep 17 00:00:00 2001
From: Tobias Sekan <tobias.sekan@startmail.com>
Date: Mon, 24 Feb 2020 15:06:21 +0100
Subject: [PATCH 15/69] Add position to ODT supplier_proposal template

---
 .../doc/doc_generic_supplier_proposal_odt.modules.php         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index 77503c4b61b..3b4a39288ea 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -445,9 +445,11 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 					}
 					if ($foundtagforlines)
 					{
+						$linenumber = 0;
 						foreach ($object->lines as $line)
 						{
-							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs);
+							$linenumber++;
+							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
 							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);

From 899ae0f52de9ce36ed6d299934099602b2875bf0 Mon Sep 17 00:00:00 2001
From: Tobias Sekan <tobias.sekan@startmail.com>
Date: Mon, 24 Feb 2020 15:07:13 +0100
Subject: [PATCH 16/69] Add position to modulebuilder template

---
 .../mymodule/doc/doc_generic_myobject_odt.modules.php       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index df2c61ab7f5..940be47a780 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -422,9 +422,11 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 					}
 					if ($foundtagforlines)
 					{
-						foreach ($object->lines as $line)
+						$linenumber = 0;
+                        foreach ($object->lines as $line)
 						{
-							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs);
+							$linenumber++;
+							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
 							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);

From 94a47794293d446c8d22f877b12d37c4c4e9a24c Mon Sep 17 00:00:00 2001
From: Tobias Sekan <tobias.sekan@startmail.com>
Date: Mon, 24 Feb 2020 15:10:36 +0100
Subject: [PATCH 17/69] fix indent

---
 .../modules/mymodule/doc/doc_generic_myobject_odt.modules.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index 940be47a780..22be3dee4ed 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -423,7 +423,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 					if ($foundtagforlines)
 					{
 						$linenumber = 0;
-                        foreach ($object->lines as $line)
+						foreach ($object->lines as $line)
 						{
 							$linenumber++;
 							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);

From 2c26ddb22b2396078ee67ba129d4f3b444b66343 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consuliting.fr>
Date: Mon, 24 Feb 2020 15:11:14 +0100
Subject: [PATCH 18/69] fix missing column into import

---
 htdocs/core/modules/modSociete.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 2cc525bd8aa..1e567c3acd6 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -684,7 +684,8 @@ class modSociete extends DolibarrModules
             'sr.domiciliation' => "BankAccountDomiciliation",
             'sr.proprio' => "BankAccountOwner",
             'sr.owner_address' => "BankAccountOwnerAddress",
-            'sr.default_rib' => 'Default'
+            'sr.default_rib' => 'Default',
+            'sr.rum' => 'RUM',
         );
 
         $this->import_convertvalue_array[$r] = array(
@@ -712,6 +713,7 @@ class modSociete extends DolibarrModules
             'sr.proprio' => 'name on the bank account',
             'sr.owner_address' => 'address of account holder',
             'sr.default_rib' => '1 (default account) / 0 (not default)'
+            'sr.rum' => 'RUM code'
         );
 
 		// Import Company Sales representatives

From b2b229111756876f6e9e5bdf6dbd8e8fcd7643d7 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consuliting.fr>
Date: Mon, 24 Feb 2020 15:12:26 +0100
Subject: [PATCH 19/69] fix missing column into import

---
 htdocs/core/modules/modSociete.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 1e567c3acd6..0a231ca7fc1 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -712,7 +712,7 @@ class modSociete extends DolibarrModules
             'sr.domiciliation' => 'bank branch address eg. "PARIS"',
             'sr.proprio' => 'name on the bank account',
             'sr.owner_address' => 'address of account holder',
-            'sr.default_rib' => '1 (default account) / 0 (not default)'
+            'sr.default_rib' => '1 (default account) / 0 (not default)',
             'sr.rum' => 'RUM code'
         );
 

From 9f8166ed37f31a78f910e1005bfe4edc3d1065ef Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consuliting.fr>
Date: Mon, 24 Feb 2020 15:14:01 +0100
Subject: [PATCH 20/69] fix missing column into import

---
 htdocs/core/modules/modSociete.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 0a231ca7fc1..ae093a25322 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -686,6 +686,7 @@ class modSociete extends DolibarrModules
             'sr.owner_address' => "BankAccountOwnerAddress",
             'sr.default_rib' => 'Default',
             'sr.rum' => 'RUM',
+			'sr.type' => "Type ban is defaut",
         );
 
         $this->import_convertvalue_array[$r] = array(
@@ -713,7 +714,8 @@ class modSociete extends DolibarrModules
             'sr.proprio' => 'name on the bank account',
             'sr.owner_address' => 'address of account holder',
             'sr.default_rib' => '1 (default account) / 0 (not default)',
-            'sr.rum' => 'RUM code'
+            'sr.rum' => 'RUM code',
+			'sr.type' => 'ban',
         );
 
 		// Import Company Sales representatives

From fe4bd46c43592bd72fd76438f03cc0c9e6a4bec6 Mon Sep 17 00:00:00 2001
From: oscim <dom@oscim.fr>
Date: Mon, 24 Feb 2020 17:28:25 +0100
Subject: [PATCH 21/69] Update commonobject.class.php

add support of contact linkedobject
---
 htdocs/core/class/commonobject.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 80e9f4c8ab4..1ddb5f20d56 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3369,6 +3369,9 @@ abstract class CommonObject
 					elseif ($objecttype == 'subscription') {
 						$classpath = 'adherents/class'; $module = 'adherent';
 					}
+					elseif ($objecttype == 'contact') {
+						 $module = 'societe';
+					}
 
 					// Set classfile
 					$classfile = strtolower($subelement); $classname = ucfirst($subelement);

From 65f3e5466e7c2b33c8b9858fa70a31095a245091 Mon Sep 17 00:00:00 2001
From: oscim <dom@oscim.fr>
Date: Mon, 24 Feb 2020 17:51:11 +0100
Subject: [PATCH 22/69] Update commonobject.class.php

add path class for support type project or projet in element_element
---
 htdocs/core/class/commonobject.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 692fd484a16..59d29569186 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3392,7 +3392,7 @@ abstract class CommonObject
 						$classfile = 'subscription'; $classname = 'Subscription';
 					}
 					elseif ($objecttype == 'project' || $objecttype == 'projet') {
-						$classfile = 'project'; $classname = 'Project';
+						$classpath = 'projet/class'; $classfile = 'project'; $classname = 'Project';
 					}
 
 					// Here $module, $classfile and $classname are set

From 2e377112b52ec1961298c30820809c46f21e6b23 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 19:24:38 +0100
Subject: [PATCH 23/69] Enhanc top bar of TakePOS (more similar than
 backoffice)

---
 htdocs/main.inc.php                | 22 +++++++-----
 htdocs/takepos/css/pos.css.php     | 58 ++++++++++++++++++++++++++----
 htdocs/takepos/takepos.php         | 15 +++++---
 htdocs/theme/eldy/dropdown.inc.php | 11 +++---
 4 files changed, 84 insertions(+), 22 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 8c1cdd829de..8765b73a53a 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1757,9 +1757,11 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 /**
  * Build the tooltip on user login
  *
- * @return  string                  HTML content
+ * @param	int			$hideloginname		Hide login name. Show only the image.
+ * @param	string		$urllogout			URL for logout
+ * @return  string                  		HTML content
  */
-function top_menu_user()
+function top_menu_user($hideloginname = 0, $urllogout = '')
 {
     global $langs, $conf, $db, $hookmanager, $user;
     global $dolibarr_main_authentication, $dolibarr_main_demo;
@@ -1830,9 +1832,10 @@ function top_menu_user()
         }
     }
 
-
-
-    $logoutLink = '<a accesskey="l" href="'.DOL_URL_ROOT.'/user/logout.php" class="button-top-menu-dropdown" ><i class="fa fa-sign-out-alt"></i> '.$langs->trans("Logout").'</a>';
+    if (empty($urllogout)) {
+    	$urllogout = DOL_URL_ROOT.'/user/logout.php';
+    }
+    $logoutLink = '<a accesskey="l" href="'.$urllogout.'" class="button-top-menu-dropdown" ><i class="fa fa-sign-out-alt"></i> '.$langs->trans("Logout").'</a>';
     $profilLink = '<a accesskey="l" href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="button-top-menu-dropdown" ><i class="fa fa-user"></i>  '.$langs->trans("Card").'</a>';
 
 
@@ -1857,9 +1860,12 @@ function top_menu_user()
 
     $btnUser = '<!-- div for user link -->
     <div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu  inline-block">
-        <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 hideonsmartphone">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 10).'</span>
+        <a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="dropdown-toggle login-dropdown-a" data-toggle="dropdown">';
+    $btnUser .= $userImage;
+    if (empty($hideloginname)) {
+    	$btnUser .= '<span class="hidden-xs maxwidth200 atoploginusername hideonsmartphone">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 10).'</span>';
+    }
+    $btnUser .= '
         </a>
         <div class="dropdown-menu">
             <!-- User image -->
diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
index a847b5e6e47..3716c38f16e 100644
--- a/htdocs/takepos/css/pos.css.php
+++ b/htdocs/takepos/css/pos.css.php
@@ -233,8 +233,10 @@ table.postablelines tr td {
     padding-top: 3px;
     padding-bottom: 3px;
 }
+
 .posinvoiceline td {
     height: 40px !important;
+    background-color: var(--colorbacklineimpair1);
 }
 
 div.paymentbordline
@@ -268,7 +270,7 @@ div.paymentbordline
 .row1withhead{
 	margin: 0 auto;
 	width: 100%;
-	height: calc(50% - 35px);
+	height: calc(40% - 50px);
 	padding-top: 5px;
 }
 
@@ -281,7 +283,7 @@ div.paymentbordline
 .row2withhead{
 	margin: 0 auto;
 	width: 100%;
-	height: 50%;
+	height: 60%;
 }
 
 .div1{
@@ -401,26 +403,51 @@ div.description_content {
 .header{
 	margin: 0 auto;
 	width: 100%;
-	height: 35px;
+	height: 50px;
 	background: rgb(60,70,100);
 }
 
+.topnav-left {
+	float: left;
+}
+.topnav-right {
+
+}
+
+.topnav div.login_block_other, .topnav div.login_block_user {
+	max-width: unset;
+	width: unset;
+}
 .topnav{
 	background: rgb(<?php echo $colorbackhmenu1 ?>);
 	background-image: linear-gradient(-45deg, <?php echo colorAdjustBrightness(colorArrayToHex(colorStringToArray($colorbackhmenu1)), '5'); ?>, rgb(<?php echo $colorbackhmenu1 ?>));
 	overflow: hidden;
 	height: 100%;
 }
+.topnav .tmenu {
+    display: block;
+}
 
 .topnav a{
 	float: left;
 	color: #f2f2f2;
-	padding: 6px 16px;
 	text-decoration: none;
+}
+.topnav .login_block_other a {
+	padding: 5px 10px;
+    margin-left: 4px;
+    font-size: 1.3em;
+}
+.topnav-right > a {
 	font-size: 17px;
 }
 
-.topnav a:hover{
+.topnav-left a {
+	padding: 7px 4px 7px 4px;
+    margin: 8px;
+    margin-left: 4px;
+}
+.topnav-left a:hover, .topnav .login_block_other a:hover {
 	background-color: #ddd;
 	color: black;
 }
@@ -434,8 +461,9 @@ div.description_content {
 	color: #000;
 	float: left;
 	border-bottom: none !important;
-	margin-top: 4px;
 	margin-left: 6px;
+	font-size: 1.3em;
+    max-width: 250px;
 }
 
 @media screen and (min-width: 892px) {
@@ -494,7 +522,19 @@ div.description_content {
 
 /* For small screens */
 
+@media screen and (max-width: 1024px) {
+	.topnav input[type="text"] {
+		max-width: 150px;
+	}
+}
+
 @media screen and (max-width: 767px) {
+	.header {
+	    position: sticky;
+	    top: 0;
+	    z-index: 10;
+	}
+
 	.topnav-right {
 		float: unset;
 	}
@@ -511,6 +551,11 @@ div.description_content {
 		width: 25%;
 	}
 
+	.row1withhead{
+		height: calc(40% - 100px);
+	}
+
+
 	div.div1 {
 		padding-bottom: 0;
 		margin-bottom: 10px;
@@ -528,6 +573,7 @@ div.description_content {
 	}
 
 	div.div3 {
+		margin-top: 8px;
 		height: unset;
 	}
 
diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php
index bd559c043b4..1cf8e22f1cc 100644
--- a/htdocs/takepos/takepos.php
+++ b/htdocs/takepos/takepos.php
@@ -660,18 +660,25 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 			<div class="topnav-left">
 			<a onclick="TerminalsDialog();">
 			<?php echo $langs->trans("Terminal")." ";
-			if ($_SESSION["takeposterminal"] == "") echo "1"; else echo $_SESSION["takeposterminal"];
-			echo " - ".dol_print_date(dol_now(), "dayhour");
+			if ($_SESSION["takeposterminal"] == "") echo "1";
+			else echo $_SESSION["takeposterminal"];
+			echo '<span class="hideonsmartphone"> - '.dol_print_date(dol_now(), "dayhour").'</span>';
 			?>
 			</a>
 			<a onclick="Customer();"><?php echo $langs->trans("Customer"); ?></a>
 			</div>
 			<div class="topnav-right">
+				<div class="login_block_other">
 				<input type="text" id="search" name="search" onkeyup="Search2();"  placeholder="<?php echo $langs->trans("Search"); ?>" autofocus>
 				<a onclick="ClearSearch();"><span class="fa fa-backspace"></span></a>
-				<a onclick="window.location.href='<?php echo DOL_URL_ROOT; ?>';"><span class="fas fa-sign-out-alt"></span></a>
-				<a onclick="window.location.href='<?php echo DOL_URL_ROOT; ?>/user/logout.php';"><span class="fas fa-user"></span></a>
+				<a onclick="window.location.href='<?php echo DOL_URL_ROOT; ?>';"><span class="fas fa-home"></span></a>
 				<a onclick="FullScreen();"><span class="fa fa-expand-arrows-alt"></span></a>
+				</div>
+				<div class="login_block_user">
+				<?php
+				print top_menu_user(1, DOL_URL_ROOT.'/user/logout.php');
+				?>
+				</div>
 			</div>
 		</div>
 	</div>
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index 69716ce5be3..d451308884f 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -122,7 +122,7 @@ button.dropdown-item.global-search-item {
 .tmenu .open.dropdown, .tmenu .open.dropdown {
     background: rgba(0, 0, 0, 0.1);
 }
-.tmenu .dropdown-menu, .login_block .dropdown-menu {
+.tmenu .dropdown-menu, .login_block .dropdown-menu, .topnav .dropdown-menu {
     position: absolute;
     right: 2px;
     <?php echo $left; ?>: auto;
@@ -135,20 +135,23 @@ button.dropdown-item.global-search-item {
 .user-body {
     color: #333;
 }
-.side-nav-vert .user-menu .dropdown-menu {
+.side-nav-vert .user-menu .dropdown-menu, .topnav .user-menu .dropdown-menu {
     border-top-right-radius: 0;
     border-top-left-radius: 0;
     padding: 1px 0 0 0;
     border-top-width: 0;
     width: 300px;
 }
-.side-nav-vert .user-menu .dropdown-menu {
+.topnav .user-menu .dropdown-menu {
+	top: 50px;
+}
+.side-nav-vert .user-menu .dropdown-menu, .topnav .user-menu .dropdown-menu {
     margin-top: 0;
     border-top-left-radius: 0;
     border-top-right-radius: 0;
 }
 
-.side-nav-vert .user-menu .dropdown-menu > .user-header {
+.side-nav-vert .user-menu .dropdown-menu > .user-header, .topnav .user-menu .dropdown-menu > .user-header {
     min-height: 100px;
     padding: 10px;
     text-align: center;

From dfe68612410625fdf9cf9973eb1b8c91e36a620f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 19:42:21 +0100
Subject: [PATCH 24/69] Responsive

---
 htdocs/takepos/css/pos.css.php | 4 ++++
 htdocs/takepos/takepos.php     | 6 ++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
index 3716c38f16e..1b662649fc8 100644
--- a/htdocs/takepos/css/pos.css.php
+++ b/htdocs/takepos/css/pos.css.php
@@ -535,6 +535,10 @@ div.description_content {
 	    z-index: 10;
 	}
 
+	.topnav input[type="text"] {
+		max-width: 100px;
+	}
+
 	.topnav-right {
 		float: unset;
 	}
diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php
index 1cf8e22f1cc..55b8461b5d2 100644
--- a/htdocs/takepos/takepos.php
+++ b/htdocs/takepos/takepos.php
@@ -455,7 +455,7 @@ function Search2() {
 			$("#prodesc"+i).text(data[i]['label']);
 			$("#prodivdesc"+i).show();
 			$("#proimg"+i).attr("title", titlestring);
-			$("#proimg"+i).attr("src", "genimg/?query=pro&id="+data[i]['rowid']);
+			$("#proimg"+i).attr("src", "genimg/index.php?query=pro&id="+data[i]['rowid']);
 			$("#prodiv"+i).data("rowid", data[i]['rowid']);
 			$("#prodiv"+i).data("iscat", 0);
 		}
@@ -658,7 +658,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 	<div class="header">
 		<div class="topnav">
 			<div class="topnav-left">
-			<a onclick="TerminalsDialog();">
+			<a class="topnav-terminalhour" onclick="TerminalsDialog();">
 			<?php echo $langs->trans("Terminal")." ";
 			if ($_SESSION["takeposterminal"] == "") echo "1";
 			else echo $_SESSION["takeposterminal"];
@@ -809,8 +809,6 @@ if (!empty($reshook)) {
 
 if ($r % 3 == 2) $menus[$r++] = array('title'=>'', 'style'=>'visibility: hidden;');
 
-$menus[$r++] = array('title'=>'<span class="fa fa-home paddingrightonly"></span><div class="trunc">'.$langs->trans("BackOffice").'</div>', 'action'=>'window.open(\''.(DOL_URL_ROOT ? DOL_URL_ROOT : '/').'\', \'_backoffice\');');
-
 if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 	$menus[$r++] = array('title'=>'<span class="fa fa-sign-out-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("Logout").'</div>', 'action'=>'window.location.href=\''.DOL_URL_ROOT.'/user/logout.php\';');
 }

From 4fc3158962b0686fe8ee46b042ee9eb9306f974a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 20:20:02 +0100
Subject: [PATCH 25/69] Clean code

---
 htdocs/modulebuilder/template/img/mymodule.png    | Bin 683 -> 0 bytes
 .../template/img/object_mymodule_over.png         | Bin 0 -> 323 bytes
 htdocs/takepos/css/pos.css.php                    |   1 +
 htdocs/theme/eldy/dropdown.inc.php                |  12 +++++-------
 htdocs/theme/eldy/global.inc.php                  |  13 ++++---------
 htdocs/theme/md/style.css.php                     |  11 +++--------
 6 files changed, 13 insertions(+), 24 deletions(-)
 delete mode 100644 htdocs/modulebuilder/template/img/mymodule.png
 create mode 100644 htdocs/modulebuilder/template/img/object_mymodule_over.png

diff --git a/htdocs/modulebuilder/template/img/mymodule.png b/htdocs/modulebuilder/template/img/mymodule.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/modulebuilder/template/img/object_mymodule_over.png b/htdocs/modulebuilder/template/img/object_mymodule_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..72d9d7fe28e5dd6ca08b65caac403e2b30ad0ff3
GIT binary patch
literal 323
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xawj^(N7l!{JxM1({$v_d#0*}aI
zppNSx%;=;sy8<Z4UgGKN%Kn5&LYPA!H7OzyD0IQo#W6(V{N76&y_y{bSRT9&KX^-T
z>s$p+#`y=WTBlYDNUwGFxOY&gb#AOw{Gmf?3pzT&7WF1fbTL0GEAvUcMMN@!ug$hB
zt!#D22F|jaj=f**CCT4^@o4+9@($%Q7X$@&9uqX|@5np&G|T;nj?z1$a8bGAKaOzr
zeGK>6?YWJwAnJKxgYz8G81DFrXwh@l>k2!y3dLXOb1!$1?|<<?ll9xKbH~Md3R*p9
z?fWKIosrb_Jhb{xzs}dXn~YCNdoCRCpY$zY@q*sing@Gs{aUNXu+uzBu6XUwQlQ@$
NJYD@<);T3K0RU53f3yGq

literal 0
HcmV?d00001

diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
index 1b662649fc8..8a75549ce0c 100644
--- a/htdocs/takepos/css/pos.css.php
+++ b/htdocs/takepos/css/pos.css.php
@@ -464,6 +464,7 @@ div.description_content {
 	margin-left: 6px;
 	font-size: 1.3em;
     max-width: 250px;
+    border-radius: 5px;
 }
 
 @media screen and (min-width: 892px) {
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index d451308884f..a0915b8bd08 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -336,7 +336,7 @@ a.top-menu-dropdown-link {
     margin-right: 5px;
     display: inline-block;
     content: "\f0da";
-    color: rgba(0,0,0,0.3);
+    /* color: rgba(0,0,0,0.3); */
 }
 
 
@@ -351,22 +351,20 @@ a.top-menu-dropdown-link {
 */
 
 .dropdown-search-input {
-    width: 100%;
+    width: 280px;
     padding: 10px 35px 10px 20px;
 
     background-color: transparent;
-    font-size: 14px;
-    line-height: 16px;
+    /*font-size: 14px;
+    line-height: 16px;*/
     box-sizing: border-box;
 
-
     color: #575756;
-    background-color: transparent;
     background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'%3E%3Cpath d='M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z'/%3E%3Cpath d='M0 0h24v24H0z' fill='none'/%3E%3C/svg%3E");
     background-repeat: no-repeat;
     background-size: 16px 16px;
     background-position: 95% center;
-    border-radius: 50px;
+    border-radius: 10px;
     border: 1px solid #c4c4c2 !important;
     transition: all 250ms ease-in-out;
     backface-visibility: hidden;
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 137cdd6418a..f6eb3dd324a 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1983,13 +1983,7 @@ a.tmenuimage:hover{
         $found = 0; $url = '';
         foreach ($conf->file->dol_document_root as $dirroot)
         {
-            if (file_exists($dirroot."/".$val."/img/".$val."_over.png"))
-            {
-                $url = dol_buildpath('/'.$val.'/img/'.$val.'_over.png', 1);
-                $found = 1;
-                break;
-            }
-    		elseif (file_exists($dirroot."/".$val."/img/".$val.".png"))    // Retro compatibilité
+    		if (file_exists($dirroot."/".$val."/img/".$val.".png"))
     		{
     			$url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
     			$found = 1;
@@ -2000,10 +1994,11 @@ a.tmenuimage:hover{
         if (!$found)
         {
             if (!defined('DISABLE_FONT_AWSOME')) {
-                print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
+                print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one. */\n";
+ 				print "/* Overwrite this definition in your own css with a different content to use your own font awesome icon. */\n";
                 print 'div.mainmenu.'.$val.'::before {
                     content: "\f249";
-                }';
+                }'."\n";
             }
             else
             {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 597ffb1d9f7..1305bdc6418 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2051,13 +2051,7 @@ div.mainmenu.website {
 		$found = 0; $url = '';
 		foreach ($conf->file->dol_document_root as $dirroot)
 		{
-		    if (file_exists($dirroot."/".$val."/img/".$val."_over.png"))
-		    {
-		        $url = dol_buildpath('/'.$val.'/img/'.$val.'_over.png', 1);
-		        $found = 1;
-		        break;
-		    }
-		    elseif (file_exists($dirroot."/".$val."/img/".$val.".png"))    // Retro compatibilité
+		    if (file_exists($dirroot."/".$val."/img/".$val.".png"))
 			{
 			    $url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
 			    $found = 1;
@@ -2075,7 +2069,8 @@ div.mainmenu.website {
 		    }
 		    else
 		    {
-		        print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
+		    	print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one. */\n";
+		    	print "/* Overwrite this definition in your own css with a different content to use your own font awesome icon. */\n";
 		        $url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1);
 		        print "div.mainmenu.".$val." {\n";
 		        print "	background-image: url(".$url.");\n";

From 9d9429f66bf67694a614b8434f50b789c3e48928 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 20:41:29 +0100
Subject: [PATCH 26/69] New: Can limit number of tabs by page.

---
 htdocs/core/lib/functions.lib.php | 18 +++++++++++-------
 htdocs/modulebuilder/index.php    |  3 +--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8129c810303..1375df9d0b6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1145,15 +1145,16 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
  *	@param	int		$pictoisfullpath	If 1, image path is a full path. If you set this to 1, you can use url returned by dol_buildpath('/mymodyle/img/myimg.png',1) for $picto.
  *  @param	string	$morehtmlright		Add more html content on right of tabs title
  *  @param	string	$morecss			More Css
+ *  @param	int		$limittoshow		Limit number of tabs to show. Use 0 to use automatic default value.
  * 	@return	void
  */
-function dol_fiche_head($links = array(), $active = '0', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '')
+function dol_fiche_head($links = array(), $active = '0', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limittoshow = 0)
 {
-	print dol_get_fiche_head($links, $active, $title, $notab, $picto, $pictoisfullpath, $morehtmlright, $morecss);
+	print dol_get_fiche_head($links, $active, $title, $notab, $picto, $pictoisfullpath, $morehtmlright, $morecss, $limittoshow);
 }
 
 /**
- *  Show tab header of a card
+ *  Show tabs of a record
  *
  *	@param	array	$links				Array of tabs
  *	@param	string	$active     		Active tab name
@@ -1163,9 +1164,10 @@ function dol_fiche_head($links = array(), $active = '0', $title = '', $notab = 0
  *	@param	int		$pictoisfullpath	If 1, image path is a full path. If you set this to 1, you can use url returned by dol_buildpath('/mymodyle/img/myimg.png',1) for $picto.
  *  @param	string	$morehtmlright		Add more html content on right of tabs title
  *  @param	string	$morecss			More Css
+ *  @param	int		$limittoshow		Limit number of tabs to show. Use 0 to use automatic default value.
  * 	@return	string
  */
-function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '')
+function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limittoshow = 0)
 {
 	global $conf, $langs, $hookmanager;
 
@@ -1202,11 +1204,13 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 		if (count($keys)) $maxkey = max($keys);
 	}
 
-	if (!empty($conf->dol_optimize_smallscreen)) $conf->global->MAIN_MAXTABS_IN_CARD = 2;
-
 	// Show tabs
 	// if =0 we don't use the feature
-	$limittoshow = (empty($conf->global->MAIN_MAXTABS_IN_CARD) ? 99 : $conf->global->MAIN_MAXTABS_IN_CARD);
+	if (empty($limittoshow)) {
+		$limittoshow = (empty($conf->global->MAIN_MAXTABS_IN_CARD) ? 99 : $conf->global->MAIN_MAXTABS_IN_CARD);
+	}
+	if (!empty($conf->dol_optimize_smallscreen)) $limittoshow = 2;
+
 	$displaytab = 0;
 	$nbintab = 0;
 	$popuptab = 0;
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 531d8d224d9..80b3aa87adb 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -1652,8 +1652,7 @@ $head[$h][1] = $langs->trans("DangerZone");
 $head[$h][2] = 'deletemodule';
 $h++;
 
-
-dol_fiche_head($head, $module, $langs->trans("Modules"), -1, 'generic', 0, $infomodulesfound); // Modules
+dol_fiche_head($head, $module, $langs->trans("Modules"), -1, 'generic', 0, $infomodulesfound, '', 8); // Modules
 
 if ($module == 'initmodule')
 {

From 32d74adf205d5126c48c23e7a85ae856114f9ae1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 21:18:49 +0100
Subject: [PATCH 27/69] NEW Truncate columns names when too long and show full
 title as popup

---
 htdocs/admin/const.php            | 10 +++++-----
 htdocs/core/lib/functions.lib.php | 19 ++++++++++++++++---
 htdocs/main.inc.php               |  2 +-
 htdocs/theme/eldy/global.inc.php  |  6 ++++++
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index baeac243ce0..c4fa1e9240f 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -201,14 +201,14 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print getTitleFieldOfList('Name', 0, $_SERVER['PHP_SELF'], 'name', '', $param, '', $sortfield, $sortorder, '')."\n";
-print '<td>'.$langs->trans("Value").'</td>';
-print '<td>'.$langs->trans("Comment").'</td>';
-print getTitleFieldOfList('DateModificationShort', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center')."\n";
+print getTitleFieldOfList("Value", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
+print getTitleFieldOfList("Comment", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
+print getTitleFieldOfList('DateModificationShort', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ')."\n";
 if (! empty($conf->multicompany->enabled) && !$user->entity)
 {
-	print getTitleFieldOfList('Entity', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center')."\n";
+	print getTitleFieldOfList('Entity', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ')."\n";
 }
-print '<td class="center">'.$langs->trans("Action").'</td>';
+print getTitleFieldOfList("Action", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
 print "</tr>\n";
 
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 1375df9d0b6..0c93f8d01d1 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4086,11 +4086,22 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 	$tmpfield = explode(',', $field);
 	$field1 = trim($tmpfield[0]); // If $field is 'd.datep,d.id', it becomes 'd.datep'
 
+	if (empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE)) {
+		$prefix = 'wrapcolumntitle '.$prefix;
+	}
 	//var_dump('field='.$field.' field1='.$field1.' sortfield='.$sortfield.' sortfield1='.$sortfield1);
 	// If field is used as sort criteria we use a specific css class liste_titre_sel
 	// Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")
-	if ($field1 && ($sortfield1 == $field1 || $sortfield1 == preg_replace("/^[^\.]+\./", "", $field1))) $out .= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '.$moreattrib.'>';
-	else $out .= '<'.$tag.' class="'.$prefix.'liste_titre" '.$moreattrib.'>';
+	if ($field1 && ($sortfield1 == $field1 || $sortfield1 == preg_replace("/^[^\.]+\./", "", $field1))) {
+		$out .= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '.$moreattrib;
+		$out .= (empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
+		$out .= '>';
+	}
+	else {
+		$out .= '<'.$tag.' class="'.$prefix.'liste_titre" '.$moreattrib;
+		$out .= (empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
+		$out .= '>';
+	}
 
 	if (empty($thead) && $field && empty($disablesortlink))    // If this is a sort field
 	{
@@ -4123,7 +4134,9 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 			}
 		}
 		$sortordertouseinlink = preg_replace('/,$/', '', $sortordertouseinlink);
-		$out .= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder='.$sortordertouseinlink.'&begin='.$begin.$options.'">';
+		$out .= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder='.$sortordertouseinlink.'&begin='.$begin.$options.'"';
+		//$out .= (empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
+		$out .= '>';
 	}
 
 	if ($tooltip) $out .= $form->textwithpicto($langs->trans($name), $langs->trans($tooltip));
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 8765b73a53a..ef09674f8aa 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1863,7 +1863,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
         <a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="dropdown-toggle login-dropdown-a" data-toggle="dropdown">';
     $btnUser .= $userImage;
     if (empty($hideloginname)) {
-    	$btnUser .= '<span class="hidden-xs maxwidth200 atoploginusername hideonsmartphone">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 10).'</span>';
+    	$btnUser .= '<span class="hidden-xs maxwidth200 atoploginusername hideonsmartphone paddingleft">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 10).'</span>';
     }
     $btnUser .= '
         </a>
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index f6eb3dd324a..4d5f3991a3f 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -124,6 +124,12 @@ select.vmenusearchselectcombo {
 	background-color: unset;
 }
 
+th.wrapcolumntitle.liste_titre.right, td.wrapcolumntitle.liste_titre.right {
+    overflow: hidden;
+    white-space: nowrap;
+    max-width: 120px;
+    text-overflow: ellipsis;
+}
 .liste_titre input[name=month_date_when], .liste_titre input[name=monthvalid], .liste_titre input[name=search_ordermonth], .liste_titre input[name=search_deliverymonth],
 .liste_titre input[name=search_smonth], .liste_titre input[name=search_month], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre select[name=month],
 .liste_titre input[name=month_lim], .liste_titre input[name=month_start], .liste_titre input[name=month_end], .liste_titre input[name=month_create],

From 68526a14cd9b4e5186375c53a8d99030a1092200 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 21:33:28 +0100
Subject: [PATCH 28/69] NEW Truncate columns names when too long and show full
 title as popup

---
 htdocs/core/lib/functions.lib.php | 4 ++--
 htdocs/theme/eldy/global.inc.php  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 0c93f8d01d1..9ce2d99ad1d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4094,12 +4094,12 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 	// Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")
 	if ($field1 && ($sortfield1 == $field1 || $sortfield1 == preg_replace("/^[^\.]+\./", "", $field1))) {
 		$out .= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '.$moreattrib;
-		$out .= (empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
+		$out .= (($field && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && preg_match('/^[a-zA-Z_0-9\s\.\-:]*$/', $name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
 		$out .= '>';
 	}
 	else {
 		$out .= '<'.$tag.' class="'.$prefix.'liste_titre" '.$moreattrib;
-		$out .= (empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
+		$out .= (($field && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && preg_match('/^[a-zA-Z_0-9\s\.\-:]*$/', $name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
 		$out .= '>';
 	}
 
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 4d5f3991a3f..99e2797c2db 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -124,7 +124,7 @@ select.vmenusearchselectcombo {
 	background-color: unset;
 }
 
-th.wrapcolumntitle.liste_titre.right, td.wrapcolumntitle.liste_titre.right {
+th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), td.wrapcolumntitle.liste_titre:not(.maxwidthsearch) {
     overflow: hidden;
     white-space: nowrap;
     max-width: 120px;

From 7cd49f327e503222202bb5b1ff0f05b3a7b82264 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 21:47:48 +0100
Subject: [PATCH 29/69] Look and feel v12: CSS for qty in lists

---
 htdocs/core/lib/functions.lib.php |  2 +-
 htdocs/core/lib/project.lib.php   |  5 ++++-
 htdocs/theme/eldy/global.inc.php  |  8 ++++++++
 htdocs/theme/md/style.css.php     | 13 +++++++++++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 9ce2d99ad1d..c3ba1dfc63a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4304,7 +4304,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 	if ($picto && $titre) print '<td class="nobordernopadding widthpictotitle opacityhigh valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle pictotitle widthpictotitle"', $pictoisfullpath).'</td>';
 	print '<td class="nobordernopadding valignmiddle col-title">';
 	print '<div class="titre inline-block">'.$titre;
-	if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') print ' ('.$totalnboflines.')';
+	if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') print '<span class="opacitymedium colorblack">('.$totalnboflines.')</span>';
 	print '</div></td>';
 
 	// Center
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index ddca8ef1153..3d9cd447802 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -2454,7 +2454,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
  */
 function getTaskProgressBadge($task, $label = '', $tooltip = '')
 {
-    global $conf;
+    global $conf, $langs;
 
     $out = '';
     $badgeClass = '';
@@ -2472,12 +2472,15 @@ function getTaskProgressBadge($task, $label = '', $tooltip = '')
 
             if (doubleval($progressCalculated) > doubleval($task->progress * $warningRatio)) {
                 $badgeClass .= 'badge-danger';
+                if (empty($tooltip)) $tooltip = $task->progress.'% < '.$langs->trans("Expected").' '.$progressCalculated.'%';
             }
             elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
                 $badgeClass .= 'badge-warning';
+                if (empty($tooltip)) $tooltip = $task->progress.'% < '.$langs->trans("Expected").' '.$progressCalculated.'%';
             }
             else {
                 $badgeClass .= 'badge-success';
+                if (empty($tooltip)) $tooltip = $task->progress.'% >= '.$langs->trans("Expected").' '.$progressCalculated.'%';
             }
         }
     }
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 99e2797c2db..bd35d29f3b2 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -334,6 +334,13 @@ select.flat, form.flat select {
 .opacitytransp {
 	opacity: 0;
 }
+.colorwhite {
+	color: #fff;
+}
+.colorblack {
+	color: #000;
+}
+
 select:invalid {
 	color: gray;
 }
@@ -368,6 +375,7 @@ input#onlinepaymenturl, input#directdownloadlink {
 	opacity: 0.7;
 }
 
+
 div#moretabsList, div#moretabsListaction {
     z-index: 5;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 1305bdc6418..0c3867b4507 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -279,6 +279,12 @@ textarea.cke_source:focus
 	box-shadow: none;
 }
 
+th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), td.wrapcolumntitle.liste_titre:not(.maxwidthsearch) {
+    overflow: hidden;
+    white-space: nowrap;
+    max-width: 120px;
+    text-overflow: ellipsis;
+}
 .liste_titre input[name=month_date_when], .liste_titre input[name=monthvalid], .liste_titre input[name=search_ordermonth], .liste_titre input[name=search_deliverymonth],
 .liste_titre input[name=search_smonth], .liste_titre input[name=search_month], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month],
 .liste_titre input[name=month_lim], .liste_titre input[name=month_start], .liste_titre input[name=month_end], .liste_titre input[name=month_create],
@@ -465,6 +471,13 @@ select.flat, form.flat select {
 .opacitytransp {
 	opacity: 0;
 }
+.colorwhite {
+	color: #fff;
+}
+.colorblack {
+	color: #000;
+}
+
 select:invalid {
 	color: gray;
 }

From d78221ea08ce6a20a8c7171eb1e79e35a26930c9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 21:48:46 +0100
Subject: [PATCH 30/69] css

---
 htdocs/core/lib/functions.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c3ba1dfc63a..f058097ca81 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4304,7 +4304,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 	if ($picto && $titre) print '<td class="nobordernopadding widthpictotitle opacityhigh valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle pictotitle widthpictotitle"', $pictoisfullpath).'</td>';
 	print '<td class="nobordernopadding valignmiddle col-title">';
 	print '<div class="titre inline-block">'.$titre;
-	if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') print '<span class="opacitymedium colorblack">('.$totalnboflines.')</span>';
+	if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') print '<span class="opacitymedium colorblack paddingleft">('.$totalnboflines.')</span>';
 	print '</div></td>';
 
 	// Center

From b52f458517b45af942614b6b14080229fb3028b1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 22:20:15 +0100
Subject: [PATCH 31/69] Clean code

---
 htdocs/adherents/class/adherent.class.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 203ded8cedd..202bb6ff073 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -264,7 +264,6 @@ class Adherent extends CommonObject
 		'country' =>array('type'=>'integer', 'label'=>'Country', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
 		'email' =>array('type'=>'varchar(255)', 'label'=>'Email', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
 		'socialnetworks' =>array('type'=>'text', 'label'=>'Socialnetworks', 'enabled'=>1, 'visible'=>-1, 'position'=>105),
-		//'skype' =>array('type'=>'varchar(255)', 'label'=>'Skype', 'enabled'=>1, 'visible'=>-1, 'position'=>110),
 		'phone' =>array('type'=>'varchar(30)', 'label'=>'Phone', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
 		'phone_perso' =>array('type'=>'varchar(30)', 'label'=>'Phone perso', 'enabled'=>1, 'visible'=>-1, 'position'=>120),
 		'phone_mobile' =>array('type'=>'varchar(30)', 'label'=>'Phone mobile', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
@@ -283,15 +282,7 @@ class Adherent extends CommonObject
 		'canvas' =>array('type'=>'varchar(32)', 'label'=>'Canvas', 'enabled'=>1, 'visible'=>-1, 'position'=>195),
 		'statut' =>array('type'=>'smallint(6)', 'label'=>'Statut', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', -1=>'MemberStatusResiliatedShort')),
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>800),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>805),
-		/*'twitter' =>array('type'=>'varchar(255)', 'label'=>'Twitter', 'enabled'=>1, 'visible'=>-1, 'position'=>210),
-		'facebook' =>array('type'=>'varchar(255)', 'label'=>'Facebook', 'enabled'=>1, 'visible'=>-1, 'position'=>215),
-		'instagram' =>array('type'=>'varchar(255)', 'label'=>'Instagram', 'enabled'=>1, 'visible'=>-1, 'position'=>220),
-		'snapchat' =>array('type'=>'varchar(255)', 'label'=>'Snapchat', 'enabled'=>1, 'visible'=>-1, 'position'=>225),
-		'googleplus' =>array('type'=>'varchar(255)', 'label'=>'Googleplus', 'enabled'=>1, 'visible'=>-1, 'position'=>230),
-		'youtube' =>array('type'=>'varchar(255)', 'label'=>'Youtube', 'enabled'=>1, 'visible'=>-1, 'position'=>235),
-		'whatsapp' =>array('type'=>'varchar(255)', 'label'=>'Whatsapp', 'enabled'=>1, 'visible'=>-1, 'position'=>240),
-		'linkedin' =>array('type'=>'varchar(255)', 'label'=>'Linkedin', 'enabled'=>1, 'visible'=>-1, 'position'=>245),*/
+		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>805)
 	);
 
 

From 7431bf059238be0a69c7ab871adaa0fd580c9339 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 22:53:14 +0100
Subject: [PATCH 32/69] Try formating profile

---
 htdocs/adherents/class/adherent.class.php | 1885 +++++++++------------
 1 file changed, 835 insertions(+), 1050 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 202bb6ff073..6de540c43c9 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -32,10 +32,9 @@
  *	\ingroup    member
  *	\brief      File of class to manage members of a foundation
  */
-
-require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 
 
 /**
@@ -43,6 +42,7 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
  */
 class Adherent extends CommonObject
 {
+
 	/**
 	 * @var string ID to identify managed object
 	 */
@@ -61,22 +61,24 @@ class Adherent extends CommonObject
 
 	public $mesgs;
 
-    /**
-     * @var string login of member
-     */
+	/**
+	 * @var string login of member
+	 */
 	public $login;
 
 	//! Clear password in memory
 	public $pass;
+
 	//! Clear password in database (defined if DATABASE_PWD_ENCRYPTED=0)
 	public $pass_indatabase;
+
 	//! Encrypted password in database (always defined)
 	public $pass_indatabase_crypted;
 
-    /**
-     * @var string company name
-     * @deprecated
-     */
+	/**
+	 * @var string company name
+	 * @deprecated
+	 */
 	public $societe;
 
 	/**
@@ -87,153 +89,164 @@ class Adherent extends CommonObject
 	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+	public $fk_soc;
 
 	/**
 	 * @var string Address
 	 */
 	public $address;
 
-    /**
-     * @var string zipcode
-     */
-    public $zip;
+	/**
+	 * @var string zipcode
+	 */
+	public $zip;
 
-    /**
-     * @var string town
-     */
+	/**
+	 * @var string town
+	 */
 	public $town;
 
-    /**
-     * @var int Id of state
-     */
-    public $state_id;
+	/**
+	 * @var int Id of state
+	 */
+	public $state_id;
 
-    /**
-     * @var string Code of state
-     */
-    public $state_code;
+	/**
+	 * @var string Code of state
+	 */
+	public $state_code;
 
-    /**
-     * @var string Label of state
-     */
+	/**
+	 * @var string Label of state
+	 */
 	public $state;
 
-    /**
-     * @var string email
-     */
+	/**
+	 * @var string email
+	 */
 	public $email;
 
-    /**
-     * @var array array of socialnetworks
-     */
-    public $socialnetworks;
+	/**
+	 * @var array array of socialnetworks
+	 */
+	public $socialnetworks;
 
-    /**
-     * @var string skype account
+	/**
+	 * @var string skype account
 	 * @deprecated
-     */
-    public $skype;
+	 */
+	public $skype;
 
-    /**
-     * @var string twitter account
+	/**
+	 * @var string twitter account
 	 * @deprecated
-     */
-    public $twitter;
+	 */
+	public $twitter;
 
-    /**
-     * @var string facebook account
+	/**
+	 * @var string facebook account
 	 * @deprecated
-     */
+	 */
 	public $facebook;
 
-    /**
-     * @var string linkedin account
+	/**
+	 * @var string linkedin account
 	 * @deprecated
-     */
-    public $linkedin;
+	 */
+	public $linkedin;
 
-    /**
-     * @var string Phone number
-     */
+	/**
+	 * @var string Phone number
+	 */
 	public $phone;
 
-    /**
-     * @var string Private Phone number
-     */
+	/**
+	 * @var string Private Phone number
+	 */
 	public $phone_perso;
 
-    /**
-     * @var string Mobile phone number
-     */
+	/**
+	 * @var string Mobile phone number
+	 */
 	public $phone_mobile;
 
-    /**
-     * @var string Fax number
-     */
-    public $fax;
+	/**
+	 * @var string Fax number
+	 */
+	public $fax;
 
-    /**
-     * @var string Function
-     */
-    public $poste;
+	/**
+	 * @var string Function
+	 */
+	public $poste;
 
 	public $morphy;
+
 	public $public;
 
-    // -1:brouillon, 0:resilie, >=1:valide,paye
-    // def in common object
-    //public $status;
-
-    public $photo;
+	// -1:brouillon, 0:resilie, >=1:valide,paye
+	// def in common object
+	//public $status;
+	public $photo;
 
 	/**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
 	/**
-     * Date modification record (tms)
-     *
-     * @var integer
-     */
-    public $datem;
+	 * Date modification record (tms)
+	 *
+	 * @var integer
+	 */
+	public $datem;
 
 	public $datevalid;
 
 	public $gender;
+
 	public $birth;
 
-    /**
-     * @var int id type member
-     */
+	/**
+	 * @var int id type member
+	 */
 	public $typeid;
 
-    /**
-     * @var string label type member
-     */
+	/**
+	 * @var string label type member
+	 */
 	public $type;
+
 	public $need_subscription;
 
 	public $user_id;
+
 	public $user_login;
 
-	public $datefin; // From member table
+	public $datefin;
+
+	// From member table
 
 	// Fields loaded by fetch_subscriptions()
 	public $first_subscription_date;
+
 	public $first_subscription_amount;
+
 	public $last_subscription_date;
+
 	public $last_subscription_date_start;
+
 	public $last_subscription_date_end;
+
 	public $last_subscription_amount;
+
 	public $subscriptions = array();
 
-    /**
-     * @var Adherent To contains a clone of this when we need to save old properties of object
-     */
+	/**
+	 * @var Adherent To contains a clone of this when we need to save old properties of object
+	 */
 	public $oldcopy;
 
 	/**
@@ -241,51 +254,47 @@ class Adherent extends CommonObject
 	 */
 	public $entity;
 
-
-	public $fields=array(
-		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>15, 'index'=>1),
-		'ref_ext' =>array('type'=>'varchar(128)', 'label'=>'Ref ext', 'enabled'=>1, 'visible'=>0, 'position'=>20),
-		'civility' =>array('type'=>'varchar(6)', 'label'=>'Civility', 'enabled'=>1, 'visible'=>-1, 'position'=>25),
-		'lastname' =>array('type'=>'varchar(50)', 'label'=>'Lastname', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
-		'firstname' =>array('type'=>'varchar(50)', 'label'=>'Firstname', 'enabled'=>1, 'visible'=>-1, 'position'=>35),
-		'login' =>array('type'=>'varchar(50)', 'label'=>'Login', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
-		'gender' =>array('type'=>'varchar(10)', 'label'=>'Gender', 'enabled'=>1, 'visible'=>-1, 'position'=>250),
-		'pass' =>array('type'=>'varchar(50)', 'label'=>'Pass', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
-		'pass_crypted' =>array('type'=>'varchar(128)', 'label'=>'Pass crypted', 'enabled'=>1, 'visible'=>-1, 'position'=>50),
-		'fk_adherent_type' =>array('type'=>'integer', 'label'=>'Fk adherent type', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>55),
-		'morphy' =>array('type'=>'varchar(3)', 'label'=>'MorPhy', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>60),
-		'societe' =>array('type'=>'varchar(128)', 'label'=>'Societe', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
-		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'position'=>70),
-		'address' =>array('type'=>'text', 'label'=>'Address', 'enabled'=>1, 'visible'=>-1, 'position'=>75),
-		'zip' =>array('type'=>'varchar(10)', 'label'=>'Zip', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
-		'town' =>array('type'=>'varchar(50)', 'label'=>'Town', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
-		'state_id' =>array('type'=>'integer', 'label'=>'State id', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
-		'country' =>array('type'=>'integer', 'label'=>'Country', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
-		'email' =>array('type'=>'varchar(255)', 'label'=>'Email', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
-		'socialnetworks' =>array('type'=>'text', 'label'=>'Socialnetworks', 'enabled'=>1, 'visible'=>-1, 'position'=>105),
-		'phone' =>array('type'=>'varchar(30)', 'label'=>'Phone', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
-		'phone_perso' =>array('type'=>'varchar(30)', 'label'=>'Phone perso', 'enabled'=>1, 'visible'=>-1, 'position'=>120),
-		'phone_mobile' =>array('type'=>'varchar(30)', 'label'=>'Phone mobile', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
-		'birth' =>array('type'=>'date', 'label'=>'DateToBirth', 'enabled'=>1, 'visible'=>-1, 'position'=>130),
-		'photo' =>array('type'=>'varchar(255)', 'label'=>'Photo', 'enabled'=>1, 'visible'=>-1, 'position'=>135),
-		'public' =>array('type'=>'smallint(6)', 'label'=>'Public', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>145),
-		'datefin' =>array('type'=>'datetime', 'label'=>'DateEnd', 'enabled'=>1, 'visible'=>-1, 'position'=>150),
-		'note_private' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>155),
-		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>160),
-		'datevalid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>165),
-		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
-		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>175),
-		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk user author', 'enabled'=>1, 'visible'=>-1, 'position'=>180),
-		'fk_user_mod' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk user mod', 'enabled'=>1, 'visible'=>-1, 'position'=>185),
-		'fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>190),
-		'canvas' =>array('type'=>'varchar(32)', 'label'=>'Canvas', 'enabled'=>1, 'visible'=>-1, 'position'=>195),
-		'statut' =>array('type'=>'smallint(6)', 'label'=>'Statut', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', -1=>'MemberStatusResiliatedShort')),
-		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>800),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>805)
-	);
-
-
+	public $fields = array('rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
+		'ref_ext' => array('type' => 'varchar(128)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 20),
+		'civility' => array('type' => 'varchar(6)', 'label' => 'Civility', 'enabled' => 1, 'visible' => -1, 'position' => 25),
+		'lastname' => array('type' => 'varchar(50)', 'label' => 'Lastname', 'enabled' => 1, 'visible' => -1, 'position' => 30),
+		'firstname' => array('type' => 'varchar(50)', 'label' => 'Firstname', 'enabled' => 1, 'visible' => -1, 'position' => 35),
+		'login' => array('type' => 'varchar(50)', 'label' => 'Login', 'enabled' => 1, 'visible' => -1, 'position' => 40),
+		'gender' => array('type' => 'varchar(10)', 'label' => 'Gender', 'enabled' => 1, 'visible' => -1, 'position' => 250),
+		'pass' => array('type' => 'varchar(50)', 'label' => 'Pass', 'enabled' => 1, 'visible' => -1, 'position' => 45),
+		'pass_crypted' => array('type' => 'varchar(128)', 'label' => 'Pass crypted', 'enabled' => 1, 'visible' => -1, 'position' => 50),
+		'fk_adherent_type' => array('type' => 'integer', 'label' => 'Fk adherent type', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 55),
+		'morphy' => array('type' => 'varchar(3)', 'label' => 'MorPhy', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 60),
+		'societe' => array('type' => 'varchar(128)', 'label' => 'Societe', 'enabled' => 1, 'visible' => -1, 'position' => 65),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'enabled' => 1, 'visible' => -1, 'position' => 70),
+		'address' => array('type' => 'text', 'label' => 'Address', 'enabled' => 1, 'visible' => -1, 'position' => 75),
+		'zip' => array('type' => 'varchar(10)', 'label' => 'Zip', 'enabled' => 1, 'visible' => -1, 'position' => 80),
+		'town' => array('type' => 'varchar(50)', 'label' => 'Town', 'enabled' => 1, 'visible' => -1, 'position' => 85),
+		'state_id' => array('type' => 'integer', 'label' => 'State id', 'enabled' => 1, 'visible' => -1, 'position' => 90),
+		'country' => array('type' => 'integer', 'label' => 'Country', 'enabled' => 1, 'visible' => -1, 'position' => 95),
+		'email' => array('type' => 'varchar(255)', 'label' => 'Email', 'enabled' => 1, 'visible' => -1, 'position' => 100),
+		'socialnetworks' => array('type' => 'text', 'label' => 'Socialnetworks', 'enabled' => 1, 'visible' => -1, 'position' => 105),
+		'phone' => array('type' => 'varchar(30)', 'label' => 'Phone', 'enabled' => 1, 'visible' => -1, 'position' => 115),
+		'phone_perso' => array('type' => 'varchar(30)', 'label' => 'Phone perso', 'enabled' => 1, 'visible' => -1, 'position' => 120),
+		'phone_mobile' => array('type' => 'varchar(30)', 'label' => 'Phone mobile', 'enabled' => 1, 'visible' => -1, 'position' => 125),
+		'birth' => array('type' => 'date', 'label' => 'DateToBirth', 'enabled' => 1, 'visible' => -1, 'position' => 130),
+		'photo' => array('type' => 'varchar(255)', 'label' => 'Photo', 'enabled' => 1, 'visible' => -1, 'position' => 135),
+		'public' => array('type' => 'smallint(6)', 'label' => 'Public', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 145),
+		'datefin' => array('type' => 'datetime', 'label' => 'DateEnd', 'enabled' => 1, 'visible' => -1, 'position' => 150),
+		'note_private' => array('type' => 'text', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 155),
+		'note_public' => array('type' => 'text', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 160),
+		'datevalid' => array('type' => 'datetime', 'label' => 'DateValidation', 'enabled' => 1, 'visible' => -1, 'position' => 165),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 170),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 175),
+		'fk_user_author' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fk user author', 'enabled' => 1, 'visible' => -1, 'position' => 180),
+		'fk_user_mod' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fk user mod', 'enabled' => 1, 'visible' => -1, 'position' => 185),
+		'fk_user_valid' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserValidation', 'enabled' => 1, 'visible' => -1, 'position' => 190),
+		'canvas' => array('type' => 'varchar(32)', 'label' => 'Canvas', 'enabled' => 1, 'visible' => -1, 'position' => 195),
+		'statut' => array('type' => 'smallint(6)', 'label' => 'Statut', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 500,
+			'arrayofkeyval' => array(0 => 'Draft', 1 => 'Validated', -1 => 'MemberStatusResiliatedShort')),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'visible' => 0, 'position' => 800),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 805));
 
 
 	/**
@@ -304,7 +313,7 @@ class Adherent extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Function sending an email to the current member with the text supplied in parameter.
 	 *
@@ -323,17 +332,16 @@ class Adherent extends CommonObject
 	 */
 	public function send_an_email($text, $subject, $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array(), $addr_cc = "", $addr_bcc = "", $deliveryreceipt = 0, $msgishtml = -1, $errors_to = '', $moreinheader = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		// Detect if message is HTML
-		if ($msgishtml == -1)
-		{
+		if ($msgishtml == -1) {
 			$msgishtml = 0;
 			if (dol_textishtml($text, 0)) $msgishtml = 1;
 		}
 
-		dol_syslog('send_an_email msgishtml='.$msgishtml);
+		dol_syslog('send_an_email msgishtml=' . $msgishtml);
 
 		$texttosend = $this->makeSubstitution($text);
 		$subjecttosend = $this->makeSubstitution($subject);
@@ -343,18 +351,15 @@ class Adherent extends CommonObject
 		$from = $conf->email_from;
 		if (!empty($conf->global->ADHERENT_MAIL_FROM)) $from = $conf->global->ADHERENT_MAIL_FROM;
 
-		$trackid = 'mem'.$this->id;
+		$trackid = 'mem' . $this->id;
 
 		// Send email (substitutionarray must be done just before this)
-		include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
 		$mailfile = new CMailFile($subjecttosend, $this->email, $from, $texttosend, $filename_list, $mimetype_list, $mimefilename_list, $addr_cc, $addr_bcc, $deliveryreceipt, $msgishtml, '', '', $trackid, $moreinheader);
-		if ($mailfile->sendfile())
-		{
+		if ($mailfile->sendfile()) {
 			return 1;
-		}
-		else
-		{
-			$this->error = $langs->trans("ErrorFailedToSendMail", $from, $this->email).'. '.$mailfile->error;
+		} else {
+			$this->error = $langs->trans("ErrorFailedToSendMail", $from, $this->email) . '. ' . $mailfile->error;
 			return -1;
 		}
 	}
@@ -376,50 +381,43 @@ class Adherent extends CommonObject
 		if (dol_textishtml($text, 1)) $msgishtml = 1;
 
 		$infos = '';
-		if ($this->civility_id) $infos .= $langs->transnoentities("UserTitle").": ".$this->getCivilityLabel()."\n";
-		$infos .= $langs->transnoentities("id").": ".$this->id."\n";
-		$infos .= $langs->transnoentities("Lastname").": ".$this->lastname."\n";
-		$infos .= $langs->transnoentities("Firstname").": ".$this->firstname."\n";
-		$infos .= $langs->transnoentities("Company").": ".$this->company."\n";
-		$infos .= $langs->transnoentities("Address").": ".$this->address."\n";
-		$infos .= $langs->transnoentities("Zip").": ".$this->zip."\n";
-		$infos .= $langs->transnoentities("Town").": ".$this->town."\n";
-		$infos .= $langs->transnoentities("Country").": ".$this->country."\n";
-		$infos .= $langs->transnoentities("EMail").": ".$this->email."\n";
-		$infos .= $langs->transnoentities("PhonePro").": ".$this->phone."\n";
-		$infos .= $langs->transnoentities("PhonePerso").": ".$this->phone_perso."\n";
-		$infos .= $langs->transnoentities("PhoneMobile").": ".$this->phone_mobile."\n";
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			$infos .= $langs->transnoentities("Login").": ".$this->login."\n";
-			$infos .= $langs->transnoentities("Password").": ".$this->pass."\n";
+		if ($this->civility_id) $infos .= $langs->transnoentities("UserTitle") . ": " . $this->getCivilityLabel() . "\n";
+		$infos .= $langs->transnoentities("id") . ": " . $this->id . "\n";
+		$infos .= $langs->transnoentities("Lastname") . ": " . $this->lastname . "\n";
+		$infos .= $langs->transnoentities("Firstname") . ": " . $this->firstname . "\n";
+		$infos .= $langs->transnoentities("Company") . ": " . $this->company . "\n";
+		$infos .= $langs->transnoentities("Address") . ": " . $this->address . "\n";
+		$infos .= $langs->transnoentities("Zip") . ": " . $this->zip . "\n";
+		$infos .= $langs->transnoentities("Town") . ": " . $this->town . "\n";
+		$infos .= $langs->transnoentities("Country") . ": " . $this->country . "\n";
+		$infos .= $langs->transnoentities("EMail") . ": " . $this->email . "\n";
+		$infos .= $langs->transnoentities("PhonePro") . ": " . $this->phone . "\n";
+		$infos .= $langs->transnoentities("PhonePerso") . ": " . $this->phone_perso . "\n";
+		$infos .= $langs->transnoentities("PhoneMobile") . ": " . $this->phone_mobile . "\n";
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+			$infos .= $langs->transnoentities("Login") . ": " . $this->login . "\n";
+			$infos .= $langs->transnoentities("Password") . ": " . $this->pass . "\n";
 		}
-		$infos .= $langs->transnoentities("Birthday").": ".$birthday."\n";
-		$infos .= $langs->transnoentities("Photo").": ".$this->photo."\n";
-		$infos .= $langs->transnoentities("Public").": ".yn($this->public);
+		$infos .= $langs->transnoentities("Birthday") . ": " . $birthday . "\n";
+		$infos .= $langs->transnoentities("Photo") . ": " . $this->photo . "\n";
+		$infos .= $langs->transnoentities("Public") . ": " . yn($this->public);
 
 		// Substitutions
-		$substitutionarray = array(
-		    '__ID__'=>$this->id,
-		    '__MEMBER_ID__'=>$this->id,
-			'__CIVILITY__'=>$this->getCivilityLabel(),
-			'__FIRSTNAME__'=>$msgishtml ?dol_htmlentitiesbr($this->firstname) : ($this->firstname ? $this->firstname : ''),
-			'__LASTNAME__'=>$msgishtml ?dol_htmlentitiesbr($this->lastname) : ($this->lastname ? $this->lastname : ''),
-			'__FULLNAME__'=>$msgishtml ?dol_htmlentitiesbr($this->getFullName($langs)) : $this->getFullName($langs),
-			'__COMPANY__'=>$msgishtml ?dol_htmlentitiesbr($this->company) : ($this->company ? $this->company : ''),
-			'__ADDRESS__'=>$msgishtml ?dol_htmlentitiesbr($this->address) : ($this->address ? $this->address : ''),
-			'__ZIP__'=>$msgishtml ?dol_htmlentitiesbr($this->zip) : ($this->zip ? $this->zip : ''),
-			'__TOWN__'=>$msgishtml ?dol_htmlentitiesbr($this->town) : ($this->town ? $this->town : ''),
-			'__COUNTRY__'=>$msgishtml ?dol_htmlentitiesbr($this->country) : ($this->country ? $this->country : ''),
-			'__EMAIL__'=>$msgishtml ?dol_htmlentitiesbr($this->email) : ($this->email ? $this->email : ''),
-			'__BIRTH__'=>$msgishtml ?dol_htmlentitiesbr($birthday) : ($birthday ? $birthday : ''),
-			'__PHOTO__'=>$msgishtml ?dol_htmlentitiesbr($this->photo) : ($this->photo ? $this->photo : ''),
-			'__LOGIN__'=>$msgishtml ?dol_htmlentitiesbr($this->login) : ($this->login ? $this->login : ''),
-			'__PASSWORD__'=>$msgishtml ?dol_htmlentitiesbr($this->pass) : ($this->pass ? $this->pass : ''),
-			'__PHONE__'=>$msgishtml ?dol_htmlentitiesbr($this->phone) : ($this->phone ? $this->phone : ''),
-			'__PHONEPRO__'=>$msgishtml ?dol_htmlentitiesbr($this->phone_perso) : ($this->phone_perso ? $this->phone_perso : ''),
-			'__PHONEMOBILE__'=>$msgishtml ?dol_htmlentitiesbr($this->phone_mobile) : ($this->phone_mobile ? $this->phone_mobile : '')
-		);
+		$substitutionarray = array('__ID__' => $this->id, '__MEMBER_ID__' => $this->id, '__CIVILITY__' => $this->getCivilityLabel(),
+			'__FIRSTNAME__' => $msgishtml ? dol_htmlentitiesbr($this->firstname) : ($this->firstname ? $this->firstname : ''),
+			'__LASTNAME__' => $msgishtml ? dol_htmlentitiesbr($this->lastname) : ($this->lastname ? $this->lastname : ''),
+			'__FULLNAME__' => $msgishtml ? dol_htmlentitiesbr($this->getFullName($langs)) : $this->getFullName($langs),
+			'__COMPANY__' => $msgishtml ? dol_htmlentitiesbr($this->company) : ($this->company ? $this->company : ''),
+			'__ADDRESS__' => $msgishtml ? dol_htmlentitiesbr($this->address) : ($this->address ? $this->address : ''),
+			'__ZIP__' => $msgishtml ? dol_htmlentitiesbr($this->zip) : ($this->zip ? $this->zip : ''), '__TOWN__' => $msgishtml ? dol_htmlentitiesbr($this->town) : ($this->town ? $this->town : ''),
+			'__COUNTRY__' => $msgishtml ? dol_htmlentitiesbr($this->country) : ($this->country ? $this->country : ''),
+			'__EMAIL__' => $msgishtml ? dol_htmlentitiesbr($this->email) : ($this->email ? $this->email : ''), '__BIRTH__' => $msgishtml ? dol_htmlentitiesbr($birthday) : ($birthday ? $birthday : ''),
+			'__PHOTO__' => $msgishtml ? dol_htmlentitiesbr($this->photo) : ($this->photo ? $this->photo : ''),
+			'__LOGIN__' => $msgishtml ? dol_htmlentitiesbr($this->login) : ($this->login ? $this->login : ''),
+			'__PASSWORD__' => $msgishtml ? dol_htmlentitiesbr($this->pass) : ($this->pass ? $this->pass : ''),
+			'__PHONE__' => $msgishtml ? dol_htmlentitiesbr($this->phone) : ($this->phone ? $this->phone : ''),
+			'__PHONEPRO__' => $msgishtml ? dol_htmlentitiesbr($this->phone_perso) : ($this->phone_perso ? $this->phone_perso : ''),
+			'__PHONEMOBILE__' => $msgishtml ? dol_htmlentitiesbr($this->phone_mobile) : ($this->phone_mobile ? $this->phone_mobile : ''));
 
 		complete_substitutions_array($substitutionarray, $langs, $this);
 
@@ -436,9 +434,15 @@ class Adherent extends CommonObject
 	public function getmorphylib($morphy = '')
 	{
 		global $langs;
-		if (!$morphy) { $morphy = $this->morphy; }
-		if ($morphy == 'phy') { return $langs->trans("Physical"); }
-		if ($morphy == 'mor') { return $langs->trans("Moral"); }
+		if (!$morphy) {
+			$morphy = $this->morphy;
+		}
+		if ($morphy == 'phy') {
+			return $langs->trans("Physical");
+		}
+		if ($morphy == 'mor') {
+			return $langs->trans("Moral");
+		}
 		return $morphy;
 	}
 
@@ -461,17 +465,14 @@ class Adherent extends CommonObject
 		$this->import_key = trim($this->import_key);
 
 		// Check parameters
-		if (!empty($conf->global->ADHERENT_MAIL_REQUIRED) && !isValidEMail($this->email))
-		{
+		if (!empty($conf->global->ADHERENT_MAIL_REQUIRED) && !isValidEMail($this->email)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadEMail", $this->email);
 			return -1;
 		}
 		if (!$this->datec) $this->datec = $now;
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			if (empty($this->login))
-			{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+			if (empty($this->login)) {
 				$this->error = $langs->trans("ErrorWrongValueForParameterX", "Login");
 				return -1;
 			}
@@ -480,83 +481,72 @@ class Adherent extends CommonObject
 		$this->db->begin();
 
 		// Insert member
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."adherent";
+		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "adherent";
 		$sql .= " (datec,login,fk_user_author,fk_user_mod,fk_user_valid,morphy,fk_adherent_type,entity,import_key)";
 		$sql .= " VALUES (";
-		$sql .= " '".$this->db->idate($this->datec)."'";
-		$sql .= ", ".($this->login ? "'".$this->db->escape($this->login)."'" : "null");
-		$sql .= ", ".($user->id > 0 ? $user->id : "null"); // Can be null because member can be created by a guest or a script
-		$sql .= ", null, null, '".$this->db->escape($this->morphy)."'";
-		$sql .= ", ".$this->typeid;
-		$sql .= ", ".$conf->entity;
-		$sql .= ", ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
+		$sql .= " '" . $this->db->idate($this->datec) . "'";
+		$sql .= ", " . ($this->login ? "'" . $this->db->escape($this->login) . "'" : "null");
+		$sql .= ", " . ($user->id > 0 ? $user->id : "null"); // Can be null because member can be created by a guest or a script
+		$sql .= ", null, null, '" . $this->db->escape($this->morphy) . "'";
+		$sql .= ", " . $this->typeid;
+		$sql .= ", " . $conf->entity;
+		$sql .= ", " . (!empty($this->import_key) ? "'" . $this->db->escape($this->import_key) . "'" : "null");
 		$sql .= ")";
 
-		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		dol_syslog(get_class($this) . "::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			$id = $this->db->last_insert_id(MAIN_DB_PREFIX."adherent");
-			if ($id > 0)
-			{
+		if ($result) {
+			$id = $this->db->last_insert_id(MAIN_DB_PREFIX . "adherent");
+			if ($id > 0) {
 				$this->id = $id;
 				$this->ref = (string) $id;
 
 				// Update minor fields
 				$result = $this->update($user, 1, 1, 0, 0, 'add'); // nosync is 1 to avoid update data of user
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->db->rollback();
 					return -1;
 				}
 
 				// Add link to user
-				if ($this->user_id)
-				{
+				if ($this->user_id) {
 					// Add link to user
-					$sql = "UPDATE ".MAIN_DB_PREFIX."user SET";
-					$sql .= " fk_member = ".$this->id;
-					$sql .= " WHERE rowid = ".$this->user_id;
-					dol_syslog(get_class($this)."::create", LOG_DEBUG);
+					$sql = "UPDATE " . MAIN_DB_PREFIX . "user SET";
+					$sql .= " fk_member = " . $this->id;
+					$sql .= " WHERE rowid = " . $this->user_id;
+					dol_syslog(get_class($this) . "::create", LOG_DEBUG);
 					$resql = $this->db->query($sql);
-					if (!$resql)
-					{
+					if (!$resql) {
 						$this->error = 'Failed to update user to make link with member';
 						$this->db->rollback();
 						return -4;
 					}
 				}
 
-				if (!$notrigger)
-				{
+				if (!$notrigger) {
 					// Call trigger
 					$result = $this->call_trigger('MEMBER_CREATE', $user);
-					if ($result < 0) { $error++; }
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
 				}
 
-				if (count($this->errors))
-				{
-					dol_syslog(get_class($this)."::create ".implode(',', $this->errors), LOG_ERR);
+				if (count($this->errors)) {
+					dol_syslog(get_class($this) . "::create " . implode(',', $this->errors), LOG_ERR);
 					$this->db->rollback();
 					return -3;
-				}
-				else
-				{
+				} else {
 					$this->db->commit();
 					return $this->id;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = 'Failed to get last insert id';
-				dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
+				dol_syslog(get_class($this) . "::create " . $this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -582,25 +572,25 @@ class Adherent extends CommonObject
 		$nbrowsaffected = 0;
 		$error = 0;
 
-		dol_syslog(get_class($this)."::update notrigger=".$notrigger.", nosyncuser=".$nosyncuser.", nosyncuserpass=".$nosyncuserpass." nosyncthirdparty=".$nosyncthirdparty.", email=".$this->email);
+		dol_syslog(get_class($this) . "::update notrigger=" . $notrigger . ", nosyncuser=" . $nosyncuser . ", nosyncuserpass=" . $nosyncuserpass . " nosyncthirdparty=" . $nosyncthirdparty . ", email=" .
+			$this->email);
 
 		// Clean parameters
-		$this->lastname     = trim($this->lastname) ?trim($this->lastname) : trim($this->lastname);
-		$this->firstname    = trim($this->firstname) ?trim($this->firstname) : trim($this->firstname);
-		$this->gender       = trim($this->gender);
-		$this->address      = ($this->address ? $this->address : $this->address);
-		$this->zip          = ($this->zip ? $this->zip : $this->zip);
-		$this->town         = ($this->town ? $this->town : $this->town);
-		$this->country_id   = ($this->country_id > 0 ? $this->country_id : $this->country_id);
-		$this->state_id     = ($this->state_id > 0 ? $this->state_id : $this->state_id);
+		$this->lastname = trim($this->lastname) ? trim($this->lastname) : trim($this->lastname);
+		$this->firstname = trim($this->firstname) ? trim($this->firstname) : trim($this->firstname);
+		$this->gender = trim($this->gender);
+		$this->address = ($this->address ? $this->address : $this->address);
+		$this->zip = ($this->zip ? $this->zip : $this->zip);
+		$this->town = ($this->town ? $this->town : $this->town);
+		$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
+		$this->state_id = ($this->state_id > 0 ? $this->state_id : $this->state_id);
 		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname = ucwords(trim($this->lastname));
 		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname = ucwords(trim($this->firstname));
-		$this->note_public  = ($this->note_public ? $this->note_public : $this->note_public);
+		$this->note_public = ($this->note_public ? $this->note_public : $this->note_public);
 		$this->note_private = ($this->note_private ? $this->note_private : $this->note_private);
 
 		// Check parameters
-		if (!empty($conf->global->ADHERENT_MAIL_REQUIRED) && !isValidEMail($this->email))
-		{
+		if (!empty($conf->global->ADHERENT_MAIL_REQUIRED) && !isValidEMail($this->email)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadEMail", $this->email);
 			return -1;
@@ -608,58 +598,54 @@ class Adherent extends CommonObject
 
 		$this->db->begin();
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
-		$sql .= " civility = ".($this->civility_id ? "'".$this->db->escape($this->civility_id)."'" : "null");
-		$sql .= ", firstname = ".($this->firstname ? "'".$this->db->escape($this->firstname)."'" : "null");
-		$sql .= ", lastname = ".($this->lastname ? "'".$this->db->escape($this->lastname)."'" : "null");
-		$sql .= ", gender = ".($this->gender != -1 ? "'".$this->db->escape($this->gender)."'" : "null"); // 'man' or 'woman'
-		$sql .= ", login = ".($this->login ? "'".$this->db->escape($this->login)."'" : "null");
-		$sql .= ", societe = ".($this->company ? "'".$this->db->escape($this->company)."'" : ($this->societe ? "'".$this->db->escape($this->societe)."'" : "null"));
-		$sql .= ", fk_soc = ".($this->socid > 0 ? $this->db->escape($this->socid) : "null");
-		$sql .= ", address = ".($this->address ? "'".$this->db->escape($this->address)."'" : "null");
-		$sql .= ", zip = ".($this->zip ? "'".$this->db->escape($this->zip)."'" : "null");
-		$sql .= ", town = ".($this->town ? "'".$this->db->escape($this->town)."'" : "null");
-		$sql .= ", country = ".($this->country_id > 0 ? $this->db->escape($this->country_id) : "null");
-		$sql .= ", state_id = ".($this->state_id > 0 ? $this->db->escape($this->state_id) : "null");
-		$sql .= ", email = '".$this->db->escape($this->email)."'";
-		$sql .= ", socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'";
-		$sql .= ", phone = ".($this->phone ? "'".$this->db->escape($this->phone)."'" : "null");
-		$sql .= ", phone_perso = ".($this->phone_perso ? "'".$this->db->escape($this->phone_perso)."'" : "null");
-		$sql .= ", phone_mobile = ".($this->phone_mobile ? "'".$this->db->escape($this->phone_mobile)."'" : "null");
-		$sql .= ", note_private = ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "null");
-		$sql .= ", note_public = ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : "null");
-		$sql .= ", photo = ".($this->photo ? "'".$this->db->escape($this->photo)."'" : "null");
-		$sql .= ", public = '".$this->db->escape($this->public)."'";
-		$sql .= ", statut = ".$this->db->escape($this->statut);
-		$sql .= ", fk_adherent_type = ".$this->db->escape($this->typeid);
-		$sql .= ", morphy = '".$this->db->escape($this->morphy)."'";
-		$sql .= ", birth = ".($this->birth ? "'".$this->db->idate($this->birth)."'" : "null");
-		if ($this->socid)   $sql .= ", fk_soc = '".$this->db->escape($this->socid)."'"; // Must be modified only when creating from a third-party
-		if ($this->datefin)   $sql .= ", datefin = '".$this->db->idate($this->datefin)."'"; // Must be modified only when deleting a subscription
-		if ($this->datevalid) $sql .= ", datevalid = '".$this->db->idate($this->datevalid)."'"; // Must be modified only when validating a member
-		$sql .= ", fk_user_mod = ".($user->id > 0 ? $user->id : 'null'); // Can be null because member can be create by a guest
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql = "UPDATE " . MAIN_DB_PREFIX . "adherent SET";
+		$sql .= " civility = " . ($this->civility_id ? "'" . $this->db->escape($this->civility_id) . "'" : "null");
+		$sql .= ", firstname = " . ($this->firstname ? "'" . $this->db->escape($this->firstname) . "'" : "null");
+		$sql .= ", lastname = " . ($this->lastname ? "'" . $this->db->escape($this->lastname) . "'" : "null");
+		$sql .= ", gender = " . ($this->gender != -1 ? "'" . $this->db->escape($this->gender) . "'" : "null"); // 'man' or 'woman'
+		$sql .= ", login = " . ($this->login ? "'" . $this->db->escape($this->login) . "'" : "null");
+		$sql .= ", societe = " . ($this->company ? "'" . $this->db->escape($this->company) . "'" : ($this->societe ? "'" . $this->db->escape($this->societe) . "'" : "null"));
+		$sql .= ", fk_soc = " . ($this->socid > 0 ? $this->db->escape($this->socid) : "null");
+		$sql .= ", address = " . ($this->address ? "'" . $this->db->escape($this->address) . "'" : "null");
+		$sql .= ", zip = " . ($this->zip ? "'" . $this->db->escape($this->zip) . "'" : "null");
+		$sql .= ", town = " . ($this->town ? "'" . $this->db->escape($this->town) . "'" : "null");
+		$sql .= ", country = " . ($this->country_id > 0 ? $this->db->escape($this->country_id) : "null");
+		$sql .= ", state_id = " . ($this->state_id > 0 ? $this->db->escape($this->state_id) : "null");
+		$sql .= ", email = '" . $this->db->escape($this->email) . "'";
+		$sql .= ", socialnetworks = '" . $this->db->escape(json_encode($this->socialnetworks)) . "'";
+		$sql .= ", phone = " . ($this->phone ? "'" . $this->db->escape($this->phone) . "'" : "null");
+		$sql .= ", phone_perso = " . ($this->phone_perso ? "'" . $this->db->escape($this->phone_perso) . "'" : "null");
+		$sql .= ", phone_mobile = " . ($this->phone_mobile ? "'" . $this->db->escape($this->phone_mobile) . "'" : "null");
+		$sql .= ", note_private = " . ($this->note_private ? "'" . $this->db->escape($this->note_private) . "'" : "null");
+		$sql .= ", note_public = " . ($this->note_public ? "'" . $this->db->escape($this->note_public) . "'" : "null");
+		$sql .= ", photo = " . ($this->photo ? "'" . $this->db->escape($this->photo) . "'" : "null");
+		$sql .= ", public = '" . $this->db->escape($this->public) . "'";
+		$sql .= ", statut = " . $this->db->escape($this->statut);
+		$sql .= ", fk_adherent_type = " . $this->db->escape($this->typeid);
+		$sql .= ", morphy = '" . $this->db->escape($this->morphy) . "'";
+		$sql .= ", birth = " . ($this->birth ? "'" . $this->db->idate($this->birth) . "'" : "null");
+		if ($this->socid) $sql .= ", fk_soc = '" . $this->db->escape($this->socid) . "'"; // Must be modified only when creating from a third-party
+		if ($this->datefin) $sql .= ", datefin = '" . $this->db->idate($this->datefin) . "'"; // Must be modified only when deleting a subscription
+		if ($this->datevalid) $sql .= ", datevalid = '" . $this->db->idate($this->datevalid) . "'"; // Must be modified only when validating a member
+		$sql .= ", fk_user_mod = " . ($user->id > 0 ? $user->id : 'null'); // Can be null because member can be create by a guest
+		$sql .= " WHERE rowid = " . $this->id;
 
 		// If we change the type of membership, we set also label of new type
-		if (!empty($this->oldcopy) && $this->typeid != $this->oldcopy->typeid)
-		{
+		if (!empty($this->oldcopy) && $this->typeid != $this->oldcopy->typeid) {
 			$sql2 = "SELECT libelle as label";
-			$sql2 .= " FROM ".MAIN_DB_PREFIX."adherent_type";
-			$sql2 .= " WHERE rowid = ".$this->typeid;
+			$sql2 .= " FROM " . MAIN_DB_PREFIX . "adherent_type";
+			$sql2 .= " WHERE rowid = " . $this->typeid;
 			$resql2 = $this->db->query($sql2);
-			if ($resql2)
-			{
-			    while ($obj = $this->db->fetch_object($resql2))
-			    {
+			if ($resql2) {
+				while ($obj = $this->db->fetch_object($resql2)) {
 					$this->type = $obj->label;
-			    }
+				}
 			}
 		}
 
-		dol_syslog(get_class($this)."::update update member", LOG_DEBUG);
+		dol_syslog(get_class($this) . "::update update member", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			unset($this->country_code);
 			unset($this->country);
 			unset($this->state_code);
@@ -673,18 +659,15 @@ class Adherent extends CommonObject
 			if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
 			// Update password
-			if (!$error && $this->pass)
-			{
-				dol_syslog(get_class($this)."::update update password");
-				if ($this->pass != $this->pass_indatabase && $this->pass != $this->pass_indatabase_crypted)
-				{
+			if (!$error && $this->pass) {
+				dol_syslog(get_class($this) . "::update update password");
+				if ($this->pass != $this->pass_indatabase && $this->pass != $this->pass_indatabase_crypted) {
 					$isencrypted = empty($conf->global->DATABASE_PWD_ENCRYPTED) ? 0 : 1;
 
 					// If password to set differs from the one found into database
@@ -694,37 +677,41 @@ class Adherent extends CommonObject
 			}
 
 			// Remove links to user and replace with new one
-			if (!$error)
-			{
-				dol_syslog(get_class($this)."::update update link to user");
-				$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = NULL WHERE fk_member = ".$this->id;
-				dol_syslog(get_class($this)."::update", LOG_DEBUG);
+			if (!$error) {
+				dol_syslog(get_class($this) . "::update update link to user");
+				$sql = "UPDATE " . MAIN_DB_PREFIX . "user SET fk_member = NULL WHERE fk_member = " . $this->id;
+				dol_syslog(get_class($this) . "::update", LOG_DEBUG);
 				$resql = $this->db->query($sql);
-				if (!$resql) { $this->error = $this->db->error(); $this->db->rollback(); return -5; }
+				if (!$resql) {
+					$this->error = $this->db->error();
+					$this->db->rollback();
+					return -5;
+				}
 				// If there is a user linked to this member
-				if ($this->user_id > 0)
-				{
-					$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = ".$this->id." WHERE rowid = ".$this->user_id;
-					dol_syslog(get_class($this)."::update", LOG_DEBUG);
+				if ($this->user_id > 0) {
+					$sql = "UPDATE " . MAIN_DB_PREFIX . "user SET fk_member = " . $this->id . " WHERE rowid = " . $this->user_id;
+					dol_syslog(get_class($this) . "::update", LOG_DEBUG);
 					$resql = $this->db->query($sql);
-					if (!$resql) { $this->error = $this->db->error(); $this->db->rollback(); return -5; }
+					if (!$resql) {
+						$this->error = $this->db->error();
+						$this->db->rollback();
+						return -5;
+					}
 				}
 			}
 
-			if (!$error && $nbrowsaffected)	// If something has change in main data
+			if (!$error && $nbrowsaffected) // If something has change in main data
 			{
 				// Update information on linked user if it is an update
-				if (!$error && $this->user_id > 0 && !$nosyncuser)
-				{
-					require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+				if (!$error && $this->user_id > 0 && !$nosyncuser) {
+					require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
 
-					dol_syslog(get_class($this)."::update update linked user");
+					dol_syslog(get_class($this) . "::update update linked user");
 
 					$luser = new User($this->db);
 					$result = $luser->fetch($this->user_id);
 
-					if ($result >= 0)
-					{
+					if ($result >= 0) {
 						//var_dump($this->user_login);exit;
 						//var_dump($this->login);exit;
 
@@ -754,34 +741,29 @@ class Adherent extends CommonObject
 						$luser->fk_member = $this->id;
 
 						$result = $luser->update($user, 0, 1, 1); // Use nosync to 1 to avoid cyclic updates
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$this->error = $luser->error;
-							dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
+							dol_syslog(get_class($this) . "::update " . $this->error, LOG_ERR);
 							$error++;
 						}
-					}
-					else
-					{
+					} else {
 						$this->error = $luser->error;
 						$error++;
 					}
 				}
 
 				// Update information on linked thirdparty if it is an update
-				if (!$error && $this->fk_soc > 0 && !$nosyncthirdparty)
-				{
-					require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+				if (!$error && $this->fk_soc > 0 && !$nosyncthirdparty) {
+					require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 
-					dol_syslog(get_class($this)."::update update linked thirdparty");
+					dol_syslog(get_class($this) . "::update update linked thirdparty");
 
 					// This member is linked with a thirdparty, so we also update thirdparty informations
 					// if this is an update.
 					$lthirdparty = new Societe($this->db);
 					$result = $lthirdparty->fetch($this->fk_soc);
 
-					if ($result > 0)
-					{
+					if ($result > 0) {
 						$lthirdparty->address = $this->address;
 						$lthirdparty->zip = $this->zip;
 						$lthirdparty->town = $this->town;
@@ -794,43 +776,36 @@ class Adherent extends CommonObject
 
 						$result = $lthirdparty->update($this->fk_soc, $user, 0, 1, 1, 'update'); // Use sync to 0 to avoid cyclic updates
 
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$this->error = $lthirdparty->error;
 							$this->errors = $lthirdparty->errors;
-							dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
+							dol_syslog(get_class($this) . "::update " . $this->error, LOG_ERR);
 							$error++;
 						}
-					}
-					elseif ($result < 0)
-					{
+					} elseif ($result < 0) {
 						$this->error = $lthirdparty->error;
 						$error++;
 					}
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('MEMBER_MODIFY', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return $nbrowsaffected;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -2;
@@ -838,7 +813,7 @@ class Adherent extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Update denormalized last subscription date.
 	 * 	This function is called when we delete a subscription for example.
@@ -848,47 +823,41 @@ class Adherent extends CommonObject
 	 */
 	public function update_end_date($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->db->begin();
 
 		// Search for last subscription id and end date
 		$sql = "SELECT rowid, datec as dateop, dateadh as datedeb, datef as datefin";
-		$sql .= " FROM ".MAIN_DB_PREFIX."subscription";
-		$sql .= " WHERE fk_adherent=".$this->id;
+		$sql .= " FROM " . MAIN_DB_PREFIX . "subscription";
+		$sql .= " WHERE fk_adherent=" . $this->id;
 		$sql .= " ORDER by dateadh DESC"; // Sort by start subscription date
 
-		dol_syslog(get_class($this)."::update_end_date", LOG_DEBUG);
+		dol_syslog(get_class($this) . "::update_end_date", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			$dateop = $this->db->jdate($obj->dateop);
 			$datedeb = $this->db->jdate($obj->datedeb);
 			$datefin = $this->db->jdate($obj->datefin);
 
-			$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
-			$sql .= " datefin=".($datefin != '' ? "'".$this->db->idate($datefin)."'" : "null");
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql = "UPDATE " . MAIN_DB_PREFIX . "adherent SET";
+			$sql .= " datefin=" . ($datefin != '' ? "'" . $this->db->idate($datefin) . "'" : "null");
+			$sql .= " WHERE rowid = " . $this->id;
 
-			dol_syslog(get_class($this)."::update_end_date", LOG_DEBUG);
+			dol_syslog(get_class($this) . "::update_end_date", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$this->last_subscription_date = $dateop;
 				$this->last_subscription_date_start = $datedeb;
 				$this->last_subscription_date_end = $datefin;
 				$this->datefin = $datefin;
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -916,8 +885,7 @@ class Adherent extends CommonObject
 
 		$this->db->begin();
 
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('MEMBER_DELETE', $user);
 			if ($result < 0) $error++;
@@ -925,24 +893,21 @@ class Adherent extends CommonObject
 		}
 
 		// Remove category
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_member WHERE fk_member = ".$rowid;
-		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		$sql = "DELETE FROM " . MAIN_DB_PREFIX . "categorie_member WHERE fk_member = " . $rowid;
+		dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$error++;
 			$this->error .= $this->db->lasterror();
 			$errorflag = -1;
 		}
 
 		// Remove subscription
-		if (!$error)
-		{
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."subscription WHERE fk_adherent = ".$rowid;
-			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		if (!$error) {
+			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "subscription WHERE fk_adherent = " . $rowid;
+			dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$error++;
 				$this->error .= $this->db->lasterror();
 				$errorflag = -2;
@@ -950,11 +915,9 @@ class Adherent extends CommonObject
 		}
 
 		// Remove linked user
-		if (!$error)
-		{
+		if (!$error) {
 			$ret = $this->setUserId(0);
-			if ($ret < 0)
-			{
+			if ($ret < 0) {
 				$error++;
 				$this->error .= $this->db->lasterror();
 				$errorflag = -3;
@@ -962,41 +925,34 @@ class Adherent extends CommonObject
 		}
 
 		// Removed extrafields
-		if (!$error)
-		{
+		if (!$error) {
 			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
 				$result = $this->deleteExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					$errorflag = -4;
-					dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);
+					dol_syslog(get_class($this) . "::delete erreur " . $errorflag . " " . $this->error, LOG_ERR);
 				}
 			}
 		}
 
 		// Remove adherent
-		if (!$error)
-		{
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent WHERE rowid = ".$rowid;
-			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		if (!$error) {
+			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "adherent WHERE rowid = " . $rowid;
+			dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$error++;
 				$this->error .= $this->db->lasterror();
 				$errorflag = -5;
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return $errorflag;
 		}
@@ -1019,12 +975,11 @@ class Adherent extends CommonObject
 
 		$error = 0;
 
-		dol_syslog(get_class($this)."::setPassword user=".$user->id." password=".preg_replace('/./i', '*', $password)." isencrypted=".$isencrypted);
+		dol_syslog(get_class($this) . "::setPassword user=" . $user->id . " password=" . preg_replace('/./i', '*', $password) . " isencrypted=" . $isencrypted);
 
 		// If new password not provided, we generate one
-		if (!$password)
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+		if (!$password) {
+			require_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';
 			$password = getRandomPassword(false);
 		}
 
@@ -1032,85 +987,73 @@ class Adherent extends CommonObject
 		$password_crypted = dol_hash($password);
 
 		$password_indatabase = '';
-		if (!$isencrypted)
-		{
+		if (!$isencrypted) {
 			$password_indatabase = $password;
 		}
 
 		$this->db->begin();
 
 		// Mise a jour
-		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
-		$sql .= " SET pass_crypted = '".$this->db->escape($password_crypted)."'";
+		$sql = "UPDATE " . MAIN_DB_PREFIX . "adherent";
+		$sql .= " SET pass_crypted = '" . $this->db->escape($password_crypted) . "'";
 		//if (! empty($conf->global->DATABASE_PWD_ENCRYPTED))
-		if ($isencrypted)
-		{
+		if ($isencrypted) {
 			$sql .= ", pass = null";
+		} else {
+			$sql .= ", pass = '" . $this->db->escape($password_indatabase) . "'";
 		}
-		else
-		{
-			$sql .= ", pass = '".$this->db->escape($password_indatabase)."'";
-		}
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = " . $this->id;
 
 		//dol_syslog("Adherent::Password sql=hidden");
-		dol_syslog(get_class($this)."::setPassword", LOG_DEBUG);
+		dol_syslog(get_class($this) . "::setPassword", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$nbaffectedrows = $this->db->affected_rows($result);
 
-			if ($nbaffectedrows)
-			{
+			if ($nbaffectedrows) {
 				$this->pass = $password;
 				$this->pass_indatabase = $password_indatabase;
 				$this->pass_indatabase_crypted = $password_crypted;
 
-				if ($this->user_id && !$nosyncuser)
-				{
-					require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+				if ($this->user_id && !$nosyncuser) {
+					require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
 
 					// This member is linked with a user, so we also update users informations
 					// if this is an update.
 					$luser = new User($this->db);
 					$result = $luser->fetch($this->user_id);
 
-					if ($result >= 0)
-					{
+					if ($result >= 0) {
 						$result = $luser->setPassword($user, $this->pass, 0, 0, 1);
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$this->error = $luser->error;
-							dol_syslog(get_class($this)."::setPassword ".$this->error, LOG_ERR);
+							dol_syslog(get_class($this) . "::setPassword " . $this->error, LOG_ERR);
 							$error++;
 						}
-					}
-					else
-					{
+					} else {
 						$this->error = $luser->error;
 						$error++;
 					}
 				}
 
-				if (!$error && !$notrigger)
-				{
+				if (!$error && !$notrigger) {
 					// Call trigger
 					$result = $this->call_trigger('MEMBER_NEW_PASSWORD', $user);
-					if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+					if ($result < 0) {
+						$error++;
+						$this->db->rollback();
+						return -1;
+					}
 					// End call triggers
 				}
 
 				$this->db->commit();
 				return $this->pass;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			dol_print_error($this->db);
 			return -1;
@@ -1131,19 +1074,26 @@ class Adherent extends CommonObject
 		$this->db->begin();
 
 		// If user is linked to this member, remove old link to this member
-		$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = NULL WHERE fk_member = ".$this->id;
-		dol_syslog(get_class($this)."::setUserId", LOG_DEBUG);
+		$sql = "UPDATE " . MAIN_DB_PREFIX . "user SET fk_member = NULL WHERE fk_member = " . $this->id;
+		dol_syslog(get_class($this) . "::setUserId", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $this->error = $this->db->error(); $this->db->rollback(); return -1; }
+		if (!$resql) {
+			$this->error = $this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
 
 		// Set link to user
-		if ($userid > 0)
-		{
-			$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = ".$this->id;
-			$sql .= " WHERE rowid = ".$userid;
-			dol_syslog(get_class($this)."::setUserId", LOG_DEBUG);
+		if ($userid > 0) {
+			$sql = "UPDATE " . MAIN_DB_PREFIX . "user SET fk_member = " . $this->id;
+			$sql .= " WHERE rowid = " . $userid;
+			dol_syslog(get_class($this) . "::setUserId", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql) { $this->error = $this->db->error(); $this->db->rollback(); return -2; }
+			if (!$resql) {
+				$this->error = $this->db->error();
+				$this->db->rollback();
+				return -2;
+			}
 		}
 
 		$this->db->commit();
@@ -1165,28 +1115,24 @@ class Adherent extends CommonObject
 		$this->db->begin();
 
 		// Remove link to third party onto any other members
-		if ($thirdpartyid > 0)
-		{
-			$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET fk_soc = null";
-			$sql .= " WHERE fk_soc = '".$thirdpartyid."'";
-			$sql .= " AND entity = ".$conf->entity;
-			dol_syslog(get_class($this)."::setThirdPartyId", LOG_DEBUG);
+		if ($thirdpartyid > 0) {
+			$sql = "UPDATE " . MAIN_DB_PREFIX . "adherent SET fk_soc = null";
+			$sql .= " WHERE fk_soc = '" . $thirdpartyid . "'";
+			$sql .= " AND entity = " . $conf->entity;
+			dol_syslog(get_class($this) . "::setThirdPartyId", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 		}
 
 		// Add link to third party for current member
-		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET fk_soc = ".($thirdpartyid > 0 ? $thirdpartyid : 'null');
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql = "UPDATE " . MAIN_DB_PREFIX . "adherent SET fk_soc = " . ($thirdpartyid > 0 ? $thirdpartyid : 'null');
+		$sql .= " WHERE rowid = " . $this->id;
 
-		dol_syslog(get_class($this)."::setThirdPartyId", LOG_DEBUG);
+		dol_syslog(get_class($this) . "::setThirdPartyId", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -1194,7 +1140,7 @@ class Adherent extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Method to load member from its login
 	 *
@@ -1203,29 +1149,25 @@ class Adherent extends CommonObject
 	 */
 	public function fetch_login($login)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
-		$sql .= " WHERE login='".$this->db->escape($login)."'";
-		$sql .= " AND entity = ".$conf->entity;
+		$sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "adherent";
+		$sql .= " WHERE login='" . $this->db->escape($login) . "'";
+		$sql .= " AND entity = " . $conf->entity;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 				$this->fetch($obj->rowid);
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Method to load member from its name
 	 *
@@ -1235,25 +1177,21 @@ class Adherent extends CommonObject
 	 */
 	public function fetch_name($firstname, $lastname)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
-		$sql .= " WHERE firstname='".$this->db->escape($firstname)."'";
-		$sql .= " AND lastname='".$this->db->escape($lastname)."'";
-		$sql .= " AND entity = ".$conf->entity;
+		$sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "adherent";
+		$sql .= " WHERE firstname='" . $this->db->escape($firstname) . "'";
+		$sql .= " AND lastname='" . $this->db->escape($lastname) . "'";
+		$sql .= " AND entity = " . $conf->entity;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 				$this->fetch($obj->rowid);
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -1289,28 +1227,27 @@ class Adherent extends CommonObject
 		$sql .= " dep.nom as state, dep.code_departement as state_code,";
 		$sql .= " t.libelle as type, t.subscription as subscription,";
 		$sql .= " u.rowid as user_id, u.login as user_login";
-		$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.country = c.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as dep ON d.state_id = dep.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON d.rowid = u.fk_member";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "adherent_type as t, " . MAIN_DB_PREFIX . "adherent as d";
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as c ON d.country = c.rowid";
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_departements as dep ON d.state_id = dep.rowid";
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "user as u ON d.rowid = u.fk_member";
 		$sql .= " WHERE d.fk_adherent_type = t.rowid";
-		if ($rowid) $sql .= " AND d.rowid=".$rowid;
+		if ($rowid)
+			$sql .= " AND d.rowid=" . $rowid;
 		elseif ($ref || $fk_soc) {
-			$sql .= " AND d.entity IN (".getEntity('adherent').")";
-			if ($ref) $sql .= " AND d.rowid='".$this->db->escape($ref)."'";
-			elseif ($fk_soc > 0) $sql .= " AND d.fk_soc=".$fk_soc;
-		}
-		elseif ($ref_ext)
-		{
-			$sql .= " AND d.ref_ext='".$this->db->escape($ref_ext)."'";
+			$sql .= " AND d.entity IN (" . getEntity('adherent') . ")";
+			if ($ref)
+				$sql .= " AND d.rowid='" . $this->db->escape($ref) . "'";
+			elseif ($fk_soc > 0)
+				$sql .= " AND d.fk_soc=" . $fk_soc;
+		} elseif ($ref_ext) {
+			$sql .= " AND d.ref_ext='" . $this->db->escape($ref_ext) . "'";
 		}
 
-		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->entity = $obj->entity;
@@ -1318,62 +1255,62 @@ class Adherent extends CommonObject
 				$this->id = $obj->rowid;
 				$this->ref_ext = $obj->ref_ext;
 
-				$this->civility_id      = $obj->civility_code; // Bad. Kept for backard compatibility
-				$this->civility_code    = $obj->civility_code;
-				$this->civility	        = $obj->civility_code ? ($langs->trans("Civility".$obj->civility_code) != ("Civility".$obj->civility_code) ? $langs->trans("Civility".$obj->civility_code) : $obj->civility_code) : '';
+				$this->civility_id = $obj->civility_code; // Bad. Kept for backard compatibility
+				$this->civility_code = $obj->civility_code;
+				$this->civility = $obj->civility_code ? ($langs->trans("Civility" . $obj->civility_code) != ("Civility" . $obj->civility_code) ? $langs->trans("Civility" . $obj->civility_code) : $obj->civility_code) : '';
 
-				$this->firstname		= $obj->firstname;
-				$this->lastname			= $obj->lastname;
+				$this->firstname = $obj->firstname;
+				$this->lastname = $obj->lastname;
 				$this->gender = $obj->gender;
-				$this->login			= $obj->login;
-				$this->societe			= $obj->company;
-				$this->company			= $obj->company;
-				$this->socid			= $obj->fk_soc;
+				$this->login = $obj->login;
+				$this->societe = $obj->company;
+				$this->company = $obj->company;
+				$this->socid = $obj->fk_soc;
 				$this->fk_soc = $obj->fk_soc; // For backward compatibility
-				$this->address			= $obj->address;
+				$this->address = $obj->address;
 				$this->zip = $obj->zip;
-				$this->town				= $obj->town;
+				$this->town = $obj->town;
 
-				$this->pass				= $obj->pass;
+				$this->pass = $obj->pass;
 				$this->pass_indatabase = $obj->pass;
 				$this->pass_indatabase_crypted = $obj->pass_crypted;
 
 				$this->state_id = $obj->state_id;
-				$this->state_code		= $obj->state_id ? $obj->state_code : '';
+				$this->state_code = $obj->state_id ? $obj->state_code : '';
 				$this->state = $obj->state_id ? $obj->state : '';
 
-				$this->country_id		= $obj->country_id;
+				$this->country_id = $obj->country_id;
 				$this->country_code = $obj->country_code;
-				if ($langs->trans("Country".$obj->country_code) != "Country".$obj->country_code)
-					$this->country = $langs->transnoentitiesnoconv("Country".$obj->country_code);
+				if ($langs->trans("Country" . $obj->country_code) != "Country" . $obj->country_code)
+					$this->country = $langs->transnoentitiesnoconv("Country" . $obj->country_code);
 				else
 					$this->country = $obj->country;
 
-				$this->phone			= $obj->phone;
+				$this->phone = $obj->phone;
 				$this->phone_perso = $obj->phone_perso;
 				$this->phone_mobile = $obj->phone_mobile;
-				$this->email			= $obj->email;
+				$this->email = $obj->email;
 
 				$this->socialnetworks = (array) json_decode($obj->socialnetworks, true);
 
 				$this->photo = $obj->photo;
-				$this->statut			= $obj->statut;
-				$this->public			= $obj->public;
+				$this->statut = $obj->statut;
+				$this->public = $obj->public;
 
-				$this->datec			= $this->db->jdate($obj->datec);
-                $this->date_creation    = $this->db->jdate($obj->datec);
-				$this->datem			= $this->db->jdate($obj->datem);
-                $this->date_modification = $this->db->jdate($obj->datem);
+				$this->datec = $this->db->jdate($obj->datec);
+				$this->date_creation = $this->db->jdate($obj->datec);
+				$this->datem = $this->db->jdate($obj->datem);
+				$this->date_modification = $this->db->jdate($obj->datem);
 				$this->datefin = $this->db->jdate($obj->datefin);
 				$this->datevalid = $this->db->jdate($obj->datev);
-                $this->date_validation = $this->db->jdate($obj->datev);
+				$this->date_validation = $this->db->jdate($obj->datev);
 				$this->birth = $this->db->jdate($obj->birthday);
 
 				$this->note_private = $obj->note_private;
 				$this->note_public = $obj->note_public;
-				$this->morphy			= $obj->morphy;
+				$this->morphy = $obj->morphy;
 
-				$this->typeid			= $obj->fk_adherent_type;
+				$this->typeid = $obj->fk_adherent_type;
 				$this->type = $obj->type;
 				$this->need_subscription = $obj->subscription;
 
@@ -1394,21 +1331,17 @@ class Adherent extends CommonObject
 				}
 
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to get member subscriptions data
 	 *				first_subscription_date, first_subscription_date_start, first_subscription_date_end, first_subscription_amount
@@ -1418,31 +1351,28 @@ class Adherent extends CommonObject
 	 */
 	public function fetch_subscriptions()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
-		require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
+		require_once DOL_DOCUMENT_ROOT . '/adherents/class/subscription.class.php';
 
 		$sql = "SELECT c.rowid, c.fk_adherent, c.subscription, c.note, c.fk_bank,";
 		$sql .= " c.tms as datem,";
 		$sql .= " c.datec as datec,";
 		$sql .= " c.dateadh as dateh,";
 		$sql .= " c.datef as datef";
-		$sql .= " FROM ".MAIN_DB_PREFIX."subscription as c";
-		$sql .= " WHERE c.fk_adherent = ".$this->id;
+		$sql .= " FROM " . MAIN_DB_PREFIX . "subscription as c";
+		$sql .= " WHERE c.fk_adherent = " . $this->id;
 		$sql .= " ORDER BY c.dateadh";
-		dol_syslog(get_class($this)."::fetch_subscriptions", LOG_DEBUG);
+		dol_syslog(get_class($this) . "::fetch_subscriptions", LOG_DEBUG);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->subscriptions = array();
 
 			$i = 0;
-			while ($obj = $this->db->fetch_object($resql))
-			{
-				if ($i == 0)
-				{
+			while ($obj = $this->db->fetch_object($resql)) {
+				if ($i == 0) {
 					$this->first_subscription_date = $this->db->jdate($obj->datec);
 					$this->first_subscription_date_start = $this->db->jdate($obj->dateh);
 					$this->first_subscription_date_end = $this->db->jdate($obj->datef);
@@ -1469,10 +1399,8 @@ class Adherent extends CommonObject
 				$i++;
 			}
 			return 1;
-		}
-		else
-		{
-			$this->error = $this->db->error().' sql='.$sql;
+		} else {
+			$this->error = $this->db->error() . ' sql=' . $sql;
 			return -1;
 		}
 	}
@@ -1496,7 +1424,7 @@ class Adherent extends CommonObject
 	{
 		global $conf, $langs, $user;
 
-		require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
+		require_once DOL_DOCUMENT_ROOT . '/adherents/class/subscription.class.php';
 
 		$error = 0;
 
@@ -1505,12 +1433,9 @@ class Adherent extends CommonObject
 
 		$this->db->begin();
 
-		if ($datesubend)
-		{
+		if ($datesubend) {
 			$datefin = $datesubend;
-		}
-		else
-		{
+		} else {
 			// If no end date, end date = date + 1 year - 1 day
 			$datefin = dol_time_plus_duree($date, 1, 'y');
 			$datefin = dol_time_plus_duree($datefin, -1, 'd');
@@ -1526,13 +1451,11 @@ class Adherent extends CommonObject
 		$subscription->note_public = $label;
 
 		$rowid = $subscription->create($user);
-		if ($rowid > 0)
-		{
+		if ($rowid > 0) {
 			// Update denormalized subscription end date (read database subscription to find values)
 			// This will also update this->datefin
 			$result = $this->update_end_date($user);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				// Change properties of object (used by triggers)
 				$this->last_subscription_date = dol_now();
 				$this->last_subscription_date_start = $date;
@@ -1540,19 +1463,14 @@ class Adherent extends CommonObject
 				$this->last_subscription_amount = $amount;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return $rowid;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $subscription->error;
 			$this->errors = $subscription->errors;
 			$this->db->rollback();
@@ -1586,12 +1504,12 @@ class Adherent extends CommonObject
 
 		$this->invoice = null; // This will contains invoice if an invoice is created
 
-		dol_syslog("subscriptionComplementaryActions subscriptionid=".$subscriptionid." option=".$option." accountid=".$accountid." datesubscription=".$datesubscription." paymentdate=".$paymentdate." label=".$label." amount=".$amount." num_chq=".$num_chq." autocreatethirdparty=".$autocreatethirdparty);
+		dol_syslog("subscriptionComplementaryActions subscriptionid=" . $subscriptionid . " option=" . $option . " accountid=" . $accountid . " datesubscription=" . $datesubscription . " paymentdate=" .
+			$paymentdate . " label=" . $label . " amount=" . $amount . " num_chq=" . $num_chq . " autocreatethirdparty=" . $autocreatethirdparty);
 
 		// Insert into bank account directlty (if option choosed for) + link to llx_subscription if option is 'bankdirect'
-		if ($option == 'bankdirect' && $accountid)
-		{
-			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+		if ($option == 'bankdirect' && $accountid) {
+			require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
 
 			$acct = new Account($this->db);
 			$result = $acct->fetch($accountid);
@@ -1599,33 +1517,26 @@ class Adherent extends CommonObject
 			$dateop = $paymentdate;
 
 			$insertid = $acct->addline($dateop, $operation, $label, $amount, $num_chq, '', $user, $emetteur_nom, $emetteur_banque);
-			if ($insertid > 0)
-			{
-				$inserturlid = $acct->add_url_line($insertid, $this->id, DOL_URL_ROOT.'/adherents/card.php?rowid=', $this->getFullname($langs), 'member');
-				if ($inserturlid > 0)
-				{
+			if ($insertid > 0) {
+				$inserturlid = $acct->add_url_line($insertid, $this->id, DOL_URL_ROOT . '/adherents/card.php?rowid=', $this->getFullname($langs), 'member');
+				if ($inserturlid > 0) {
 					// Update table subscription
-					$sql = "UPDATE ".MAIN_DB_PREFIX."subscription SET fk_bank=".$insertid;
-					$sql .= " WHERE rowid=".$subscriptionid;
+					$sql = "UPDATE " . MAIN_DB_PREFIX . "subscription SET fk_bank=" . $insertid;
+					$sql .= " WHERE rowid=" . $subscriptionid;
 
 					dol_syslog("subscription::subscription", LOG_DEBUG);
 					$resql = $this->db->query($sql);
-					if (!$resql)
-					{
+					if (!$resql) {
 						$error++;
 						$this->error = $this->db->lasterror();
 						$this->errors[] = $this->error;
 					}
-				}
-				else
-				{
+				} else {
 					$error++;
 					$this->error = $acct->error;
 					$this->errors = $acct->errors;
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				$this->error = $acct->error;
 				$this->errors = $acct->errors;
@@ -1633,78 +1544,62 @@ class Adherent extends CommonObject
 		}
 
 		// If option choosed, we create invoice
-		if (($option == 'bankviainvoice' && $accountid) || $option == 'invoiceonly')
-		{
-			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
+		if (($option == 'bankviainvoice' && $accountid) || $option == 'invoiceonly') {
+			require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+			require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/paymentterm.class.php';
 
 			$invoice = new Facture($this->db);
 			$customer = new Societe($this->db);
 
-			if (!$error)
-			{
-				if (!($this->fk_soc > 0))	// If not yet linked to a company
+			if (!$error) {
+				if (!($this->fk_soc > 0)) // If not yet linked to a company
 				{
-					if ($autocreatethirdparty)
-					{
+					if ($autocreatethirdparty) {
 						// Create a linked thirdparty to member
 						$companyalias = '';
 						$fullname = $this->getFullName($langs);
 
-						if ($this->morphy == 'mor')
-						{
+						if ($this->morphy == 'mor') {
 							$companyname = $this->company;
 							if (!empty($fullname)) $companyalias = $fullname;
-						}
-						else
-						{
+						} else {
 							$companyname = $fullname;
 							if (!empty($this->company)) $companyalias = $this->company;
 						}
 
 						$result = $customer->create_from_member($this, $companyname, $companyalias);
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$this->error = $customer->error;
 							$this->errors = $customer->errors;
 							$error++;
-						}
-						else
-						{
+						} else {
 							$this->fk_soc = $result;
 						}
-					}
-					else
-					{
-						 $langs->load("errors");
-						 $this->error = $langs->trans("ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst");
-						 $this->errors[] = $this->error;
-						 $error++;
+					} else {
+						$langs->load("errors");
+						$this->error = $langs->trans("ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst");
+						$this->errors[] = $this->error;
+						$error++;
 					}
 				}
 			}
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $customer->fetch($this->fk_soc);
-				if ($result <= 0)
-				{
+				if ($result <= 0) {
 					$this->error = $customer->error;
 					$this->errors = $customer->errors;
 					$error++;
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				// Create draft invoice
 				$invoice->type = Facture::TYPE_STANDARD;
 				$invoice->cond_reglement_id = $customer->cond_reglement_id;
-				if (empty($invoice->cond_reglement_id))
-				{
+				if (empty($invoice->cond_reglement_id)) {
 					$paymenttermstatic = new PaymentTerm($this->db);
 					$invoice->cond_reglement_id = $paymenttermstatic->getDefaultId();
-					if (empty($invoice->cond_reglement_id))
-					{
+					if (empty($invoice->cond_reglement_id)) {
 						$error++;
 						$this->error = 'ErrorNoPaymentTermRECEPFound';
 						$this->errors[] = $this->error;
@@ -1715,133 +1610,112 @@ class Adherent extends CommonObject
 
 				// Possibility to add external linked objects with hooks
 				$invoice->linked_objects['subscription'] = $subscriptionid;
-				if (!empty($_POST['other_linked_objects']) && is_array($_POST['other_linked_objects']))
-				{
+				if (!empty($_POST['other_linked_objects']) && is_array($_POST['other_linked_objects'])) {
 					$invoice->linked_objects = array_merge($invoice->linked_objects, $_POST['other_linked_objects']);
 				}
 
 				$result = $invoice->create($user);
-				if ($result <= 0)
-				{
+				if ($result <= 0) {
 					$this->error = $invoice->error;
 					$this->errors = $invoice->errors;
 					$error++;
-				}
-				else
-				{
+				} else {
 					$this->invoice = $invoice;
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				// Add line to draft invoice
 				$idprodsubscription = 0;
 				if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) $idprodsubscription = $conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS;
 
 				$vattouse = 0;
-				if (isset($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) && $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS == 'defaultforfoundationcountry')
-				{
+				if (isset($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) && $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS == 'defaultforfoundationcountry') {
 					$vattouse = get_default_tva($mysoc, $mysoc, $idprodsubscription);
 				}
 				//print xx".$vattouse." - ".$mysoc." - ".$customer;exit;
 				$result = $invoice->addline($label, 0, 1, $vattouse, 0, 0, $idprodsubscription, 0, $datesubscription, '', 0, 0, '', 'TTC', $amount, 1);
-				if ($result <= 0)
-				{
+				if ($result <= 0) {
 					$this->error = $invoice->error;
 					$this->errors = $invoice->errors;
 					$error++;
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				// Validate invoice
 				$result = $invoice->validate($user);
-				if ($result <= 0)
-				{
+				if ($result <= 0) {
 					$this->error = $invoice->error;
 					$this->errors = $invoice->errors;
 					$error++;
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				// TODO Link invoice with subscription ?
 			}
 
 			// Add payment onto invoice
-			if (!$error && $option == 'bankviainvoice' && $accountid)
-			{
-				require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-				require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-				require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
+			if (!$error && $option == 'bankviainvoice' && $accountid) {
+				require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+				require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
+				require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
 
 				$amounts = array();
 				$amounts[$invoice->id] = price2num($amount);
 
 				$paiement = new Paiement($this->db);
-				$paiement->datepaye     = $paymentdate;
-				$paiement->amounts      = $amounts;
-				$paiement->paiementid   = dol_getIdFromCode($this->db, $operation, 'c_paiement', 'code', 'id', 1);
-				$paiement->num_payment  = $num_chq;
-				$paiement->note_public  = $label;
+				$paiement->datepaye = $paymentdate;
+				$paiement->amounts = $amounts;
+				$paiement->paiementid = dol_getIdFromCode($this->db, $operation, 'c_paiement', 'code', 'id', 1);
+				$paiement->num_payment = $num_chq;
+				$paiement->note_public = $label;
 
-				if (!$error)
-				{
+				if (!$error) {
 					// Create payment line for invoice
 					$paiement_id = $paiement->create($user);
-					if (!$paiement_id > 0)
-					{
+					if (!$paiement_id > 0) {
 						$this->error = $paiement->error;
 						$this->errors = $paiement->errors;
 						$error++;
 					}
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					// Add transaction into bank account
 					$bank_line_id = $paiement->addPaymentToBank($user, 'payment', '(SubscriptionPayment)', $accountid, $emetteur_nom, $emetteur_banque);
-					if (!($bank_line_id > 0))
-					{
+					if (!($bank_line_id > 0)) {
 						$this->error = $paiement->error;
 						$this->errors = $paiement->errors;
 						$error++;
 					}
 				}
 
-				if (!$error && !empty($bank_line_id))
-				{
+				if (!$error && !empty($bank_line_id)) {
 					// Update fk_bank into subscription table
-					$sql = 'UPDATE '.MAIN_DB_PREFIX.'subscription SET fk_bank='.$bank_line_id;
-					$sql .= ' WHERE rowid='.$subscriptionid;
+					$sql = 'UPDATE ' . MAIN_DB_PREFIX . 'subscription SET fk_bank=' . $bank_line_id;
+					$sql .= ' WHERE rowid=' . $subscriptionid;
 
 					$result = $this->db->query($sql);
-					if (!$result)
-					{
+					if (!$result) {
 						$error++;
 					}
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					// Set invoice as paid
 					$invoice->set_paid($user);
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				// Define output language
 				$outputlangs = $langs;
 				$newlang = '';
 				$lang_id = GETPOST('lang_id');
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($lang_id))
-					$newlang = $lang_id;
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-					$newlang = $customer->default_lang;
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($lang_id)) $newlang = $lang_id;
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $customer->default_lang;
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -1853,12 +1727,9 @@ class Adherent extends CommonObject
 			}
 		}
 
-		if ($error)
-		{
+		if ($error) {
 			return -1;
-		}
-		else
-		{
+		} else {
 			return 1;
 		}
 	}
@@ -1878,38 +1749,38 @@ class Adherent extends CommonObject
 		$now = dol_now();
 
 		// Check parameters
-		if ($this->statut == 1)
-		{
-			dol_syslog(get_class($this)."::validate statut of member does not allow this", LOG_WARNING);
+		if ($this->statut == 1) {
+			dol_syslog(get_class($this) . "::validate statut of member does not allow this", LOG_WARNING);
 			return 0;
 		}
 
 		$this->db->begin();
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
+		$sql = "UPDATE " . MAIN_DB_PREFIX . "adherent SET";
 		$sql .= " statut = 1";
-		$sql .= ", datevalid = '".$this->db->idate($now)."'";
-		$sql .= ", fk_user_valid=".$user->id;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= ", datevalid = '" . $this->db->idate($now) . "'";
+		$sql .= ", fk_user_valid=" . $user->id;
+		$sql .= " WHERE rowid = " . $this->id;
 
-		dol_syslog(get_class($this)."::validate", LOG_DEBUG);
+		dol_syslog(get_class($this) . "::validate", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$this->statut = 1;
 
 			// Call trigger
 			$result = $this->call_trigger('MEMBER_VALIDATE', $user);
-			if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+			if ($result < 0) {
+				$error++;
+				$this->db->rollback();
+				return -1;
+			}
 			// End call triggers
 
 			$this->datevalid = $now;
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -1930,34 +1801,34 @@ class Adherent extends CommonObject
 		$error = 0;
 
 		// Check parameters
-		if ($this->statut == 0)
-		{
-			dol_syslog(get_class($this)."::resiliate statut of member does not allow this", LOG_WARNING);
+		if ($this->statut == 0) {
+			dol_syslog(get_class($this) . "::resiliate statut of member does not allow this", LOG_WARNING);
 			return 0;
 		}
 
 		$this->db->begin();
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
+		$sql = "UPDATE " . MAIN_DB_PREFIX . "adherent SET";
 		$sql .= " statut = 0";
-		$sql .= ", fk_user_valid=".$user->id;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= ", fk_user_valid=" . $user->id;
+		$sql .= " WHERE rowid = " . $this->id;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$this->statut = 0;
 
 			// Call trigger
 			$result = $this->call_trigger('MEMBER_RESILIATE', $user);
-			if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+			if ($result < 0) {
+				$error++;
+				$this->db->rollback();
+				return -1;
+			}
 			// End call triggers
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -1965,7 +1836,7 @@ class Adherent extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Function to add member into external tools mailing-list, spip, etc.
 	 *
@@ -1973,58 +1844,49 @@ class Adherent extends CommonObject
 	 */
 	public function add_to_abo()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
-		include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
+		include_once DOL_DOCUMENT_ROOT . '/mailmanspip/class/mailmanspip.class.php';
 		$mailmanspip = new MailmanSpip($this->db);
 
 		$err = 0;
 
 		// mailman
-		if (!empty($conf->global->ADHERENT_USE_MAILMAN) && !empty($conf->mailmanspip->enabled))
-		{
+		if (!empty($conf->global->ADHERENT_USE_MAILMAN) && !empty($conf->mailmanspip->enabled)) {
 			$result = $mailmanspip->add_to_mailman($this);
 
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				if (!empty($mailmanspip->error)) $this->errors[] = $mailmanspip->error;
 				$err += 1;
 			}
-			foreach ($mailmanspip->mladded_ko as $tmplist => $tmpemail)
-			{
+			foreach ($mailmanspip->mladded_ko as $tmplist => $tmpemail) {
 				$langs->load("errors");
 				$this->errors[] = $langs->trans("ErrorFailedToAddToMailmanList", $tmpemail, $tmplist);
 			}
-			foreach ($mailmanspip->mladded_ok as $tmplist => $tmpemail)
-			{
+			foreach ($mailmanspip->mladded_ok as $tmplist => $tmpemail) {
 				$langs->load("mailmanspip");
 				$this->mesgs[] = $langs->trans("SuccessToAddToMailmanList", $tmpemail, $tmplist);
 			}
 		}
 
 		// spip
-		if (!empty($conf->global->ADHERENT_USE_SPIP) && !empty($conf->mailmanspip->enabled))
-		{
+		if (!empty($conf->global->ADHERENT_USE_SPIP) && !empty($conf->mailmanspip->enabled)) {
 			$result = $mailmanspip->add_to_spip($this);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->errors[] = $mailmanspip->error;
 				$err += 1;
 			}
 		}
-		if ($err)
-		{
+		if ($err) {
 			return -$err;
-		}
-		else
-		{
+		} else {
 			return 1;
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Function to delete a member from external tools like mailing-list, spip, etc.
 	 *
@@ -2032,52 +1894,43 @@ class Adherent extends CommonObject
 	 */
 	public function del_to_abo()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
-		include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
+		include_once DOL_DOCUMENT_ROOT . '/mailmanspip/class/mailmanspip.class.php';
 		$mailmanspip = new MailmanSpip($this->db);
 
 		$err = 0;
 
 		// mailman
-		if (!empty($conf->global->ADHERENT_USE_MAILMAN))
-		{
+		if (!empty($conf->global->ADHERENT_USE_MAILMAN)) {
 			$result = $mailmanspip->del_to_mailman($this);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				if (!empty($mailmanspip->error)) $this->errors[] = $mailmanspip->error;
 				$err += 1;
 			}
 
-			foreach ($mailmanspip->mlremoved_ko as $tmplist => $tmpemail)
-			{
+			foreach ($mailmanspip->mlremoved_ko as $tmplist => $tmpemail) {
 				$langs->load("errors");
 				$this->errors[] = $langs->trans("ErrorFailedToRemoveToMailmanList", $tmpemail, $tmplist);
 			}
-			foreach ($mailmanspip->mlremoved_ok as $tmplist => $tmpemail)
-			{
+			foreach ($mailmanspip->mlremoved_ok as $tmplist => $tmpemail) {
 				$langs->load("mailmanspip");
 				$this->mesgs[] = $langs->trans("SuccessToRemoveToMailmanList", $tmpemail, $tmplist);
 			}
 		}
 
-		if ($conf->global->ADHERENT_USE_SPIP && !empty($conf->mailmanspip->enabled))
-		{
+		if ($conf->global->ADHERENT_USE_SPIP && !empty($conf->mailmanspip->enabled)) {
 			$result = $mailmanspip->del_to_spip($this);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->errors[] = $mailmanspip->error;
 				$err += 1;
 			}
 		}
-		if ($err)
-		{
+		if ($err) {
 			// error
 			return -$err;
-		}
-		else
-		{
+		} else {
 			return 1;
 		}
 	}
@@ -2095,7 +1948,7 @@ class Adherent extends CommonObject
 
 		$code = (empty($this->civility_id) ? '' : $this->civility_id);
 		if (empty($code)) return '';
-		return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civility", "code", "label", $code);
+		return $langs->getLabelFromKey($this->db, "Civility" . $code, "c_civility", "code", "label", $code);
 	}
 
 	/**
@@ -2116,79 +1969,77 @@ class Adherent extends CommonObject
 
 		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) $withpictoimg = 0;
 
-		$result = ''; $label = '';
-		$linkstart = ''; $linkend = '';
+		$result = '';
+		$label = '';
+		$linkstart = '';
+		$linkend = '';
 
-		if (!empty($this->photo))
-		{
+		if (!empty($this->photo)) {
 			$label .= '<div class="photointooltip">';
 			$label .= Form::showphoto('memberphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip', 'small', 0, 1);
 			$label .= '</div><div style="clear: both;"></div>';
 		}
 
 		$label .= '<div class="centpercent">';
-		$label .= '<u>'.$langs->trans("Member").'</u>';
-		if (!empty($this->ref))
-			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-		if (!empty($this->firstname) || !empty($this->lastname))
-			$label .= '<br><b>'.$langs->trans('Name').':</b> '.$this->getFullName($langs);
-		if (!empty($this->company))
-			$label .= '<br><b>'.$langs->trans('Company').':</b> '.$this->company;
+		$label .= '<u>' . $langs->trans("Member") . '</u>';
+		if (!empty($this->ref)) $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+		if (!empty($this->firstname) || !empty($this->lastname)) $label .= '<br><b>' . $langs->trans('Name') . ':</b> ' . $this->getFullName($langs);
+		if (!empty($this->company)) $label .= '<br><b>' . $langs->trans('Company') . ':</b> ' . $this->company;
 		$label .= '</div>';
 
-		$url = DOL_URL_ROOT.'/adherents/card.php?rowid='.$this->id;
-		if ($option == 'subscription')
-		{
-			$url = DOL_URL_ROOT.'/adherents/subscription.php?rowid='.$this->id;
+		$url = DOL_URL_ROOT . '/adherents/card.php?rowid=' . $this->id;
+		if ($option == 'subscription') {
+			$url = DOL_URL_ROOT . '/adherents/subscription.php?rowid=' . $this->id;
 		}
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
 			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
 			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
 		}
 
-		$linkstart .= '<a href="'.$url.'"';
+		$linkstart .= '<a href="' . $url . '"';
 		$linkclose = "";
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$langs->load("users");
 				$label = $langs->trans("ShowUser");
-				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+				$linkclose .= ' alt="' . dol_escape_htmltag($label, 1) . '"';
 			}
-			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+			$linkclose .= ' title="' . dol_escape_htmltag($label, 1) . '"';
+			$linkclose .= ' class="classfortooltip' . ($morecss ? ' ' . $morecss : '') . '"';
 		}
 
-		$linkstart .= $linkclose.'>';
+		$linkstart .= $linkclose . '>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
 		if ($withpictoimg) $result .= '<div class="inline-block nopadding valignmiddle">';
-		if ($withpictoimg)
-		{
+		if ($withpictoimg) {
 			$paddafterimage = '';
 			if (abs($withpictoimg) == 1) $paddafterimage = 'style="margin-right: 3px;"';
 			// Only picto
-			if ($withpictoimg > 0) $picto = '<span class="nopadding'.($morecss ? ' userimg'.$morecss : '').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).'</span>';
+			if ($withpictoimg > 0)
+				$picto = '<span class="nopadding' . ($morecss ? ' userimg' . $morecss : '') . '">' .
+					img_object('', 'user', $paddafterimage . ' ' . ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1) . '</span>';
 			// Picto must be a photo
 			else {
-				$picto = '<span class="nopadding'.($morecss ? ' userimg'.$morecss : '').'"'.($paddafterimage ? ' '.$paddafterimage : '').'>';
-				$picto .= Form::showphoto('memberphoto', $this, 0, 0, 0, 'userphoto'.($withpictoimg == -3 ? 'small' : ''), 'mini', 0, 1);
+				$picto = '<span class="nopadding' . ($morecss ? ' userimg' . $morecss : '') . '"' . ($paddafterimage ? ' ' . $paddafterimage : '') . '>';
+				$picto .= Form::showphoto('memberphoto', $this, 0, 0, 0, 'userphoto' . ($withpictoimg == -3 ? 'small' : ''), 'mini', 0, 1);
 				$picto .= '</span>';
 			}
 			$result .= $picto;
 		}
-		if ($withpictoimg > -2 && $withpictoimg != 2)
-		{
-			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result .= '<span class="nopadding valignmiddle'.((!isset($this->statut) || $this->statut) ? '' : ' strikefordisabled').($morecss ? ' usertext'.$morecss : '').'">';
-			if ($mode == 'login') $result .= dol_trunc($this->login, $maxlen);
-			elseif ($mode == 'ref') $result .= $this->id;
-			else $result .= $this->getFullName($langs, '', ($mode == 'firstname' ? 2 : -1), $maxlen);
+		if ($withpictoimg > -2 && $withpictoimg != 2) {
+			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result .= '<span class="nopadding valignmiddle' . ((!isset($this->statut) || $this->statut) ? '' : ' strikefordisabled') .
+				($morecss ? ' usertext' . $morecss : '') . '">';
+			if ($mode == 'login')
+				$result .= dol_trunc($this->login, $maxlen);
+			elseif ($mode == 'ref')
+				$result .= $this->id;
+			else
+				$result .= $this->getFullName($langs, '', ($mode == 'firstname' ? 2 : -1), $maxlen);
 			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result .= '</span>';
 		}
 		if ($withpictoimg) $result .= '</div>';
@@ -2208,7 +2059,7 @@ class Adherent extends CommonObject
 		return $this->LibStatut($this->statut, $this->need_subscription, $this->datefin, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -2220,47 +2071,37 @@ class Adherent extends CommonObject
 	 */
 	public function LibStatut($status, $need_subscription, $date_end_subscription, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$langs->load("members");
 
-        $statusType = '';
-        $labelStatus = '';
-        $labelStatusShort = '';
+		$statusType = '';
+		$labelStatus = '';
+		$labelStatusShort = '';
 
-		if ($status == -1)
-		{
+		if ($status == -1) {
 			$statusType = 'status0';
 			$labelStatus = $langs->trans("MemberStatusDraft");
 			$labelStatusShort = $langs->trans("MemberStatusDraftShort");
-		}
-		elseif ($status >= 1) {
-			if ($need_subscription == 0)
-			{
+		} elseif ($status >= 1) {
+			if ($need_subscription == 0) {
 				$statusType = 'status4';
 				$labelStatus = $langs->trans("MemberStatusNoSubscription");
 				$labelStatusShort = $langs->trans("MemberStatusNoSubscriptionShort");
-			}
-			elseif (!$date_end_subscription)
-			{
+			} elseif (!$date_end_subscription) {
 				$statusType = 'status1';
 				$labelStatus = $langs->trans("MemberStatusActive");
 				$labelStatusShort = $langs->trans("MemberStatusActiveShort");
-			}
-			elseif ($date_end_subscription < time())
-			{
+			} elseif ($date_end_subscription < time()) {
 				$statusType = 'status3';
 				$labelStatus = $langs->trans("MemberStatusActiveLate");
 				$labelStatusShort = $langs->trans("MemberStatusActiveLateShort");
-			}
-			else {
+			} else {
 				$statusType = 'status4';
 				$labelStatus = $langs->trans("MemberStatusPaid");
 				$labelStatusShort = $langs->trans("MemberStatusPaidShort");
 			}
-		}
-		elseif ($status == 0)
-		{
+		} elseif ($status == 0) {
 			$statusType = 'status6';
 			$labelStatus = $langs->trans("MemberStatusResiliated");
 			$labelStatusShort = $langs->trans("MemberStatusResiliatedShort");
@@ -2270,7 +2111,7 @@ class Adherent extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Charge indicateurs this->nb de tableau de bord
 	 *
@@ -2278,35 +2119,31 @@ class Adherent extends CommonObject
 	 */
 	public function load_state_board()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$this->nb = array();
 
 		$sql = "SELECT count(a.rowid) as nb";
-		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "adherent as a";
 		$sql .= " WHERE a.statut > 0";
-		$sql .= " AND a.entity IN (".getEntity('adherent').")";
+		$sql .= " AND a.entity IN (" . getEntity('adherent') . ")";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->nb["members"] = $obj->nb;
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
@@ -2316,32 +2153,28 @@ class Adherent extends CommonObject
 	 */
 	public function load_board($user, $mode)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
-		if ($user->socid) return -1;   // protection pour eviter appel par utilisateur externe
+		if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
 
-		$now=dol_now();
+		$now = dol_now();
 
 		$sql = "SELECT a.rowid, a.datefin, a.statut";
-		$sql.= " FROM ".MAIN_DB_PREFIX."adherent as a";
-		$sql.= ", ".MAIN_DB_PREFIX."adherent_type as t";
-		$sql.= " WHERE a.fk_adherent_type = t.rowid";
-		if ($mode == 'expired')
-		{
-			$sql.= " AND a.statut = 1";
-			$sql.= " AND a.entity IN (".getEntity('adherent').")";
-			$sql.= " AND ((a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."') AND t.subscription = 1)";
-		}
-		elseif ($mode == 'shift')
-		{
-			$sql.= " AND a.statut = -1";
-			$sql.= " AND a.entity IN (".getEntity('adherent').")";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "adherent as a";
+		$sql .= ", " . MAIN_DB_PREFIX . "adherent_type as t";
+		$sql .= " WHERE a.fk_adherent_type = t.rowid";
+		if ($mode == 'expired') {
+			$sql .= " AND a.statut = 1";
+			$sql .= " AND a.entity IN (" . getEntity('adherent') . ")";
+			$sql .= " AND ((a.datefin IS NULL or a.datefin < '" . $this->db->idate($now) . "') AND t.subscription = 1)";
+		} elseif ($mode == 'shift') {
+			$sql .= " AND a.statut = -1";
+			$sql .= " AND a.entity IN (" . getEntity('adherent') . ")";
 		}
 
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
+		$resql = $this->db->query($sql);
+		if ($resql) {
 			$langs->load("members");
 
 			$warning_delay = 0;
@@ -2350,29 +2183,27 @@ class Adherent extends CommonObject
 			$labelShort = '';
 
 			if ($mode == 'expired') {
-				$warning_delay = $conf->adherent->subscription->warning_delay/60/60/24;
+				$warning_delay = $conf->adherent->subscription->warning_delay / 60 / 60 / 24;
 				$label = $langs->trans("MembersWithSubscriptionToReceive");
 				$labelShort = $langs->trans("MembersWithSubscriptionToReceiveShort");
-				$url = DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&amp;statut=1&amp;filter=outofdate';
-			}
-			elseif ($mode == 'shift') {
-			    $warning_delay = $conf->adherent->subscription->warning_delay/60/60/24;
-			    $url = DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&amp;statut=-1';
-			    $label = $langs->trans("MembersListToValid");
-			    $labelShort = $langs->trans("ToValidate");
+				$url = DOL_URL_ROOT . '/adherents/list.php?mainmenu=members&amp;statut=1&amp;filter=outofdate';
+			} elseif ($mode == 'shift') {
+				$warning_delay = $conf->adherent->subscription->warning_delay / 60 / 60 / 24;
+				$url = DOL_URL_ROOT . '/adherents/list.php?mainmenu=members&amp;statut=-1';
+				$label = $langs->trans("MembersListToValid");
+				$labelShort = $langs->trans("ToValidate");
 			}
 
 			$response = new WorkboardResponse();
-			$response->warning_delay=$warning_delay;
-			$response->label=$label;
-			$response->labelShort=$labelShort;
-			$response->url=$url;
-			$response->img=img_object('', "user");
+			$response->warning_delay = $warning_delay;
+			$response->label = $label;
+			$response->labelShort = $labelShort;
+			$response->url = $url;
+			$response->img = img_object('', "user");
 
 			$adherentstatic = new Adherent($this->db);
 
-			while ($obj=$this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$response->nbtodo++;
 
 				$adherentstatic->datefin = $this->db->jdate($obj->datefin);
@@ -2384,9 +2215,7 @@ class Adherent extends CommonObject
 			}
 
 			return $response;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -2402,7 +2231,7 @@ class Adherent extends CommonObject
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
-         *  @param   null|array  $moreparams     Array to provide more information
+	 *  @param   null|array  $moreparams     Array to provide more information
 	 *  @return     int         				0 if KO, 1 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
@@ -2456,14 +2285,9 @@ class Adherent extends CommonObject
 		$this->country = 'France';
 		$this->morphy = 'mor';
 		$this->email = 'specimen@specimen.com';
-		$this->socialnetworks = array(
-			'skype' => 'skypepseudo',
-			'twitter' => 'twitterpseudo',
-			'facebook' => 'facebookpseudo',
-			'linkedin' => 'linkedinpseudo',
-		);
-		$this->phone        = '0999999999';
-		$this->phone_perso  = '0999999998';
+		$this->socialnetworks = array('skype' => 'skypepseudo', 'twitter' => 'twitterpseudo', 'facebook' => 'facebookpseudo', 'linkedin' => 'linkedinpseudo');
+		$this->phone = '0999999999';
+		$this->phone_perso = '0999999998';
 		$this->phone_mobile = '0999999997';
 		$this->note_private = 'No comment';
 		$this->birth = time();
@@ -2490,8 +2314,8 @@ class Adherent extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *	Retourne chaine DN complete dans l'annuaire LDAP pour l'objet
 	 *
@@ -2503,26 +2327,26 @@ class Adherent extends CommonObject
 	 */
 	public function _load_ldap_dn($info, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		$dn = '';
-		if ($mode == 0) $dn = $conf->global->LDAP_KEY_MEMBERS."=".$info[$conf->global->LDAP_KEY_MEMBERS].",".$conf->global->LDAP_MEMBER_DN;
+		if ($mode == 0) $dn = $conf->global->LDAP_KEY_MEMBERS . "=" . $info[$conf->global->LDAP_KEY_MEMBERS] . "," . $conf->global->LDAP_MEMBER_DN;
 		if ($mode == 1) $dn = $conf->global->LDAP_MEMBER_DN;
-		if ($mode == 2) $dn = $conf->global->LDAP_KEY_MEMBERS."=".$info[$conf->global->LDAP_KEY_MEMBERS];
+		if ($mode == 2) $dn = $conf->global->LDAP_KEY_MEMBERS . "=" . $info[$conf->global->LDAP_KEY_MEMBERS];
 		return $dn;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
 	 *	Initialise tableau info (tableau des attributs LDAP)
 	 *
 	 *	@return		array		Tableau info des attributs
 	 */
 	public function _load_ldap_info()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$info = array();
@@ -2540,83 +2364,69 @@ class Adherent extends CommonObject
 		}
 
 		// Possible LDAP KEY (constname => varname)
-		$ldapkey = array(
-			'LDAP_MEMBER_FIELD_FULLNAME'		=> 'fullname',
-			'LDAP_MEMBER_FIELD_NAME'			=> 'lastname',
-			'LDAP_MEMBER_FIELD_LOGIN'		=> 'login',
-			'LDAP_MEMBER_FIELD_LOGIN_SAMBA'	=> 'login',
-			'LDAP_MEMBER_FIELD_MAIL'			=> 'email'
-		);
+		$ldapkey = array('LDAP_MEMBER_FIELD_FULLNAME' => 'fullname', 'LDAP_MEMBER_FIELD_NAME' => 'lastname', 'LDAP_MEMBER_FIELD_LOGIN' => 'login', 'LDAP_MEMBER_FIELD_LOGIN_SAMBA' => 'login',
+			'LDAP_MEMBER_FIELD_MAIL' => 'email');
 
 		// Member
-		foreach ($ldapkey as $constname => $varname)
-		{
-			if (!empty($this->$varname) && !empty($conf->global->$constname))
-			{
+		foreach ($ldapkey as $constname => $varname) {
+			if (!empty($this->$varname) && !empty($conf->global->$constname)) {
 				$info[$conf->global->$constname] = $this->$varname;
 
 				// Check if it is the LDAP key and if its value has been changed
-				if (!empty($conf->global->LDAP_KEY_MEMBERS) && $conf->global->LDAP_KEY_MEMBERS == $conf->global->$constname)
-				{
+				if (!empty($conf->global->LDAP_KEY_MEMBERS) && $conf->global->LDAP_KEY_MEMBERS == $conf->global->$constname) {
 					if (!empty($this->oldcopy) && $this->$varname != $this->oldcopy->$varname) $keymodified = true; // For check if LDAP key has been modified
 				}
 			}
 		}
-		if ($this->firstname && !empty($conf->global->LDAP_MEMBER_FIELD_FIRSTNAME))			$info[$conf->global->LDAP_MEMBER_FIELD_FIRSTNAME] = $this->firstname;
-		if ($this->poste && !empty($conf->global->LDAP_MEMBER_FIELD_TITLE))					$info[$conf->global->LDAP_MEMBER_FIELD_TITLE] = $this->poste;
-		if ($this->company && !empty($conf->global->LDAP_MEMBER_FIELD_COMPANY))				$info[$conf->global->LDAP_MEMBER_FIELD_COMPANY] = $this->company;
-		if ($this->address && !empty($conf->global->LDAP_MEMBER_FIELD_ADDRESS))				$info[$conf->global->LDAP_MEMBER_FIELD_ADDRESS] = $this->address;
-		if ($this->zip && !empty($conf->global->LDAP_MEMBER_FIELD_ZIP))						$info[$conf->global->LDAP_MEMBER_FIELD_ZIP] = $this->zip;
-		if ($this->town && !empty($conf->global->LDAP_MEMBER_FIELD_TOWN))						$info[$conf->global->LDAP_MEMBER_FIELD_TOWN] = $this->town;
-		if ($this->country_code && !empty($conf->global->LDAP_MEMBER_FIELD_COUNTRY))			$info[$conf->global->LDAP_MEMBER_FIELD_COUNTRY] = $this->country_code;
-		if ($this->skype && !empty($conf->global->LDAP_MEMBER_FIELD_SKYPE))					$info[$conf->global->LDAP_MEMBER_FIELD_SKYPE] = $this->skype;
-		if ($this->twitter && !empty($conf->global->LDAP_MEMBER_FIELD_TWITTER))				$info[$conf->global->LDAP_MEMBER_FIELD_TWITTER] = $this->twitter;
-		if ($this->facebook && !empty($conf->global->LDAP_MEMBER_FIELD_FACEBOOK))			$info[$conf->global->LDAP_MEMBER_FIELD_FACEBOOK] = $this->facebook;
-		if ($this->linkedin && !empty($conf->global->LDAP_MEMBER_FIELD_LINKEDIN))			$info[$conf->global->LDAP_MEMBER_FIELD_LINKEDIN] = $this->linkedin;
-        if ($this->phone && !empty($conf->global->LDAP_MEMBER_FIELD_PHONE))					$info[$conf->global->LDAP_MEMBER_FIELD_PHONE] = $this->phone;
-		if ($this->phone_perso && !empty($conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO))		$info[$conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO] = $this->phone_perso;
-		if ($this->phone_mobile && !empty($conf->global->LDAP_MEMBER_FIELD_MOBILE))			$info[$conf->global->LDAP_MEMBER_FIELD_MOBILE] = $this->phone_mobile;
-		if ($this->fax && !empty($conf->global->LDAP_MEMBER_FIELD_FAX))						$info[$conf->global->LDAP_MEMBER_FIELD_FAX] = $this->fax;
-		if ($this->note_private && !empty($conf->global->LDAP_MEMBER_FIELD_DESCRIPTION))		$info[$conf->global->LDAP_MEMBER_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note_private, 2);
-		if ($this->note_public && !empty($conf->global->LDAP_MEMBER_FIELD_NOTE_PUBLIC))		$info[$conf->global->LDAP_MEMBER_FIELD_NOTE_PUBLIC] = dol_string_nohtmltag($this->note_public, 2);
-		if ($this->birth && !empty($conf->global->LDAP_MEMBER_FIELD_BIRTHDATE))				$info[$conf->global->LDAP_MEMBER_FIELD_BIRTHDATE] = dol_print_date($this->birth, 'dayhourldap');
-		if (isset($this->statut) && !empty($conf->global->LDAP_FIELD_MEMBER_STATUS))			$info[$conf->global->LDAP_FIELD_MEMBER_STATUS] = $this->statut;
-		if ($this->datefin && !empty($conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION))	$info[$conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION] = dol_print_date($this->datefin, 'dayhourldap');
+		if ($this->firstname && !empty($conf->global->LDAP_MEMBER_FIELD_FIRSTNAME)) $info[$conf->global->LDAP_MEMBER_FIELD_FIRSTNAME] = $this->firstname;
+		if ($this->poste && !empty($conf->global->LDAP_MEMBER_FIELD_TITLE)) $info[$conf->global->LDAP_MEMBER_FIELD_TITLE] = $this->poste;
+		if ($this->company && !empty($conf->global->LDAP_MEMBER_FIELD_COMPANY)) $info[$conf->global->LDAP_MEMBER_FIELD_COMPANY] = $this->company;
+		if ($this->address && !empty($conf->global->LDAP_MEMBER_FIELD_ADDRESS)) $info[$conf->global->LDAP_MEMBER_FIELD_ADDRESS] = $this->address;
+		if ($this->zip && !empty($conf->global->LDAP_MEMBER_FIELD_ZIP)) $info[$conf->global->LDAP_MEMBER_FIELD_ZIP] = $this->zip;
+		if ($this->town && !empty($conf->global->LDAP_MEMBER_FIELD_TOWN)) $info[$conf->global->LDAP_MEMBER_FIELD_TOWN] = $this->town;
+		if ($this->country_code && !empty($conf->global->LDAP_MEMBER_FIELD_COUNTRY)) $info[$conf->global->LDAP_MEMBER_FIELD_COUNTRY] = $this->country_code;
+		if ($this->skype && !empty($conf->global->LDAP_MEMBER_FIELD_SKYPE)) $info[$conf->global->LDAP_MEMBER_FIELD_SKYPE] = $this->skype;
+		if ($this->twitter && !empty($conf->global->LDAP_MEMBER_FIELD_TWITTER)) $info[$conf->global->LDAP_MEMBER_FIELD_TWITTER] = $this->twitter;
+		if ($this->facebook && !empty($conf->global->LDAP_MEMBER_FIELD_FACEBOOK)) $info[$conf->global->LDAP_MEMBER_FIELD_FACEBOOK] = $this->facebook;
+		if ($this->linkedin && !empty($conf->global->LDAP_MEMBER_FIELD_LINKEDIN)) $info[$conf->global->LDAP_MEMBER_FIELD_LINKEDIN] = $this->linkedin;
+		if ($this->phone && !empty($conf->global->LDAP_MEMBER_FIELD_PHONE)) $info[$conf->global->LDAP_MEMBER_FIELD_PHONE] = $this->phone;
+		if ($this->phone_perso && !empty($conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO)) $info[$conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO] = $this->phone_perso;
+		if ($this->phone_mobile && !empty($conf->global->LDAP_MEMBER_FIELD_MOBILE)) $info[$conf->global->LDAP_MEMBER_FIELD_MOBILE] = $this->phone_mobile;
+		if ($this->fax && !empty($conf->global->LDAP_MEMBER_FIELD_FAX)) $info[$conf->global->LDAP_MEMBER_FIELD_FAX] = $this->fax;
+		if ($this->note_private && !empty($conf->global->LDAP_MEMBER_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_MEMBER_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note_private, 2);
+		if ($this->note_public && !empty($conf->global->LDAP_MEMBER_FIELD_NOTE_PUBLIC)) $info[$conf->global->LDAP_MEMBER_FIELD_NOTE_PUBLIC] = dol_string_nohtmltag($this->note_public, 2);
+		if ($this->birth && !empty($conf->global->LDAP_MEMBER_FIELD_BIRTHDATE)) $info[$conf->global->LDAP_MEMBER_FIELD_BIRTHDATE] = dol_print_date($this->birth, 'dayhourldap');
+		if (isset($this->statut) && !empty($conf->global->LDAP_FIELD_MEMBER_STATUS)) $info[$conf->global->LDAP_FIELD_MEMBER_STATUS] = $this->statut;
+		if ($this->datefin && !empty($conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION)) $info[$conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION] = dol_print_date($this->datefin, 'dayhourldap');
 
 		// When password is modified
-		if (!empty($this->pass))
-		{
-			if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD))				$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD] = $this->pass; // this->pass = mot de passe non crypte
-			if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED))		$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass, 4); // Create OpenLDAP MD5 password (TODO add type of encryption)
-		}
-		// Set LDAP password if possible
+		if (!empty($this->pass)) {
+			if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD)) $info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD] = $this->pass; // this->pass = mot de passe non crypte
+			if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED)) $info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass, 4); // Create OpenLDAP MD5 password (TODO add type of encryption)
+		} // Set LDAP password if possible
 		elseif ($conf->global->LDAP_SERVER_PROTOCOLVERSION !== '3') // If ldap key is modified and LDAPv3 we use ldap_rename function for avoid lose encrypt password
 		{
-			if (!empty($conf->global->DATABASE_PWD_ENCRYPTED))
-			{
+			if (!empty($conf->global->DATABASE_PWD_ENCRYPTED)) {
 				// Just for the default MD5 !
-				if (empty($conf->global->MAIN_SECURITY_HASH_ALGO))
-				{
+				if (empty($conf->global->MAIN_SECURITY_HASH_ALGO)) {
 					if ($this->pass_indatabase_crypted && !empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED)) {
 						// Create OpenLDAP MD5 password from Dolibarr MD5 password
 						// Note: This suppose that "pass_indatabase_crypted" is a md5 (guaranted by the previous test if "(empty($conf->global->MAIN_SECURITY_HASH_ALGO))"
-						$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = '{md5}'.base64_encode(hex2bin($this->pass_indatabase_crypted));
+						$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = '{md5}' . base64_encode(hex2bin($this->pass_indatabase_crypted));
 					}
 				}
-			}
-			// Use $this->pass_indatabase value if exists
-			elseif (!empty($this->pass_indatabase))
-			{
-				if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD))				$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD] = $this->pass_indatabase; // $this->pass_indatabase = mot de passe non crypte
-				if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED))		$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass_indatabase, 4); // md5 for OpenLdap TODO add type of encryption
+			} // Use $this->pass_indatabase value if exists
+			elseif (!empty($this->pass_indatabase)) {
+				if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD)) $info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD] = $this->pass_indatabase; // $this->pass_indatabase = mot de passe non crypte
+				if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED)) $info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass_indatabase, 4); // md5 for OpenLdap TODO add type of encryption
 			}
 		}
 
 		// Subscriptions
-		if ($this->first_subscription_date && !empty($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE))     $info[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE]  = dol_print_date($this->first_subscription_date, 'dayhourldap');
+		if ($this->first_subscription_date && !empty($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE)) $info[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE] = dol_print_date($this->first_subscription_date, 'dayhourldap');
 		if (isset($this->first_subscription_amount) && !empty($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT)) $info[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT] = $this->first_subscription_amount;
-		if ($this->last_subscription_date && !empty($conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE))       $info[$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE]   = dol_print_date($this->last_subscription_date, 'dayhourldap');
-		if (isset($this->last_subscription_amount) && !empty($conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT))   $info[$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT] = $this->last_subscription_amount;
+		if ($this->last_subscription_date && !empty($conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE)) $info[$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE] = dol_print_date($this->last_subscription_date, 'dayhourldap');
+		if (isset($this->last_subscription_amount) && !empty($conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT)) $info[$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT] = $this->last_subscription_amount;
 
 		return $info;
 	}
@@ -2634,47 +2444,40 @@ class Adherent extends CommonObject
 		$sql .= ' a.datevalid as datev,';
 		$sql .= ' a.tms as datem,';
 		$sql .= ' a.fk_user_author, a.fk_user_valid, a.fk_user_mod';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'adherent as a';
-		$sql .= ' WHERE a.rowid = '.$id;
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . 'adherent as a';
+		$sql .= ' WHERE a.rowid = ' . $id;
 
-		dol_syslog(get_class($this)."::info", LOG_DEBUG);
+		dol_syslog(get_class($this) . "::info", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
 
-				if ($obj->fk_user_valid)
-				{
+				if ($obj->fk_user_valid) {
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation = $vuser;
 				}
 
-				if ($obj->fk_user_mod)
-				{
+				if ($obj->fk_user_mod) {
 					$muser = new User($this->db);
 					$muser->fetch($obj->fk_user_mod);
 					$this->user_modification = $muser;
 				}
 
-				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_creation = $this->db->jdate($obj->datec);
+				$this->date_validation = $this->db->jdate($obj->datev);
 				$this->date_modification = $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -2687,21 +2490,18 @@ class Adherent extends CommonObject
 	public function getNbOfEMailings()
 	{
 		$sql = "SELECT count(mc.email) as nb";
-		$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
-		$sql .= " WHERE mc.email = '".$this->db->escape($this->email)."'";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "mailing_cibles as mc";
+		$sql .= " WHERE mc.email = '" . $this->db->escape($this->email) . "'";
 		$sql .= " AND mc.statut NOT IN (-1,0)"; // -1 erreur, 0 non envoye, 1 envoye avec succes
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			$nb = $obj->nb;
 
 			$this->db->free($resql);
 			return $nb;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2715,7 +2515,7 @@ class Adherent extends CommonObject
 	 * Existing categories are left untouch.
 	 *
 	 * @param int[]|int $categories Category or categories IDs
-     * @return void
+	 * @return void
 	 */
 	public function setCategories($categories)
 	{
@@ -2725,7 +2525,7 @@ class Adherent extends CommonObject
 		}
 
 		// Get current categories
-		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 		$c = new Categorie($this->db);
 		$existing = $c->containing($this->id, Categorie::TYPE_MEMBER, 'id');
 
@@ -2763,9 +2563,7 @@ class Adherent extends CommonObject
 	 */
 	public static function replaceThirdparty($db, $origin_id, $dest_id)
 	{
-		$tables = array(
-			'adherent'
-		);
+		$tables = array('adherent');
 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
@@ -2789,7 +2587,6 @@ class Adherent extends CommonObject
 	}
 
 
-
 	/**
 	 * Send reminders by emails before subscription end
 	 * CAN BE A CRON TASK
@@ -2807,14 +2604,13 @@ class Adherent extends CommonObject
 
 		$blockingerrormsg = '';
 
-		if (empty($conf->adherent->enabled))	// Should not happen. If module disabled, cron job should not be visible.
+		if (empty($conf->adherent->enabled)) // Should not happen. If module disabled, cron job should not be visible.
 		{
 			$langs->load("agenda");
 			$this->output = $langs->trans('ModuleNotEnabled', $langs->transnoentitiesnoconv("Adherent"));
 			return 0;
 		}
-		if (empty($conf->global->MEMBER_REMINDER_EMAIL))
-		{
+		if (empty($conf->global->MEMBER_REMINDER_EMAIL)) {
 			$langs->load("agenda");
 			$this->output = $langs->trans('EventRemindersByEmailNotEnabled', $langs->transnoentitiesnoconv("Adherent"));
 			return 0;
@@ -2828,12 +2624,11 @@ class Adherent extends CommonObject
 		$listofmembersko = array();
 
 		$arraydaysbeforeend = explode(';', $daysbeforeendlist);
-		foreach ($arraydaysbeforeend as $daysbeforeend)			// Loop on each delay
+		foreach ($arraydaysbeforeend as $daysbeforeend) // Loop on each delay
 		{
-			dol_syslog(__METHOD__.' - Process delta = '.$daysbeforeend, LOG_DEBUG);
+			dol_syslog(__METHOD__ . ' - Process delta = ' . $daysbeforeend, LOG_DEBUG);
 
-			if (!is_numeric($daysbeforeend))
-			{
+			if (!is_numeric($daysbeforeend)) {
 				$blockingerrormsg = "Value for delta is not a positive or negative numeric";
 				$nbko++;
 				break;
@@ -2842,33 +2637,28 @@ class Adherent extends CommonObject
 			$tmp = dol_getdate($now);
 			$datetosearchfor = dol_time_plus_duree(dol_mktime(0, 0, 0, $tmp['mon'], $tmp['mday'], $tmp['year']), $daysbeforeend, 'd');
 
-			$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'adherent';
-			$sql .= " WHERE entity = ".$conf->entity; // Do not use getEntity('adherent').")" here, we want the batch to be on its entity only;
-			$sql .= " AND datefin = '".$this->db->idate($datetosearchfor)."'";
+			$sql = 'SELECT rowid FROM ' . MAIN_DB_PREFIX . 'adherent';
+			$sql .= " WHERE entity = " . $conf->entity; // Do not use getEntity('adherent').")" here, we want the batch to be on its entity only;
+			$sql .= " AND datefin = '" . $this->db->idate($datetosearchfor) . "'";
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$num_rows = $this->db->num_rows($resql);
 
-				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+				include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
 				$adherent = new Adherent($this->db);
 				$formmail = new FormMail($this->db);
 
 				$i = 0;
-				while ($i < $num_rows)
-				{
+				while ($i < $num_rows) {
 					$obj = $this->db->fetch_object($resql);
 
 					$adherent->fetch($obj->rowid, '', '', '', true, true);
 
-					if (empty($adherent->email))
-					{
+					if (empty($adherent->email)) {
 						$nbko++;
 						$listofmembersko[$adherent->id] = $adherent->id;
-					}
-					else
-					{
+					} else {
 						$adherent->fetch_thirdparty();
 
 						// Language code to use ($languagecodeformember) is default language of thirdparty, if no thirdparty, the language found from country of member then country of thirdparty, and if still not found we use the language of company.
@@ -2879,32 +2669,30 @@ class Adherent extends CommonObject
 						$outputlangs = new Translate('', $conf);
 						$outputlangs->setDefaultLang($languagecodeformember);
 						$outputlangs->loadLangs(array("main", "members"));
-						dol_syslog("sendReminderForExpiredSubscription Language for member id ".$adherent->id." set to ".$outputlangs->defaultlang." mysoc->default_lang=".$mysoc->default_lang);
+						dol_syslog("sendReminderForExpiredSubscription Language for member id " . $adherent->id . " set to " . $outputlangs->defaultlang . " mysoc->default_lang=" . $mysoc->default_lang);
 
 						$arraydefaultmessage = null;
 						$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION;
 
 						if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($this->db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-						if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-						{
+						if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
 							$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $adherent);
 							//if (is_array($adherent->thirdparty)) $substitutionarraycomp = ...
 							complete_substitutions_array($substitutionarray, $outputlangs, $adherent);
 
 							$subject = make_substitutions($arraydefaultmessage->topic, $substitutionarray, $outputlangs);
-							$msg     = make_substitutions($arraydefaultmessage->content, $substitutionarray, $outputlangs);
+							$msg = make_substitutions($arraydefaultmessage->content, $substitutionarray, $outputlangs);
 							$from = $conf->global->ADHERENT_MAIL_FROM;
 							$to = $adherent->email;
 
-							$trackid = 'mem'.$adherent->id;
-							$moreinheader = 'X-Dolibarr-Info: sendReminderForExpiredSubscription'."\r\n";
+							$trackid = 'mem' . $adherent->id;
+							$moreinheader = 'X-Dolibarr-Info: sendReminderForExpiredSubscription' . "\r\n";
 
-							include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+							include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
 							$cmail = new CMailFile($subject, $to, $from, $msg, array(), array(), array(), '', '', 0, 1, '', '', $trackid, $moreinheader);
 							$result = $cmail->sendfile();
-							if (!$result)
-							{
+							if (!$result) {
 								$error++;
 								$this->error = $cmail->error;
 								if (!is_null($cmail->errors)) {
@@ -2912,9 +2700,7 @@ class Adherent extends CommonObject
 								}
 								$nbko++;
 								$listofmembersko[$adherent->id] = $adherent->id;
-							}
-							else
-							{
+							} else {
 								$nbok++;
 								$listofmembersok[$adherent->id] = $adherent->id;
 
@@ -2926,54 +2712,52 @@ class Adherent extends CommonObject
 								$extraparams = '';
 
 								$actionmsg = '';
-								$actionmsg2 = $langs->transnoentities('MailSentBy').' '.CMailFile::getValidAddress($from, 4, 0, 1).' '.$langs->transnoentities('To').' '.CMailFile::getValidAddress($sendto, 4, 0, 1);
-								if ($message)
-								{
-									$actionmsg = $langs->transnoentities('MailFrom').': '.dol_escape_htmltag($from);
-									$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTo').': '.dol_escape_htmltag($sendto));
-									if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".dol_escape_htmltag($sendtocc));
-									$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
-									$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
+								$actionmsg2 = $langs->transnoentities('MailSentBy') . ' ' . CMailFile::getValidAddress($from, 4, 0, 1) . ' ' . $langs->transnoentities('To') . ' ' .
+									CMailFile::getValidAddress($sendto, 4, 0, 1);
+								if ($message) {
+									$actionmsg = $langs->transnoentities('MailFrom') . ': ' . dol_escape_htmltag($from);
+									$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTo') . ': ' . dol_escape_htmltag($sendto));
+									if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . dol_escape_htmltag($sendtocc));
+									$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
+									$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
 									$actionmsg = dol_concatdesc($actionmsg, $message);
 								}
 
-								require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+								require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
 
-	    						// Insert record of emails sent
-	    						$actioncomm = new ActionComm($this->db);
+								// Insert record of emails sent
+								$actioncomm = new ActionComm($this->db);
 
-	    						$actioncomm->type_code   = 'AC_OTH_AUTO'; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
-	    						$actioncomm->code        = 'AC_'.$actioncode;
-	    						$actioncomm->label       = $actionmsg2;
-	    						$actioncomm->note_private = $actionmsg;
-	    						$actioncomm->fk_project  = 0;
-	    						$actioncomm->datep       = $now;
-	    						$actioncomm->datef       = $now;
-	    						$actioncomm->percentage  = -1; // Not applicable
-	    						$actioncomm->socid       = $adherent->thirdparty->id;
-	    						$actioncomm->contactid   = 0;
-	    						$actioncomm->authorid    = $user->id; // User saving action
-	    						$actioncomm->userownerid = $user->id; // Owner of action
-	    						// Fields when action is en email (content should be added into note)
-	    						$actioncomm->email_msgid = $cmail->msgid;
-	    						$actioncomm->email_from  = $from;
-	    						$actioncomm->email_sender = '';
-	    						$actioncomm->email_to    = $to;
-	    						$actioncomm->email_tocc  = $sendtocc;
-	    						$actioncomm->email_tobcc = $sendtobcc;
-	    						$actioncomm->email_subject = $subject;
-	    						$actioncomm->errors_to   = '';
+								$actioncomm->type_code = 'AC_OTH_AUTO'; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+								$actioncomm->code = 'AC_' . $actioncode;
+								$actioncomm->label = $actionmsg2;
+								$actioncomm->note_private = $actionmsg;
+								$actioncomm->fk_project = 0;
+								$actioncomm->datep = $now;
+								$actioncomm->datef = $now;
+								$actioncomm->percentage = -1; // Not applicable
+								$actioncomm->socid = $adherent->thirdparty->id;
+								$actioncomm->contactid = 0;
+								$actioncomm->authorid = $user->id; // User saving action
+								$actioncomm->userownerid = $user->id; // Owner of action
+								// Fields when action is en email (content should be added into note)
+								$actioncomm->email_msgid = $cmail->msgid;
+								$actioncomm->email_from = $from;
+								$actioncomm->email_sender = '';
+								$actioncomm->email_to = $to;
+								$actioncomm->email_tocc = $sendtocc;
+								$actioncomm->email_tobcc = $sendtobcc;
+								$actioncomm->email_subject = $subject;
+								$actioncomm->errors_to = '';
 
-	    						$actioncomm->fk_element  = $adherent->id;
-	    						$actioncomm->elementtype = $adherent->element;
+								$actioncomm->fk_element = $adherent->id;
+								$actioncomm->elementtype = $adherent->element;
 
-	    						$actioncomm->extraparams = $extraparams;
+								$actioncomm->extraparams = $extraparams;
 
-	    						$actioncomm->create($user);
+								$actioncomm->create($user);
 							}
-						}
-						else
-						{
+						} else {
 							$blockingerrormsg = "Can't find email template, defined into member module setup, to use for reminding";
 
 							$nbko++;
@@ -2985,32 +2769,30 @@ class Adherent extends CommonObject
 
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				return 1;
 			}
 		}
 
-		if ($blockingerrormsg)
-		{
+		if ($blockingerrormsg) {
 			$this->error = $blockingerrormsg;
 			return 1;
-		}
-		else
-		{
-			$this->output = 'Found '.($nbok + $nbko).' members to send reminder to.';
-			$this->output .= ' Send email successfuly to '.$nbok.' members';
+		} else {
+			$this->output = 'Found ' . ($nbok + $nbko) . ' members to send reminder to.';
+			$this->output .= ' Send email successfuly to ' . $nbok . ' members';
 			if (is_array($listofmembersok)) {
-				$listofids = ''; $i = 0;
+				$listofids = '';
+				$i = 0;
 				foreach ($listofmembersok as $idmember) {
 					if ($i > 100) {
 						$listofids .= ', ...';
 						break;
 					}
-					if (empty($listofids)) $listofids .= ' [';
-					else $listofids .= ', ';
+					if (empty($listofids))
+						$listofids .= ' [';
+					else
+						$listofids .= ', ';
 					$listofids .= $idmember;
 					$i++;
 				}
@@ -3018,16 +2800,19 @@ class Adherent extends CommonObject
 				$this->output .= $listofids;
 			}
 			if ($nbko) {
-				$this->output .= ' - Canceled for '.$nbko.' member (no email or email sending error)';
+				$this->output .= ' - Canceled for ' . $nbko . ' member (no email or email sending error)';
 				if (is_array($listofmembersko)) {
-					$listofids = ''; $i = 0;
+					$listofids = '';
+					$i = 0;
 					foreach ($listofmembersko as $idmember) {
 						if ($i > 100) {
 							$listofids .= ', ...';
 							break;
 						}
-						if (empty($listofids)) $listofids .= ' [';
-						else $listofids .= ', ';
+						if (empty($listofids))
+							$listofids .= ' [';
+						else
+							$listofids .= ', ';
 						$listofids .= $idmember;
 						$i++;
 					}

From 4a6e4913346e9298714d155940995f014f61f819 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 22:54:32 +0100
Subject: [PATCH 33/69] Test

---
 .github/workflows/stale-issues.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml
index 8afb7e8f4f8..fc179f73c38 100644
--- a/.github/workflows/stale-issues.yml
+++ b/.github/workflows/stale-issues.yml
@@ -3,7 +3,7 @@ name: "Close stale issues (bugs and feature requests)"
 
 on:
   schedule:
-  - cron: "0 0 * * *"
+  - cron: "0 * * * *"
 
 jobs:
   stale:
@@ -17,7 +17,7 @@ jobs:
         exempt-issue-label: 'Priority High / Blocking'
         days-before-stale: 365
         days-before-close: 15
-        operations-per-run: 10
+        operations-per-run: 5
         #stale-pr-message: 'This PR is stale because it has been open 1 year with no activity. If this PR is still mergeable (no conflict, nor Continuous Integration errors), please comment to confirm this merge is still expected. Without comment, this issue will be closed automatically by stale bot in 15 days.'
         stale-pr-label: 'PR Stale (automatic label)'
         stale-pr-message: 

From 2118c2eede184a264d92f6e7fb6472398933121e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 23:04:17 +0100
Subject: [PATCH 34/69] Fix missing title line

---
 htdocs/accountancy/admin/defaultaccounts.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index 611aa8fc321..c0c3f835481 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -161,6 +161,7 @@ print '<input type="hidden" name="action" value="update">';
 // Define main accounts for thirdparty
 
 print '<table class="noborder centpercent">';
+print '<tr class="liste_titre"><td>'.$langs->trans("ThirdParties").' | '.$langs->trans("Users").'</td><td></td></tr>';
 
 foreach ($list_account_main as $key) {
     print '<tr class="oddeven value">';
@@ -180,15 +181,6 @@ foreach ($list_account_main as $key) {
 }
 
 
-print "</table>\n";
-
-
-print '<br>';
-
-// Define default accounts
-
-print '<table class="noborder centpercent">';
-
 foreach ($list_account as $key) {
 	$reg=array();
 	if (preg_match('/---(.*)---/', $key, $reg)) {

From 2067abdc7e2c685347f0b5871ee9fa04992d93c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 23:10:04 +0100
Subject: [PATCH 35/69] Fix title of page

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

diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index edc73688389..b2262c603f9 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -134,13 +134,13 @@ if ($action == 'update') {
 
 $form = new Form($db);
 
-$title = $langs->trans('ConfigAccountingExpert');
+$title = $langs->trans('ExportOptions');
 llxHeader('', $title);
 
 
 $linkback = '';
 // $linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1">' . $langs->trans("BackToModuleList") . '</a>';
-print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'accountancy');
+print load_fiche_titre($langs->trans('ExportOptions'), $linkback, 'accountancy');
 
 
 print "\n".'<script type="text/javascript" language="javascript">'."\n";

From 504f8fa2e4ed8771c853a7ac21dd442c78fb9371 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 23:14:15 +0100
Subject: [PATCH 36/69] Fix loop on not countable object

---
 htdocs/fichinter/card.php | 157 +++++++++++++++++++-------------------
 1 file changed, 79 insertions(+), 78 deletions(-)

diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 3d1a23ee26d..6e95b17eb56 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -286,99 +286,100 @@ if (empty($reshook))
 							$lines = $srcobject->lines;
 						}
 
-						$fk_parent_line = 0;
-						$num = count($lines);
+						if (is_array($lines)) {
+							$num = count($lines);
 
-						for ($i = 0; $i < $num; $i++)
-						{
-							$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : Product::TYPE_PRODUCT);
+							for ($i = 0; $i < $num; $i++)
+							{
+								$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : Product::TYPE_PRODUCT);
 
-							if ($product_type == Product::TYPE_SERVICE || !empty($conf->global->FICHINTER_PRINT_PRODUCTS)) { //only services except if config includes products
-								$duration = 3600; // Default to one hour
+								if ($product_type == Product::TYPE_SERVICE || !empty($conf->global->FICHINTER_PRINT_PRODUCTS)) { //only services except if config includes products
+									$duration = 3600; // Default to one hour
 
-								// Predefined products & services
-								if ($lines[$i]->fk_product > 0)
-								{
-									$prod = new Product($db);
-									$prod->id = $lines[$i]->fk_product;
+									// Predefined products & services
+									if ($lines[$i]->fk_product > 0)
+									{
+										$prod = new Product($db);
+										$prod->id = $lines[$i]->fk_product;
 
-									// Define output language
-									if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
-										$prod->getMultiLangs();
-										// We show if duration is present on service (so we get it)
-										$prod->fetch($lines[$i]->fk_product);
-										$outputlangs = $langs;
-										$newlang = '';
-										if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-										if (empty($newlang)) $newlang = $srcobject->thirdparty->default_lang;
-										if (!empty($newlang)) {
-											$outputlangs = new Translate("", $conf);
-											$outputlangs->setDefaultLang($newlang);
+										// Define output language
+										if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+											$prod->getMultiLangs();
+											// We show if duration is present on service (so we get it)
+											$prod->fetch($lines[$i]->fk_product);
+											$outputlangs = $langs;
+											$newlang = '';
+											if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+											if (empty($newlang)) $newlang = $srcobject->thirdparty->default_lang;
+											if (!empty($newlang)) {
+												$outputlangs = new Translate("", $conf);
+												$outputlangs->setDefaultLang($newlang);
+											}
+											$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["libelle"])) ? $prod->multilangs[$outputlangs->defaultlang]["libelle"] : $lines[$i]->product_label;
+										} else {
+											$prod->fetch($lines[$i]->fk_product);
+											$label = $lines[$i]->product_label;
 										}
-										$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["libelle"])) ? $prod->multilangs[$outputlangs->defaultlang]["libelle"] : $lines[$i]->product_label;
-									} else {
-										$prod->fetch($lines[$i]->fk_product);
-										$label = $lines[$i]->product_label;
-									}
 
-									if ($prod->duration_value && $conf->global->FICHINTER_USE_SERVICE_DURATION) {
-										switch ($prod->duration_unit) {
-											default:
-											case 'h':
-												$mult = 3600;
-												break;
-											case 'd':
-												$mult = 3600 * 24;
-												break;
-											case 'w':
-												$mult = 3600 * 24 * 7;
-												break;
-											case 'm':
-												$mult = (int) 3600 * 24 * (365 / 12); // Average month duration
-												break;
-											case 'y':
-												$mult = 3600 * 24 * 365;
-												break;
+										if ($prod->duration_value && $conf->global->FICHINTER_USE_SERVICE_DURATION) {
+											switch ($prod->duration_unit) {
+												default:
+												case 'h':
+													$mult = 3600;
+													break;
+												case 'd':
+													$mult = 3600 * 24;
+													break;
+												case 'w':
+													$mult = 3600 * 24 * 7;
+													break;
+												case 'm':
+													$mult = (int) 3600 * 24 * (365 / 12); // Average month duration
+													break;
+												case 'y':
+													$mult = 3600 * 24 * 365;
+													break;
+											}
+											$duration = $prod->duration_value * $mult * $lines[$i]->qty;
 										}
-										$duration = $prod->duration_value * $mult * $lines[$i]->qty;
-									}
 
-									$desc = $lines[$i]->product_ref;
-									$desc .= ' - ';
-									$desc .= $label;
+										$desc = $lines[$i]->product_ref;
+										$desc .= ' - ';
+										$desc .= $label;
+										$desc .= '<br>';
+									}
+									// Common part (predefined or free line)
+									$desc .= dol_htmlentitiesbr($lines[$i]->desc);
 									$desc .= '<br>';
-								}
-								// Common part (predefined or free line)
-								$desc .= dol_htmlentitiesbr($lines[$i]->desc);
-								$desc .= '<br>';
-								$desc .= ' ('.$langs->trans('Quantity').': '.$lines[$i]->qty.')';
+									$desc .= ' ('.$langs->trans('Quantity').': '.$lines[$i]->qty.')';
 
-								$timearray = dol_getdate(dol_now());
-								$date_intervention = dol_mktime(0, 0, 0, $timearray['mon'], $timearray['mday'], $timearray['year']);
+									$timearray = dol_getdate(dol_now());
+									$date_intervention = dol_mktime(0, 0, 0, $timearray['mon'], $timearray['mday'], $timearray['year']);
 
-								if ($product_type == Product::TYPE_PRODUCT) {
-									$duration = 0;
-								}
+									if ($product_type == Product::TYPE_PRODUCT) {
+										$duration = 0;
+									}
 
-								$predef = '';
+									$predef = '';
 
-								// Extrafields
-								$extrafields->fetch_name_optionals_label($object->table_element_line);
-								$array_options = $extrafields->getOptionalsFromPost($object->table_element_line, $predef);
+									// Extrafields
+									$extrafields->fetch_name_optionals_label($object->table_element_line);
+									$array_options = $extrafields->getOptionalsFromPost($object->table_element_line, $predef);
 
-								$result = $object->addline(
-									$user,
-			                        $id,
-			                        $desc,
-						            $date_intervention,
-	                 				$duration,
-	                 				$array_options
-			                    );
+									$result = $object->addline(
+										$user,
+				                        $id,
+				                        $desc,
+							            $date_intervention,
+		                 				$duration,
+		                 				$array_options
+				                    );
 
-								if ($result < 0)
-								{
-									$error++;
-									break;
+									if ($result < 0)
+									{
+										$error++;
+										break;
+									}
 								}
 							}
 						}

From d0f86a097be34778c8550263967b7a855960af87 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Feb 2020 23:59:24 +0100
Subject: [PATCH 37/69] 10 op

---
 .github/workflows/stale-issues.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml
index fc179f73c38..7cd925f50fa 100644
--- a/.github/workflows/stale-issues.yml
+++ b/.github/workflows/stale-issues.yml
@@ -17,7 +17,7 @@ jobs:
         exempt-issue-label: 'Priority High / Blocking'
         days-before-stale: 365
         days-before-close: 15
-        operations-per-run: 5
+        operations-per-run: 10
         #stale-pr-message: 'This PR is stale because it has been open 1 year with no activity. If this PR is still mergeable (no conflict, nor Continuous Integration errors), please comment to confirm this merge is still expected. Without comment, this issue will be closed automatically by stale bot in 15 days.'
         stale-pr-label: 'PR Stale (automatic label)'
         stale-pr-message: 

From 3b3c951ac674518150f67042114b40dfbacd4230 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 00:13:49 +0100
Subject: [PATCH 38/69] Use version in master

---
 .github/workflows/stale-issues.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml
index 7cd925f50fa..305294d02fe 100644
--- a/.github/workflows/stale-issues.yml
+++ b/.github/workflows/stale-issues.yml
@@ -3,13 +3,13 @@ name: "Close stale issues (bugs and feature requests)"
 
 on:
   schedule:
-  - cron: "0 * * * *"
+  - cron: "*/15 * * * *"
 
 jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-    - uses: Dolibarr/stale@v1.1.0
+    - uses: Dolibarr/stale@master
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue is stale because it has been open 1 year with no activity. If this is a bug, please comment to confirm it is still present on latest stable version. if this is a feature request, please comment to notify the request is still relevant and not yet covered by latest stable version. Without comment, this issue will be closed automatically by stale bot in 15 days.'
@@ -17,7 +17,7 @@ jobs:
         exempt-issue-label: 'Priority High / Blocking'
         days-before-stale: 365
         days-before-close: 15
-        operations-per-run: 10
+        operations-per-run: 15
         #stale-pr-message: 'This PR is stale because it has been open 1 year with no activity. If this PR is still mergeable (no conflict, nor Continuous Integration errors), please comment to confirm this merge is still expected. Without comment, this issue will be closed automatically by stale bot in 15 days.'
         stale-pr-label: 'PR Stale (automatic label)'
         stale-pr-message: 

From 5516c8ce81de9b3cffd9029d580b054024b18e9b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 00:51:06 +0100
Subject: [PATCH 39/69] FIX Submit of documents for supplier invoices.

---
 htdocs/api/class/api_documents.class.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 4785ab78174..75e27ad0e0d 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -418,8 +418,9 @@ class Documents extends DolibarrApi
 	/**
 	 * Upload a file.
 	 *
-	 * Test sample 1: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
-	 * Test sample 2: { "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "image/mywebsite", "filecontent": "Y29udGVudCB0ZXh0Cg==", "fileencoding": "base64", "overwriteifexists": "0" }.
+	 * Test sample for invoice: { "filename": "mynewfile.txt", "modulepart": "invoice", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
+	 * Test sample for supplier invoice: { "filename": "mynewfile.txt", "modulepart": "supplier_invoice", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
+	 * Test sample for medias file: { "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "image/mywebsite", "filecontent": "Y29udGVudCB0ZXh0Cg==", "fileencoding": "base64", "overwriteifexists": "0" }.
 	 *
 	 * @param   string  $filename           Name of file to create ('FA1705-0123.txt')
 	 * @param   string  $modulepart         Name of module or area concerned by file upload ('facture', 'project', 'project_task', ...)
@@ -476,6 +477,13 @@ class Documents extends DolibarrApi
 				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$object = new Facture($this->db);
 			}
+			elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
+			{
+				$modulepart = 'supplier_invoice';
+
+				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+				$object = new FactureFournisseur($this->db);
+			}
 			elseif ($modulepart == 'project')
 			{
 				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
@@ -535,6 +543,12 @@ class Documents extends DolibarrApi
    				throw new RestException(404, 'The object '.$modulepart." with ref '".$ref."' was not found.");
 			}
 
+			// Special cases that need to use get_exdir to get real dir of object
+			// If future, all object should use this to define path of documents.
+			if ($modulepart == 'supplier_invoice') {
+				$tmpreldir = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier');
+			}
+
 			$relativefile = $tmpreldir.dol_sanitizeFileName($object->ref);
 
 			$tmp = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, $ref, 'write');

From e18ecac7d908f23cdab872d98f17105cce1a27e2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 01:24:54 +0100
Subject: [PATCH 40/69] test

---
 .github/workflows/stale-issues.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml
index 305294d02fe..7a882ae143d 100644
--- a/.github/workflows/stale-issues.yml
+++ b/.github/workflows/stale-issues.yml
@@ -3,7 +3,7 @@ name: "Close stale issues (bugs and feature requests)"
 
 on:
   schedule:
-  - cron: "*/15 * * * *"
+  - cron: "*/10 * * * *"
 
 jobs:
   stale:

From 33f51f6bdf67f62d5a78bcdb4fd1f8fd60d53656 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 01:45:21 +0100
Subject: [PATCH 41/69] Restore on batch per day

---
 .github/workflows/stale-issues.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml
index 7a882ae143d..0be87022eef 100644
--- a/.github/workflows/stale-issues.yml
+++ b/.github/workflows/stale-issues.yml
@@ -3,7 +3,7 @@ name: "Close stale issues (bugs and feature requests)"
 
 on:
   schedule:
-  - cron: "*/10 * * * *"
+  - cron: "0 0 * * *"
 
 jobs:
   stale:
@@ -17,7 +17,7 @@ jobs:
         exempt-issue-label: 'Priority High / Blocking'
         days-before-stale: 365
         days-before-close: 15
-        operations-per-run: 15
+        operations-per-run: 30
         #stale-pr-message: 'This PR is stale because it has been open 1 year with no activity. If this PR is still mergeable (no conflict, nor Continuous Integration errors), please comment to confirm this merge is still expected. Without comment, this issue will be closed automatically by stale bot in 15 days.'
         stale-pr-label: 'PR Stale (automatic label)'
         stale-pr-message: 

From ace5f2844ad2f23a660575c88a8e772d0ea15db1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 12:37:44 +0100
Subject: [PATCH 42/69] Make Setup of TakePOS faster with Ajax ON-Off Button.

---
 htdocs/core/lib/ajax.lib.php      |  11 +--
 htdocs/core/lib/functions.lib.php |   2 +-
 htdocs/takepos/admin/setup.php    | 141 +++++++++++++++++-------------
 3 files changed, 88 insertions(+), 66 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 9e1a8f5fcf8..58567748f7f 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -476,13 +476,14 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
  *
  * 	@param	string	$code					Name of constant
  * 	@param	array	$input					Array of options. ("disabled"|"enabled'|'set'|'del') => CSS element to switch, 'alert' => message to show, ... Example: array('disabled'=>array(0=>'cssid'))
- * 	@param	int		$entity					Entity to set
+ * 	@param	int		$entity					Entity to set. Use current entity if null.
  *  @param	int		$revertonoff			Revert on/off
- *  @param	bool	$strict					Use only "disabled" with delConstant and "enabled" with setConstant
+ *  @param	int		$strict					Use only "disabled" with delConstant and "enabled" with setConstant
  *  @param	int		$forcereload			Force to reload page if we click/change value (this is supported only when there is no 'alert' option in input)
+ *  @param	string	$marginleftonlyshort	1 = Add a short left margin on picto, 2 = Add a larger left margin on picto, 0 = No margin left. Works for fontawesome picto only.
  * 	@return	string
  */
-function ajax_constantonoff($code, $input = array(), $entity = null, $revertonoff = 0, $strict = 0, $forcereload = 0)
+function ajax_constantonoff($code, $input = array(), $entity = null, $revertonoff = 0, $strict = 0, $forcereload = 0, $marginleftonlyshort = 2)
 {
 	global $conf, $langs;
 
@@ -531,8 +532,8 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
 		</script>'."\n";
 
 		$out .= '<div id="confirm_'.$code.'" title="" style="display: none;"></div>';
-		$out .= '<span id="set_'.$code.'" class="linkobject '.(!empty($conf->global->$code) ? 'hideobject' : '').'">'.($revertonoff ?img_picto($langs->trans("Enabled"), 'switch_on') : img_picto($langs->trans("Disabled"), 'switch_off')).'</span>';
-		$out .= '<span id="del_'.$code.'" class="linkobject '.(!empty($conf->global->$code) ? '' : 'hideobject').'">'.($revertonoff ?img_picto($langs->trans("Disabled"), 'switch_off') : img_picto($langs->trans("Enabled"), 'switch_on')).'</span>';
+		$out .= '<span id="set_'.$code.'" class="linkobject '.(!empty($conf->global->$code) ? 'hideobject' : '').'">'.($revertonoff ?img_picto($langs->trans("Enabled"), 'switch_on', '', false, 0, 0, '', '', $marginleftonlyshort) : img_picto($langs->trans("Disabled"), 'switch_off', '', false, 0, 0, '', '', $marginleftonlyshort)).'</span>';
+		$out .= '<span id="del_'.$code.'" class="linkobject '.(!empty($conf->global->$code) ? '' : 'hideobject').'">'.($revertonoff ?img_picto($langs->trans("Disabled"), 'switch_off', '', false, 0, 0, '', '', $marginleftonlyshort) : img_picto($langs->trans("Enabled"), 'switch_on', '', false, 0, 0, '', '', $marginleftonlyshort)).'</span>';
 		$out .= "\n";
 	}
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f058097ca81..0b732f9372a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3077,7 +3077,7 @@ function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF
  *	@param		int			$srconly				Return only content of the src attribute of img.
  *  @param		int			$notitle				1=Disable tag title. Use it if you add js tooltip, to avoid duplicate tooltip.
  *  @param		string		$alt					Force alt for bind people
- *  @param		string		$morecss				Add more class css on img tag (For example 'myclascss'). Work only if $moreatt is empty.
+ *  @param		string		$morecss				Add more class css on img tag (For example 'myclascss').
  *  @param		string		$marginleftonlyshort	1 = Add a short left margin on picto, 2 = Add a larger left margin on picto, 0 = No margin left. Works for fontawesome picto only.
  *  @return     string       				    	Return img tag
  *  @see        img_object(), img_picto_common()
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index bcb3b576e0e..086a929b723 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -132,7 +132,7 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
+print '<td class="titlefield">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 // Terminals
@@ -149,7 +149,8 @@ if (!empty($conf->service->enabled))
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("CashdeskShowServices");
 	print '<td colspan="2">';
-	print $form->selectyesno("CASHDESK_SERVICES", $conf->global->CASHDESK_SERVICES, 1);
+	print ajax_constantonoff("CASHDESK_SERVICES", array(), $conf->entity, 0, 0, 1, 0);
+	//print $form->selectyesno("CASHDESK_SERVICES", $conf->global->CASHDESK_SERVICES, 1);
 	print "</td></tr>\n";
 }
 
@@ -161,65 +162,12 @@ print $form->select_all_categories(Categorie::TYPE_PRODUCT, $conf->global->TAKEP
 print ajax_combobox('TAKEPOS_ROOT_CATEGORY_ID');
 print "</td></tr>\n";
 
-// Bar Restaurant mode
-print '<tr class="oddeven"><td>';
-print $langs->trans("EnableBarOrRestaurantFeatures");
-print '</td>';
-print '<td colspan="2">';
-print $form->selectyesno("TAKEPOS_BAR_RESTAURANT", $conf->global->TAKEPOS_BAR_RESTAURANT, 1);
-print "</td></tr>\n";
-
-if ($conf->global->TAKEPOS_BAR_RESTAURANT && $conf->global->TAKEPOS_PRINT_METHOD != "browser") {
-	print '<tr class="oddeven value"><td>';
-	print $langs->trans("OrderPrinters").' (<a href="'.DOL_URL_ROOT.'/takepos/admin/orderprinters.php?leftmenu=setup">'.$langs->trans("Setup").'</a>)';
-	print '<td colspan="2">';
-	print $form->selectyesno("TAKEPOS_ORDER_PRINTERS", $conf->global->TAKEPOS_ORDER_PRINTERS, 1);
-	print '</td></tr>';
-
-	print '<tr class="oddeven value"><td>';
-	print $langs->trans("OrderNotes");
-	print '<td colspan="2">';
-	print $form->selectyesno("TAKEPOS_ORDER_NOTES", $conf->global->TAKEPOS_ORDER_NOTES, 1);
-	print '</td></tr>';
-}
-
-if ($conf->global->TAKEPOS_BAR_RESTAURANT)
-{
-	print '<tr class="oddeven value"><td>';
-	print $langs->trans("BasicPhoneLayout");
-	print '<td colspan="2">';
-	print $form->selectyesno("TAKEPOS_PHONE_BASIC_LAYOUT", $conf->global->TAKEPOS_PHONE_BASIC_LAYOUT, 1);
-	print '</td></tr>';
-
-	print '<tr class="oddeven value"><td>';
-	print $langs->trans("ProductSupplements");
-	print '<td colspan="2">';
-	print $form->selectyesno("TAKEPOS_SUPPLEMENTS", $conf->global->TAKEPOS_SUPPLEMENTS, 1);
-	print '</td></tr>';
-
-	if ($conf->global->TAKEPOS_SUPPLEMENTS)
-	{
-		print '<tr class="oddeven"><td>';
-		print $langs->trans("SupplementCategory");
-		print '<td colspan="2">';
-		print $form->select_all_categories(Categorie::TYPE_PRODUCT, $conf->global->TAKEPOS_SUPPLEMENTS_CATEGORY, 'TAKEPOS_SUPPLEMENTS_CATEGORY', 64, 0, 0);
-		print ajax_combobox('TAKEPOS_SUPPLEMENTS_CATEGORY');
-		print "</td></tr>\n";
-	}
-}
-
+// VAT Grouped on ticket
 print '<tr class="oddeven"><td>';
 print $langs->trans('TicketVatGrouped');
 print '<td colspan="2">';
-print $form->selectyesno("TAKEPOS_TICKET_VAT_GROUPPED", $conf->global->TAKEPOS_TICKET_VAT_GROUPPED, 1);
-print "</td></tr>\n";
-
-// Payment numpad
-print '<tr class="oddeven"><td>';
-print $langs->trans("Paymentnumpad");
-print '<td colspan="2">';
-$array = array(0=>$langs->trans("Numberspad"), 1=>$langs->trans("BillsCoinsPad"));
-print $form->selectarray('TAKEPOS_NUMPAD', $array, (empty($conf->global->TAKEPOS_NUMPAD) ? '0' : $conf->global->TAKEPOS_NUMPAD), 0);
+print ajax_constantonoff("TAKEPOS_TICKET_VAT_GROUPPED", array(), $conf->entity, 0, 0, 1, 0);
+//print $form->selectyesno("TAKEPOS_TICKET_VAT_GROUPPED", $conf->global->TAKEPOS_TICKET_VAT_GROUPPED, 1);
 print "</td></tr>\n";
 
 // Sort product
@@ -248,11 +196,20 @@ $array = array(0=>"eldy", 1=>$langs->trans("Colorful"));
 print $form->selectarray('TAKEPOS_COLOR_THEME', $array, (empty($conf->global->TAKEPOS_COLOR_THEME) ? '0' : $conf->global->TAKEPOS_COLOR_THEME), 0);
 print "</td></tr>\n";
 
+// Payment numpad
+print '<tr class="oddeven"><td>';
+print $langs->trans("Paymentnumpad");
+print '<td colspan="2">';
+$array = array(0=>$langs->trans("Numberspad"), 1=>$langs->trans("BillsCoinsPad"));
+print $form->selectarray('TAKEPOS_NUMPAD', $array, (empty($conf->global->TAKEPOS_NUMPAD) ? '0' : $conf->global->TAKEPOS_NUMPAD), 0);
+print "</td></tr>\n";
+
 // Direct Payment
 print '<tr class="oddeven"><td>';
 print $langs->trans('DirectPaymentButton');
 print '<td colspan="2">';
-print $form->selectyesno("TAKEPOS_DIRECT_PAYMENT", $conf->global->TAKEPOS_DIRECT_PAYMENT, 1);
+print ajax_constantonoff("TAKEPOS_DIRECT_PAYMENT", array(), $conf->entity, 0, 0, 1, 0);
+//print $form->selectyesno("TAKEPOS_DIRECT_PAYMENT", $conf->global->TAKEPOS_DIRECT_PAYMENT, 1);
 print "</td></tr>\n";
 
 // Head Bar
@@ -290,6 +247,70 @@ print "</td></tr>\n";
 print '</table>';
 print '</div>';
 
+print '<br>';
+
+// Bar Restaurant mode
+print '<div class="div-table-responsive-no-min">';
+print '<table class="noborder centpercent">';
+
+print '<tr class="liste_titre">';
+print '<td class="titlefield">'.$langs->trans("Other").'</td><td>'.$langs->trans("Value").'</td>';
+print "</tr>\n";
+
+print '<tr class="oddeven"><td>';
+print $langs->trans("EnableBarOrRestaurantFeatures");
+print '</td>';
+print '<td colspan="2">';
+print ajax_constantonoff("TAKEPOS_BAR_RESTAURANT", array(), $conf->entity, 0, 0, 1, 0);
+//print $form->selectyesno("TAKEPOS_BAR_RESTAURANT", $conf->global->TAKEPOS_BAR_RESTAURANT, 1);
+print "</td></tr>\n";
+
+if ($conf->global->TAKEPOS_BAR_RESTAURANT && $conf->global->TAKEPOS_PRINT_METHOD != "browser") {
+	print '<tr class="oddeven value"><td>';
+	print $langs->trans("OrderPrinters").' (<a href="'.DOL_URL_ROOT.'/takepos/admin/orderprinters.php?leftmenu=setup">'.$langs->trans("Setup").'</a>)';
+	print '<td colspan="2">';
+	print ajax_constantonoff("TAKEPOS_ORDER_PRINTERS", array(), $conf->entity, 0, 0, 1, 0);
+	//print $form->selectyesno("TAKEPOS_ORDER_PRINTERS", $conf->global->TAKEPOS_ORDER_PRINTERS, 1);
+	print '</td></tr>';
+
+	print '<tr class="oddeven value"><td>';
+	print $langs->trans("OrderNotes");
+	print '<td colspan="2">';
+	print ajax_constantonoff("TAKEPOS_ORDER_NOTES", array(), $conf->entity, 0, 0, 1, 0);
+	//print $form->selectyesno("TAKEPOS_ORDER_NOTES", $conf->global->TAKEPOS_ORDER_NOTES, 1);
+	print '</td></tr>';
+}
+
+if ($conf->global->TAKEPOS_BAR_RESTAURANT)
+{
+	print '<tr class="oddeven value"><td>';
+	print $langs->trans("BasicPhoneLayout");
+	print '<td colspan="2">';
+	//print $form->selectyesno("TAKEPOS_PHONE_BASIC_LAYOUT", $conf->global->TAKEPOS_PHONE_BASIC_LAYOUT, 1);
+	print ajax_constantonoff("TAKEPOS_PHONE_BASIC_LAYOUT", array(), $conf->entity, 0, 0, 1, 0);
+	print '</td></tr>';
+
+	print '<tr class="oddeven value"><td>';
+	print $langs->trans("ProductSupplements");
+	print '<td colspan="2">';
+	//print $form->selectyesno("TAKEPOS_SUPPLEMENTS", $conf->global->TAKEPOS_SUPPLEMENTS, 1);
+	print ajax_constantonoff("TAKEPOS_SUPPLEMENTS", array(), $conf->entity, 0, 0, 1, 0);
+	print '</td></tr>';
+
+	if ($conf->global->TAKEPOS_SUPPLEMENTS)
+	{
+		print '<tr class="oddeven"><td>';
+		print $langs->trans("SupplementCategory");
+		print '<td colspan="2">';
+		print $form->select_all_categories(Categorie::TYPE_PRODUCT, $conf->global->TAKEPOS_SUPPLEMENTS_CATEGORY, 'TAKEPOS_SUPPLEMENTS_CATEGORY', 64, 0, 0);
+		print ajax_combobox('TAKEPOS_SUPPLEMENTS_CATEGORY');
+		print "</td></tr>\n";
+	}
+}
+print '</table>';
+print '</div>';
+
+
 // Sumup options
 if ($conf->global->TAKEPOS_ENABLE_SUMUP) {
 	print '<br>';
@@ -298,7 +319,7 @@ if ($conf->global->TAKEPOS_ENABLE_SUMUP) {
 	print '<table class="noborder centpercent">';
 
 	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
+	print '<td class="titlefield">'.$langs->trans("Sumup").'</td><td>'.$langs->trans("Value").'</td>';
 	print "</tr>\n";
 
 	print '<tr class="oddeven"><td>';

From 16b3e6f7bb6f0eb55a8dca5aa6acdde20d46bb74 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 12:44:18 +0100
Subject: [PATCH 43/69] Move external access on dedicated tab Translate field
 to sort products

---
 htdocs/core/lib/takepos.lib.php |   7 +-
 htdocs/takepos/admin/other.php  | 179 ++++++++++++++++++++++++++++++++
 htdocs/takepos/admin/setup.php  |  44 +-------
 3 files changed, 187 insertions(+), 43 deletions(-)
 create mode 100644 htdocs/takepos/admin/other.php

diff --git a/htdocs/core/lib/takepos.lib.php b/htdocs/core/lib/takepos.lib.php
index 65ad4c091a0..6cf8189f3c8 100644
--- a/htdocs/core/lib/takepos.lib.php
+++ b/htdocs/core/lib/takepos.lib.php
@@ -52,7 +52,12 @@ function takepos_prepare_head()
 		$h++;
 	}
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'takepos');
+	$head[$h][0] = DOL_URL_ROOT.'/takepos/admin/other.php';
+	$head[$h][1] = $langs->trans("Other");
+	$head[$h][2] = 'other';
+	$h++;
+
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'takepos');
 
     return $head;
 }
diff --git a/htdocs/takepos/admin/other.php b/htdocs/takepos/admin/other.php
new file mode 100644
index 00000000000..ddaaf7dac51
--- /dev/null
+++ b/htdocs/takepos/admin/other.php
@@ -0,0 +1,179 @@
+<?php
+/* Copyright (C) 2008-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2011-2017 Juanjo Menent		<jmenent@2byte.es>
+ *
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/takepos/admin/setup.php
+ *	\ingroup    takepos
+ *	\brief      Setup page for TakePos module
+ */
+
+require '../../main.inc.php'; // Load $user and permissions
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT."/core/lib/takepos.lib.php";
+
+// If socid provided by ajax company selector
+if (!empty($_REQUEST['CASHDESK_ID_THIRDPARTY_id']))
+{
+	$_GET['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha');
+	$_POST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha');
+	$_REQUEST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha');
+}
+
+// Security check
+if (!$user->admin) accessforbidden();
+
+$langs->loadLangs(array("admin", "cashdesk"));
+
+global $db;
+
+$sql = "SELECT code, libelle FROM ".MAIN_DB_PREFIX."c_paiement";
+$sql .= " WHERE entity IN (".getEntity('c_paiement').")";
+$sql .= " AND active = 1";
+$sql .= " ORDER BY libelle";
+$resql = $db->query($sql);
+$paiements = array();
+if ($resql) {
+	while ($obj = $db->fetch_object($resql)) {
+		array_push($paiements, $obj);
+	}
+}
+
+/*
+ * Actions
+ */
+if (GETPOST('action', 'alpha') == 'set')
+{
+	$db->begin();
+	if (GETPOST('socid', 'int') < 0) $_POST["socid"] = '';
+
+	$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);
+	$res = dolibarr_set_const($db, "TAKEPOS_BAR_RESTAURANT", GETPOST('TAKEPOS_BAR_RESTAURANT', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_TICKET_VAT_GROUPPED", GETPOST('TAKEPOS_TICKET_VAT_GROUPPED', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTERS", GETPOST('TAKEPOS_ORDER_PRINTERS', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_ORDER_NOTES", GETPOST('TAKEPOS_ORDER_NOTES', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_PHONE_BASIC_LAYOUT", GETPOST('TAKEPOS_PHONE_BASIC_LAYOUT', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_SUPPLEMENTS", GETPOST('TAKEPOS_SUPPLEMENTS', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_SUPPLEMENTS_CATEGORY", GETPOST('TAKEPOS_SUPPLEMENTS_CATEGORY', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_NUMPAD", GETPOST('TAKEPOS_NUMPAD', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_SORTPRODUCTFIELD", GETPOST('TAKEPOS_SORTPRODUCTFIELD', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_COLOR_THEME", GETPOST('TAKEPOS_COLOR_THEME', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_NUM_TERMINALS", GETPOST('TAKEPOS_NUM_TERMINALS', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_DIRECT_PAYMENT", GETPOST('TAKEPOS_DIRECT_PAYMENT', 'int'), 'int', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_CUSTOM_RECEIPT", GETPOST('TAKEPOS_CUSTOM_RECEIPT', 'int'), 'int', 0, '', $conf->entity);
+	//$res = dolibarr_set_const($db, "TAKEPOS_HEAD_BAR", GETPOST('TAKEPOS_HEAD_BAR', 'int'), 'int', 0, '', $conf->entity);
+    $res = dolibarr_set_const($db, "TAKEPOS_EMAIL_TEMPLATE_INVOICE", GETPOST('TAKEPOS_EMAIL_TEMPLATE_INVOICE', 'alpha'), 'chaine', 0, '', $conf->entity);
+	if (!empty($conf->global->TAKEPOS_ENABLE_SUMUP)) {
+		$res = dolibarr_set_const($db, "TAKEPOS_SUMUP_AFFILIATE", GETPOST('TAKEPOS_SUMUP_AFFILIATE', 'alpha'), 'chaine', 0, '', $conf->entity);
+		$res = dolibarr_set_const($db, "TAKEPOS_SUMUP_APPID", GETPOST('TAKEPOS_SUMUP_APPID', 'alpha'), 'chaine', 0, '', $conf->entity);
+	}
+	if ($conf->global->TAKEPOS_ORDER_NOTES == 1)
+	{
+		$extrafields = new ExtraFields($db);
+		$extrafields->addExtraField('order_notes', 'Order notes', 'varchar', 0, 255, 'facturedet', 0, 0, '', '', 0, '', 0, 1);
+	}
+
+	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
+
+	if (!$res > 0) $error++;
+
+ 	if (!$error)
+    {
+        $db->commit();
+	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        $db->rollback();
+	    setEventMessages($langs->trans("Error"), null, 'errors');
+    }
+}
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formproduct = new FormProduct($db);
+
+llxHeader('', $langs->trans("CashDeskSetup"));
+
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
+$head = takepos_prepare_head();
+dol_fiche_head($head, 'other', 'TakePOS', -1);
+print '<br>';
+
+
+// Mode
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="set">';
+
+
+print '<div class="div-table-responsive-no-min">';
+
+// Marketplace
+print "<table summary=\"list_of_modules\" class=\"noborder\" width=\"100%\">\n";
+print "<tr class=\"liste_titre\">\n";
+print '<td colspan="2">'.$langs->trans("WebSiteDesc").'</td>';
+print '<td>'.$langs->trans("URL").'</td>';
+print '</tr>';
+
+print "<tr class=\"oddeven\">\n";
+$url = 'https://www.dolistore.com/45-pos';
+print '<td class="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a></td>';
+print '<td>'.$langs->trans("DolistorePosCategory").'</td>';
+print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
+print '</tr>';
+
+print "</table>\n";
+
+print '</div>';
+
+print '<br>';
+
+
+
+
+print '<div class="div-table-responsive-no-min">';
+
+// Support
+print "<table summary=\"list_of_modules\" class=\"noborder\" width=\"100%\">\n";
+print "<tr class=\"liste_titre\">\n";
+print '<td colspan="2">TakePOS Support</td>';
+print '<td>'.$langs->trans("URL").'</td>';
+print '</tr>';
+
+print "<tr class=\"oddeven\">\n";
+$url = 'http://www.takepos.com';
+print '<td class="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="../img/takepos.png"></a></td>';
+print '<td>TakePOS original developers</td>';
+print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
+print '</tr>';
+
+print "</table>\n";
+
+print '</div>';
+print '<br>';
+
+llxFooter();
+$db->close();
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 086a929b723..5b6fe25af44 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -175,11 +175,8 @@ print '<tr class="oddeven"><td>';
 print $langs->trans("SortProductField");
 print '<td colspan="2">';
 $prod = new Product($db);
-$array = [];
-foreach ($prod->fields as $k => $v) {
-	$array[$k] = $k;
-}
-print $form->selectarray('TAKEPOS_SORTPRODUCTFIELD', $array, (empty($conf->global->TAKEPOS_SORTPRODUCTFIELD) ? 'rowid' : $conf->global->TAKEPOS_SORTPRODUCTFIELD), 0);
+$array = array('rowid' => 'ID', 'ref' => 'Ref', 'datec' => 'DateCreation', 'tms' => 'DateModification');
+print $form->selectarray('TAKEPOS_SORTPRODUCTFIELD', $array, (empty($conf->global->TAKEPOS_SORTPRODUCTFIELD) ? 'rowid' : $conf->global->TAKEPOS_SORTPRODUCTFIELD), 0, 0, 0, '', 1);
 print "</td></tr>\n";
 
 $substitutionarray = pdf_getSubstitutionArray($langs, null, null, 2);
@@ -343,42 +340,5 @@ print '<div class="center"><input type="submit" class="button" value="'.$langs->
 
 print "</form>\n";
 
-
-print '<br><br>';
-
-// Marketplace
-print "<table summary=\"list_of_modules\" class=\"noborder\" width=\"100%\">\n";
-print "<tr class=\"liste_titre\">\n";
-print '<td colspan="2">'.$langs->trans("WebSiteDesc").'</td>';
-print '<td>'.$langs->trans("URL").'</td>';
-print '</tr>';
-
-print "<tr class=\"oddeven\">\n";
-$url = 'https://www.dolistore.com/45-pos';
-    print '<td class="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a></td>';
-print '<td>'.$langs->trans("DolistorePosCategory").'</td>';
-print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
-print '</tr>';
-
-print "</table>\n";
-print '<br>';
-
-// Support
-print "<table summary=\"list_of_modules\" class=\"noborder\" width=\"100%\">\n";
-print "<tr class=\"liste_titre\">\n";
-print '<td colspan="2">TakePOS Support</td>';
-print '<td>'.$langs->trans("URL").'</td>';
-print '</tr>';
-
-print "<tr class=\"oddeven\">\n";
-$url = 'http://www.takepos.com';
-print '<td class="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="../img/takepos.png"></a></td>';
-print '<td>TakePOS original developers</td>';
-print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
-print '</tr>';
-
-print "</table>\n";
-print '<br>';
-
 llxFooter();
 $db->close();

From 6c4d782a816ab1ce679b15ebd88537250b8705f9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 12:48:22 +0100
Subject: [PATCH 44/69] Trans

---
 htdocs/langs/en_US/admin.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 2ed11212c49..9920b613daa 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -642,7 +642,7 @@ Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards
 Module50100Name=POS SimplePOS
 Module50100Desc=Point of Sale module SimplePOS (simple POS).
 Module50150Name=POS TakePOS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS).
+Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
 Module50200Name=Paypal
 Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50300Name=Stripe

From b995dc87fa116e5c19f234bc6ac9f5f755cce48f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 12:57:26 +0100
Subject: [PATCH 45/69] NEW Add profile for PSR12 for Eclipse

---
 dev/setup/eclipse/PSR-12 [built-in].xml | 215 ++++++++++++++++++++++++
 1 file changed, 215 insertions(+)
 create mode 100644 dev/setup/eclipse/PSR-12 [built-in].xml

diff --git a/dev/setup/eclipse/PSR-12 [built-in].xml b/dev/setup/eclipse/PSR-12 [built-in].xml
new file mode 100644
index 00000000000..47925209682
--- /dev/null
+++ b/dev/setup/eclipse/PSR-12 [built-in].xml	
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles>
+<profile name="PSR-12 [built-in]">
+<setting id="indentationChar" value="&#9;"/>
+<setting id="insert_space_after_opening_paren_in_declare" value="false"/>
+<setting id="insert_space_before_closing_paren_in_declare" value="false"/>
+<setting id="insert_space_before_opening_paren_in_declare" value="false"/>
+<setting id="org.eclipse.php.core.formatter.insert_new_line_in_function_invoke" value="3"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_allocation_expression_force_split" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_allocation_expression_indent_policy" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_allocation_expression_line_wrap_policy" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_method_invocation_force_split" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_method_invocation_indent_policy" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_arguments_in_method_invocation_line_wrap_policy" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_assignment_force_split" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_assignment_indent_policy" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_assignment_line_wrap_policy" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_binary_expression_force_split" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_binary_expression_indent_policy" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_binary_expression_line_wrap_policy" value="1"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_compact_if_force_split" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_compact_if_indent_policy" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_compact_if_line_wrap_policy" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_conditional_expression_force_split" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_conditional_expression_indent_policy" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_conditional_expression_line_wrap_policy" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_expressions_in_array_initializer_force_split" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_expressions_in_array_initializer_indent_policy" value="2"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_expressions_in_array_initializer_line_wrap_policy" value="1"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_parameters_in_method_declaration_force_split" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_parameters_in_method_declaration_indent_policy" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_parameters_in_method_declaration_line_wrap_policy" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_superclass_in_type_declaration_force_split" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_superclass_in_type_declaration_indent_policy" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_superclass_in_type_declaration_line_wrap_policy" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_superinterfaces_in_type_declaration_force_split" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_superinterfaces_in_type_declaration_indent_policy" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.alignment_for_superinterfaces_in_type_declaration_line_wrap_policy" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.blank_lines_before_field" value="1"/>
+<setting id="org.eclipse.php.formatter.core.formatter.blank_lines_before_member_type" value="1"/>
+<setting id="org.eclipse.php.formatter.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.php.formatter.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.php.formatter.core.formatter.brace_position_for_block" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.brace_position_for_lambda_function_declaration" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.brace_position_for_method_declaration" value="1"/>
+<setting id="org.eclipse.php.formatter.core.formatter.brace_position_for_switch" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.brace_position_for_type_declaration" value="1"/>
+<setting id="org.eclipse.php.formatter.core.formatter.comment.clear_blank_lines_in_block_comment" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.comment.format_block_comments" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.comment.format_html" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.comment.format_javadoc_comments" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.comment.format_line_comments" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.comment.indent_parameter_description" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.comment.insert_new_line_before_root_tags" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.comment.insert_new_line_for_parameter" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.comment.keep_empty_line_for_empty_description" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.comment.line_length" value="1000"/>
+<setting id="org.eclipse.php.formatter.core.formatter.comment.never_format_unknown_tags" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.continuation_indentation" value="1"/>
+<setting id="org.eclipse.php.formatter.core.formatter.continuation_indentation_for_array_initializer" value="1"/>
+<setting id="org.eclipse.php.formatter.core.formatter.disabling_tag" value="@formatter:off"/>
+<setting id="org.eclipse.php.formatter.core.formatter.enabling_tag" value="@formatter:on"/>
+<setting id="org.eclipse.php.formatter.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.indent_empty_lines" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.indent_heredocs" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.indentation.size" value="1"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_before_catch_in_try_statement" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_before_else_in_if_statement" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_before_finally_in_try_statement" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_before_while_in_do_statement" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_in_empty_block" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_in_empty_method_body" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_new_line_in_empty_type_declaration" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_arrow_in_array_creation" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_arrow_in_field_access" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_arrow_in_foreach" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_arrow_in_method_invocation" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_arrow_in_yield" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_assignment_operator" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_binary_operator" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_closing_brace_in_block" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_closing_paren_in_cast" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_colon_in_conditional" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_coloncolon_in_field_access" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_coloncolon_in_method_invocation" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_array_creation" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_echo" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_for_inits" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_global" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_list" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_multiple_constant_declarations" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_static" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_comma_in_superinterfaces" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_array_creation" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_cast" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_catch" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_for" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_foreach" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_if" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_list" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_switch" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_opening_paren_in_while" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_postfix_operator" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_prefix_operator" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_question_in_conditional" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_reference_symbol_in_referenced_expression" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_semicolon_in_for" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_after_unary_operator" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_arrow_in_array_creation" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_arrow_in_field_access" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_arrow_in_foreach" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_arrow_in_method_invocation" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_arrow_in_yield" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_assignment_operator" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_binary_operator" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_array_creation" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_cast" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_catch" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_for" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_foreach" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_if" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_list" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_switch" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_closing_paren_in_while" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_colon_in_case" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_colon_in_conditional" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_colon_in_default" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_coloncolon_in_field_access" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_coloncolon_in_method_invocation" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_array_creation" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_echo" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_for_inits" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_global" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_list" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_multiple_constant_declarations" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_static" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_comma_in_superinterfaces" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_brace_in_block" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_brace_in_switch" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_array_creation" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_catch" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_for" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_foreach" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_if" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_list" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_switch" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_opening_paren_in_while" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_postfix_operator" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_prefix_operator" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_question_in_conditional" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_semicolon" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_semicolon_in_for" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_before_unary_operator" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_between_brackets_in_array_type_reference" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.join_lines_in_comments" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.keep_elseif_statement_on_same_line" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.keep_imple_if_on_one_line" value="true"/>
+<setting id="org.eclipse.php.formatter.core.formatter.keep_then_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.keep_trailing_comma_in_list" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.lineSplit" value="200"/>
+<setting id="org.eclipse.php.formatter.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_after_namespace" value="1"/>
+<setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_after_use_statements" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_at_end_of_class_body" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_at_end_of_method_body" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_before_namespace" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_before_use_statements" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_between_namespaces" value="1"/>
+<setting id="org.eclipse.php.formatter.core.formatter.number_of_blank_lines_between_use_statements" value="0"/>
+<setting id="org.eclipse.php.formatter.core.formatter.number_of_empty_lines_to_preserve" value="3"/>
+<setting id="org.eclipse.php.formatter.core.formatter.put_empty_statement_on_new_line" value="false"/>
+<setting id="org.eclipse.php.formatter.core.formatter.tabulation.size" value="4"/>
+<setting id="org.eclipse.php.formatter.core.formatter.use_on_off_tags" value="false"/>
+</profile>
+</profiles>

From 0fbde14b33e57db9f5a6fb6a226c7224159a77f9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 12:58:15 +0100
Subject: [PATCH 46/69] Clean syntax of code

---
 htdocs/takepos/admin/other.php | 87 ++++++++++++++++------------------
 1 file changed, 40 insertions(+), 47 deletions(-)

diff --git a/htdocs/takepos/admin/other.php b/htdocs/takepos/admin/other.php
index ddaaf7dac51..383a710a47a 100644
--- a/htdocs/takepos/admin/other.php
+++ b/htdocs/takepos/admin/other.php
@@ -21,17 +21,15 @@
  *	\ingroup    takepos
  *	\brief      Setup page for TakePos module
  */
-
 require '../../main.inc.php'; // Load $user and permissions
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-require_once DOL_DOCUMENT_ROOT."/core/lib/takepos.lib.php";
+require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/pdf.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT . "/core/lib/takepos.lib.php";
 
 // If socid provided by ajax company selector
-if (!empty($_REQUEST['CASHDESK_ID_THIRDPARTY_id']))
-{
+if (!empty($_REQUEST['CASHDESK_ID_THIRDPARTY_id'])) {
 	$_GET['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha');
 	$_POST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha');
 	$_REQUEST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha');
@@ -44,8 +42,8 @@ $langs->loadLangs(array("admin", "cashdesk"));
 
 global $db;
 
-$sql = "SELECT code, libelle FROM ".MAIN_DB_PREFIX."c_paiement";
-$sql .= " WHERE entity IN (".getEntity('c_paiement').")";
+$sql = "SELECT code, libelle FROM " . MAIN_DB_PREFIX . "c_paiement";
+$sql .= " WHERE entity IN (" . getEntity('c_paiement') . ")";
 $sql .= " AND active = 1";
 $sql .= " ORDER BY libelle";
 $resql = $db->query($sql);
@@ -56,11 +54,12 @@ if ($resql) {
 	}
 }
 
+
 /*
  * Actions
  */
-if (GETPOST('action', 'alpha') == 'set')
-{
+
+if (GETPOST('action', 'alpha') == 'set') {
 	$db->begin();
 	if (GETPOST('socid', 'int') < 0) $_POST["socid"] = '';
 
@@ -80,52 +79,46 @@ if (GETPOST('action', 'alpha') == 'set')
 	$res = dolibarr_set_const($db, "TAKEPOS_DIRECT_PAYMENT", GETPOST('TAKEPOS_DIRECT_PAYMENT', 'int'), 'int', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_CUSTOM_RECEIPT", GETPOST('TAKEPOS_CUSTOM_RECEIPT', 'int'), 'int', 0, '', $conf->entity);
 	//$res = dolibarr_set_const($db, "TAKEPOS_HEAD_BAR", GETPOST('TAKEPOS_HEAD_BAR', 'int'), 'int', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "TAKEPOS_EMAIL_TEMPLATE_INVOICE", GETPOST('TAKEPOS_EMAIL_TEMPLATE_INVOICE', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_EMAIL_TEMPLATE_INVOICE", GETPOST('TAKEPOS_EMAIL_TEMPLATE_INVOICE', 'alpha'), 'chaine', 0, '', $conf->entity);
 	if (!empty($conf->global->TAKEPOS_ENABLE_SUMUP)) {
 		$res = dolibarr_set_const($db, "TAKEPOS_SUMUP_AFFILIATE", GETPOST('TAKEPOS_SUMUP_AFFILIATE', 'alpha'), 'chaine', 0, '', $conf->entity);
 		$res = dolibarr_set_const($db, "TAKEPOS_SUMUP_APPID", GETPOST('TAKEPOS_SUMUP_APPID', 'alpha'), 'chaine', 0, '', $conf->entity);
 	}
-	if ($conf->global->TAKEPOS_ORDER_NOTES == 1)
-	{
+	if ($conf->global->TAKEPOS_ORDER_NOTES == 1) {
 		$extrafields = new ExtraFields($db);
 		$extrafields->addExtraField('order_notes', 'Order notes', 'varchar', 0, 255, 'facturedet', 0, 0, '', '', 0, '', 0, 1);
 	}
 
-	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
+	dol_syslog("admin/cashdesk: level " . GETPOST('level', 'alpha'));
 
 	if (!$res > 0) $error++;
 
- 	if (!$error)
-    {
-        $db->commit();
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        $db->rollback();
-	    setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error) {
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		$db->rollback();
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
+
 /*
  * View
  */
 
-$form = new Form($db);
-$formproduct = new FormProduct($db);
-
 llxHeader('', $langs->trans("CashDeskSetup"));
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
+$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
+print load_fiche_titre($langs->trans("CashDeskSetup") . ' (TakePOS)', $linkback, 'title_setup');
 $head = takepos_prepare_head();
 dol_fiche_head($head, 'other', 'TakePOS', -1);
 print '<br>';
 
 
 // Mode
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
+print '<input type="hidden" name="token" value="' . newToken() . '">';
 print '<input type="hidden" name="action" value="set">';
 
 
@@ -133,16 +126,17 @@ print '<div class="div-table-responsive-no-min">';
 
 // Marketplace
 print "<table summary=\"list_of_modules\" class=\"noborder\" width=\"100%\">\n";
-print "<tr class=\"liste_titre\">\n";
-print '<td colspan="2">'.$langs->trans("WebSiteDesc").'</td>';
-print '<td>'.$langs->trans("URL").'</td>';
+print '<tr class="liste_titre">' . "\n";
+print '<td class="titlefield" colspan="2">' . $langs->trans("WebSiteDesc") . '</td>';
+print '<td>' . $langs->trans("URL") . '</td>';
 print '</tr>';
 
-print "<tr class=\"oddeven\">\n";
 $url = 'https://www.dolistore.com/45-pos';
-print '<td class="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a></td>';
-print '<td>'.$langs->trans("DolistorePosCategory").'</td>';
-print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
+
+print '<tr class="oddeven">' . "\n";
+print '<td class="titlefield"><a href="' . $url . '" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="' . DOL_URL_ROOT . '/theme/dolistore_logo.png"></a></td>';
+print '<td>' . $langs->trans("DolistorePosCategory") . '</td>';
+print '<td><a href="' . $url . '" target="_blank" rel="external">' . $url . '</a></td>';
 print '</tr>';
 
 print "</table>\n";
@@ -152,22 +146,21 @@ print '</div>';
 print '<br>';
 
 
-
-
 print '<div class="div-table-responsive-no-min">';
 
 // Support
 print "<table summary=\"list_of_modules\" class=\"noborder\" width=\"100%\">\n";
-print "<tr class=\"liste_titre\">\n";
+print '<tr class="liste_titre">' . "\n";
 print '<td colspan="2">TakePOS Support</td>';
-print '<td>'.$langs->trans("URL").'</td>';
+print '<td>' . $langs->trans("URL") . '</td>';
 print '</tr>';
 
-print "<tr class=\"oddeven\">\n";
 $url = 'http://www.takepos.com';
-print '<td class="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="../img/takepos.png"></a></td>';
+
+print '<tr class="oddeven">' . "\n";
+print '<td class="left"><a href="' . $url . '" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="../img/takepos.png"></a></td>';
 print '<td>TakePOS original developers</td>';
-print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
+print '<td><a href="' . $url . '" target="_blank" rel="external">' . $url . '</a></td>';
 print '</tr>';
 
 print "</table>\n";

From 376e19f6211455f9c1e25d052b5feefea9654504 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 25 Feb 2020 13:05:23 +0100
Subject: [PATCH 47/69] Update HOWTO-Translation.txt

---
 htdocs/langs/HOWTO-Translation.txt | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/langs/HOWTO-Translation.txt b/htdocs/langs/HOWTO-Translation.txt
index 2d7c910d98a..0a05133fdb8 100644
--- a/htdocs/langs/HOWTO-Translation.txt
+++ b/htdocs/langs/HOWTO-Translation.txt
@@ -1,8 +1,9 @@
 --- Translation How to --- 
 
-Document explaining how to translate Dolibarr in a new language is
-available on wiki:
+An instruction guide for translating Dolibarr in a new language is
+available on Dolibarr wiki:
 
-English: http://wiki.dolibarr.org/index.php/Translator_documentation
-French:  http://wiki.dolibarr.org/index.php/Documentation_traducteur
-Spanish: http://wiki.dolibarr.org/index.php/Documentaci%C3%B3n_traductores
+English: https://wiki.dolibarr.org/index.php/Translator_documentation
+French:  https://wiki.dolibarr.org/index.php/Documentation_traducteur
+Spanish: https://wiki.dolibarr.org/index.php/Documentaci%C3%B3n_traductores
+German:  https://wiki.dolibarr.org/index.php/Dokumentation_Uebersetzung 

From dbe770a24fbbc17e69c8d11adc77255fe45273f8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 13:07:39 +0100
Subject: [PATCH 48/69] Trans

---
 htdocs/langs/en_US/admin.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 9920b613daa..4ba8ac211c9 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -328,7 +328,7 @@ SetupIsReadyForUse=Module deployment is finished. You must however enable and se
 NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
 InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=Alternatively, you may upload the module .zip file package:
+YouCanSubmitFile=You can upload the .zip file of module package from here:
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Browse to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version

From e4e8173b7a3b3900890a42e68a9fe0e2c293ec79 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 25 Feb 2020 13:15:15 +0100
Subject: [PATCH 49/69] Update README

---
 htdocs/install/doctemplates/README | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/doctemplates/README b/htdocs/install/doctemplates/README
index 9ac615ea7c4..b1978fb3de7 100644
--- a/htdocs/install/doctemplates/README
+++ b/htdocs/install/doctemplates/README
@@ -1,8 +1,8 @@
 README (English)
 --------------------------------
-This directory contains samples of odttemplates used by install
+This directory contains samples of odt-templates used by install
 process.
 
 WARNING:
-Do not edit files in those directories, but in installed data
-directory instead.
\ No newline at end of file
+Do not edit/change files in these directories, 
+only in installed data directory instead (e.g. //dolibarr/documents/doctemplates/).

From 61abfb95a59a8ec1e251158fc1fe3df6b7401642 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 13:28:11 +0100
Subject: [PATCH 50/69] Look and feel v12

---
 htdocs/core/lib/project.lib.php       |  3 +-
 htdocs/projet/class/project.class.php | 10 ++--
 htdocs/projet/index.php               | 15 ++++--
 htdocs/theme/eldy/global.inc.php      | 71 +++++++++++++--------------
 4 files changed, 54 insertions(+), 45 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 3d9cd447802..9eab5cd6a70 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -2175,7 +2175,8 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 			if ($userAccess >= 0)
 			{
 				$projectstatic->ref = $objp->ref;
-				$projectstatic->statut = $objp->status;
+				$projectstatic->statut = $objp->status;		// deprecated
+				$projectstatic->status = $objp->status;
 				$projectstatic->title = $objp->title;
 				$projectstatic->datee = $db->jdate($objp->datee);
 				$projectstatic->dateo = $db->jdate($objp->dateo);
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 74c82423966..54075318246 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -493,7 +493,7 @@ class Project extends CommonObject
         if (empty($id) && empty($ref)) return -1;
 
         $sql = "SELECT rowid, ref, title, description, public, datec, opp_amount, budget_amount,";
-        $sql .= " tms, dateo, datee, date_close, fk_soc, fk_user_creat, fk_user_modif, fk_user_close, fk_statut, fk_opp_status, opp_percent,";
+        $sql .= " tms, dateo, datee, date_close, fk_soc, fk_user_creat, fk_user_modif, fk_user_close, fk_statut as status, fk_opp_status, opp_percent,";
         $sql .= " note_private, note_public, model_pdf, usage_opportunity, usage_task, usage_bill_time, usage_organize_event, entity";
         $sql .= " FROM ".MAIN_DB_PREFIX."projet";
         if (!empty($id))
@@ -534,7 +534,8 @@ class Project extends CommonObject
                 $this->user_modification_id = $obj->fk_user_modif;
                 $this->user_close_id = $obj->fk_user_close;
                 $this->public = $obj->public;
-                $this->statut = $obj->fk_statut;
+                $this->statut = $obj->status;	// deprecated
+                $this->status = $obj->status;
                 $this->opp_status = $obj->fk_opp_status;
                 $this->opp_amount	= $obj->opp_amount;
                 $this->opp_percent = $obj->opp_percent;
@@ -994,7 +995,7 @@ class Project extends CommonObject
      */
     public function getLibStatut($mode = 0)
     {
-        return $this->LibStatut($this->statut, $mode);
+    	return $this->LibStatut(isset($this->statut)?$this->statut:$this->status, $mode);
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1055,6 +1056,9 @@ class Project extends CommonObject
         if (!empty($this->datee))
             $label .= ($label ? '<br>' : '').'<b>'.$langs->trans('DateEnd').': </b>'.dol_print_date($this->datee, 'day'); // The space must be after the : to not being explode when showing the title in img_picto
         if ($moreinpopup) $label .= '<br>'.$moreinpopup;
+        if (isset($this->status)) {
+        	$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+        }
 
         $url = '';
         if ($option != 'nolink')
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 0613fd75e8f..143a932ff28 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -172,8 +172,8 @@ print_projecttasks_array($db, $form, $socid, $projectsListId, 0, 0, $listofoppst
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Latest modified projects
-$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut, p.tms as datem,";
-$sql .= " s.rowid as socid, s.nom as name, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.canvas";
+$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut as status, p.tms as datem,";
+$sql .= " s.rowid as socid, s.nom as name, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.canvas, s.status as thirdpartystatus";
 $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
 $sql .= " WHERE p.entity IN (".getEntity('project').")";
@@ -208,6 +208,7 @@ if ($resql)
 			$projectstatic->dateo = $obj->dateo;
 			$projectstatic->datep = $obj->datep;
 			$projectstatic->thirdparty_name = $obj->name;
+			$projectstatic->status = $obj->status;
 
 			$companystatic->id = $obj->socid;
 			$companystatic->name = $obj->name;
@@ -217,6 +218,7 @@ if ($resql)
 			$companystatic->code_client = $obj->code_client;
 			$companystatic->code_fournisseur = $obj->code_fournisseur;
 			$companystatic->canvas = $obj->canvas;
+			$companystatic->status = $obj->thirdpartystatus;
 
 			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
 			print '<td width="96" class="nobordernopadding nowrap">';
@@ -243,7 +245,7 @@ if ($resql)
 			}
 			print '</td>';
 			print '<td>'.dol_print_date($db->jdate($obj->datem), 'day').'</td>';
-			print '<td class="right">'.$projectstatic->LibStatut($obj->fk_statut, 3).'</td>';
+			print '<td class="right">'.$projectstatic->LibStatut($obj->status, 3).'</td>';
 			print '</tr>';
 			$i++;
 		}
@@ -265,14 +267,14 @@ print_liste_field_titre("NbOfProjects", "", "", "", "", '', $sortfield, $sortord
 print "</tr>\n";
 
 $sql = "SELECT COUNT(p.rowid) as nb, SUM(p.opp_amount)";
-$sql .= ", s.nom as name, s.rowid as socid";
+$sql .= ", s.rowid as socid, s.nom as name, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.canvas, s.status";
 $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
 $sql .= " WHERE p.entity IN (".getEntity('project').")";
 $sql .= " AND p.fk_statut = 1";
 if ($mine || empty($user->rights->projet->all->lire)) $sql .= " AND p.rowid IN (".$projectsListId.")"; // If we have this test true, it also means projectset is not 2
 if ($socid)	$sql .= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-$sql .= " GROUP BY s.nom, s.rowid";
+$sql .= " GROUP BY s.rowid, s.nom, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.canvas, s.status";
 $sql .= $db->order($sortfield, $sortorder);
 //$sql .= $db->plimit($max + 1, 0);
 
@@ -299,6 +301,9 @@ if ($resql)
 		{
 			$companystatic->id = $obj->socid;
 			$companystatic->name = $obj->name;
+			$companystatic->email = $obj->email;
+			$companystatic->status = $obj->status;
+
 			print $companystatic->getNomUrl(1);
 		}
 		else
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index bd35d29f3b2..13011cbb5f7 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -6,41 +6,40 @@
 /* ============================================================================== */
 
 :root {
-            --colorbackhmenu1: rgb(<?php print $colorbackhmenu1; ?>);
-            --colorbackvmenu1: rgb(<?php print $colorbackvmenu1; ?>);
-            --colorbacktitle1: rgb(<?php print $colorbacktitle1; ?>);
-            --colorbacktabcard1: rgb(<?php print $colorbacktabcard1; ?>);
-            --colorbacktabactive: rgb(<?php print $colorbacktabactive; ?>);
-            --colorbacklineimpair1: rgb(<?php print $colorbacklineimpair1; ?>);
-            --colorbacklineimpair2: rgb(<?php print $colorbacklineimpair2; ?>);
-            --colorbacklinepair1: rgb(<?php print $colorbacklinepair1; ?>);
-            --colorbacklinepair2: rgb(<?php print $colorbacklinepair2; ?>);
-            --colorbacklinepairhover: rgb(<?php print $colorbacklinepairhover; ?>);
-            --colorbacklinepairchecked: rgb(<?php print $colorbacklinepairchecked; ?>);
-            --colorbackbody: rgb(<?php print $colorbackbody; ?>);
-            --colortexttitlenotab: rgb(<?php print $colortexttitlenotab; ?>);
-            --colortexttitle: rgb(<?php print $colortexttitle; ?>);
-            --colortext: rgb(<?php print $colortext; ?>);
-            --colortextlink: rgb(<?php print $colortextlink; ?>);
-            --colortextbackhmenu: #<?php echo $colortextbackhmenu; ?>;
-            --colortextbackvmenu: #<?php print $colortextbackvmenu; ?>) ;
-            --listetotal: #551188;
-            --inputbackgroundcolor: #FFF;
-            --inputbordercolor: rgba(0,0,0,.2);
-            --tooltipbgcolor: <?php print $toolTipBgColor; ?>;
-			--tooltipfontcolor : <?php print $toolTipFontColor; ?>;
-			--oddevencolor: #202020;
-			--colorboxstatsborder: #ddd;
-			--dolgraphbg: rgba(255,255,255,0);
-			--fieldrequiredcolor: #000055;
-			--colortextbacktab: #<?php print $colortextbacktab; ?>) ;
-			--colorboxiconbg: #eee;
-			--refidnocolor:#444;
-			--tableforfieldcolor:#666;
-			--amountremaintopaycolor:#880000;
-			--amountpaymentcomplete:#008800;
-			--amountremaintopaybackcolor:none;
-
+	--colorbackhmenu1: rgb(<?php print $colorbackhmenu1; ?>);
+	--colorbackvmenu1: rgb(<?php print $colorbackvmenu1; ?>);
+	--colorbacktitle1: rgb(<?php print $colorbacktitle1; ?>);
+	--colorbacktabcard1: rgb(<?php print $colorbacktabcard1; ?>);
+	--colorbacktabactive: rgb(<?php print $colorbacktabactive; ?>);
+	--colorbacklineimpair1: rgb(<?php print $colorbacklineimpair1; ?>);
+	--colorbacklineimpair2: rgb(<?php print $colorbacklineimpair2; ?>);
+	--colorbacklinepair1: rgb(<?php print $colorbacklinepair1; ?>);
+	--colorbacklinepair2: rgb(<?php print $colorbacklinepair2; ?>);
+	--colorbacklinepairhover: rgb(<?php print $colorbacklinepairhover; ?>);
+	--colorbacklinepairchecked: rgb(<?php print $colorbacklinepairchecked; ?>);
+	--colorbackbody: rgb(<?php print $colorbackbody; ?>);
+	--colortexttitlenotab: rgb(<?php print $colortexttitlenotab; ?>);
+	--colortexttitle: rgb(<?php print $colortexttitle; ?>);
+	--colortext: rgb(<?php print $colortext; ?>);
+	--colortextlink: rgb(<?php print $colortextlink; ?>);
+	--colortextbackhmenu: #<?php echo $colortextbackhmenu; ?>;
+	--colortextbackvmenu: #<?php print $colortextbackvmenu; ?>) ;
+	--listetotal: #551188;
+	--inputbackgroundcolor: #FFF;
+	--inputbordercolor: rgba(0,0,0,.2);
+	--tooltipbgcolor: <?php print $toolTipBgColor; ?>;
+	--tooltipfontcolor : <?php print $toolTipFontColor; ?>;
+	--oddevencolor: #202020;
+	--colorboxstatsborder: #ddd;
+	--dolgraphbg: rgba(255,255,255,0);
+	--fieldrequiredcolor: #000055;
+	--colortextbacktab: #<?php print $colortextbacktab; ?>) ;
+	--colorboxiconbg: #eee;
+	--refidnocolor:#444;
+	--tableforfieldcolor:#666;
+	--amountremaintopaycolor:#880000;
+	--amountpaymentcomplete:#008800;
+	--amountremaintopaybackcolor:none;
 }
 
 <?php
@@ -124,7 +123,7 @@ select.vmenusearchselectcombo {
 	background-color: unset;
 }
 
-th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), td.wrapcolumntitle.liste_titre:not(.maxwidthsearch) {
+table.liste th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), table.liste td.wrapcolumntitle.liste_titre:not(.maxwidthsearch) {
     overflow: hidden;
     white-space: nowrap;
     max-width: 120px;

From e60a6ee13da17bcf2b4d52eceb3ebf16933e7471 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 25 Feb 2020 13:29:24 +0100
Subject: [PATCH 51/69] add composer entry

add entry of sub-directories:
* composer
To test an upgrade of a lib.
---
 build/README | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/build/README b/build/README
index 07f0ebe3b55..67ceb05c8d2 100644
--- a/build/README
+++ b/build/README
@@ -45,9 +45,12 @@ Dolibarr working. It is here only to build Dolibarr packages, and those
 generated packages will not contains this "build" directory.
 
 
-We can find in "build", following sub-directories:
+You can find in "build", following sub-directories:
 
-* debian:
+* composer
+To test an upgrade of a lib.
+
+* debian
 To build Debian package.
 
 * dmg:

From 2543f3f21bffd6914c9eaceca21025c17ecf3b2c Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 25 Feb 2020 13:37:39 +0100
Subject: [PATCH 52/69] Update README

---
 build/obs/README | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/build/obs/README b/build/obs/README
index c8a29e1dac4..44427c01d49 100644
--- a/build/obs/README
+++ b/build/obs/README
@@ -1,20 +1,24 @@
 README (English)
 ##################################################
 OBS Package tools
+OBE - openSUSE Build Service 
 ##################################################
 
-This directory contains files to explain how to publish
-a package onto OBS
+This directory contains an instruction to explain 
+how to publish a package onto OBS.
 
 
-# Create a project onto OBS
-#----------------------------------
-https://build.opensuse.org
+# Create a project onto OBS 
+--------------------------- 
+https://build.opensuse.org 
 
-Packaging rules: http://en.opensuse.org/Portal:Packaging
+
+# Packaging rules: 
+------------------
+https://en.opensuse.org/Portal:Packaging
 
 Add attributes:
-OBS:Screenshots         URL of screenshot http://www.dolibarr.org/images/dolibarr_screenshot1.png
+OBS:Screenshots         URL of screenshot https://www.dolibarr.org/images/dolibarr_screenshot1.png
 OBS:QualityCategory     Development|Testing|Stable|Private
 OBS:Maintained          1
 
@@ -28,22 +32,24 @@ To submit a snapshot for building, we should have a service file with content
   </service>
 </services>
 
-How to have such a service file created automatically ?
 
-Go into project you want to update. It mught be:
+# How to have such a service file created automatically ?
+---------------------------------------------------------
+Go into project you want to update. It might be:
 - openSUSE Build Service > Projects > Application:ERP:Dolibarr > dolibarr
 - or your private project
 
 Once logged, click on "Add file" in section "Source Files", then select mode "Upload From: Remote URL"
 Keep empty for "Filename", choose "Remote URL" and enter into last field, URL that should looks like this:
-http://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-x.y.v-0.4.src.rpm
+https://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-x.y.v-0.4.src.rpm
 
 Then add into Advanded - Attributes
-OBS:Screenshots http://www.dolibarr.org/images/dolibarr_screenshot1.png
-OBS:QualityCategory Stable|Testing|Development|Private
+OBS:Screenshots       https://www.dolibarr.org/images/dolibarr_screenshot1.png
+OBS:QualityCategory   Stable|Testing|Development|Private
 
 
 # Move project into official directory
+--------------------------------------
 - Enter a bug to ask to be a maintener of a category or to add a new one.
 For example: https://bugzilla.novell.com/show_bug.cgi?id=848083 to be a maintener of category
 https://build.opensuse.org/project/show/Application:ERP

From 2c6e7f2917b8fbc582a6b99e461f65e2f12dfddf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 13:40:19 +0100
Subject: [PATCH 53/69] Tooltip for example on IP restrictions

---
 htdocs/admin/dav.php          | 10 ++++++++--
 htdocs/api/admin/index.php    |  4 +++-
 htdocs/langs/en_US/admin.lang |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index eb62c224e5c..bb7e82901f5 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -87,7 +87,10 @@ if ($action == 'edit')
 		print '<tr class="oddeven"><td>';
 		$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
 		$label = $langs->trans($key);
-		if ($key == 'DAV_RESTICT_ON_IP') $label = $langs->trans("RESTRICT_ON_IP");
+		if ($key == 'DAV_RESTICT_ON_IP') {
+			$label = $langs->trans("RESTRICT_ON_IP");
+			$label .= ' '.$langs->trans("Example").': '.$langs->trans("IPListExample");
+		}
 		print $form->textwithpicto($label, $tooltiphelp);
 		print '</td><td>';
 		if ($key == 'DAV_ALLOW_PRIVATE_DIR')
@@ -124,7 +127,10 @@ else
 		print '<tr class="oddeven"><td>';
 		$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
 		$label = $langs->trans($key);
-		if ($key == 'DAV_RESTICT_ON_IP') $label = $langs->trans("RESTRICT_ON_IP");
+		if ($key == 'DAV_RESTICT_ON_IP') {
+			$label = $langs->trans("RESTRICT_ON_IP");
+			$label .= ' '.$langs->trans("Example").': '.$langs->trans("IPListExample");
+		}
 		print $form->textwithpicto($label, $tooltiphelp);
 		print '</td><td>';
 		if ($key == 'DAV_ALLOW_PRIVATE_DIR')
diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index 45cf082763e..73041f6c386 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -130,7 +130,9 @@ print '<td>&nbsp;</td>';
 print '</tr>';
 
 print '<tr class="oddeven">';
-print '<td>'.$langs->trans("RESTRICT_API_ON_IP").'</td>';
+print '<td>'.$langs->trans("RESTRICT_ON_IP");
+print ' '.$langs->trans("Example").': '.$langs->trans("IPListExample");
+print '</td>';
 print '<td><input type="text" name="API_RESTRICT_ON_IP" value="'.dol_escape_htmltag($conf->global->API_RESTRICT_ON_IP).'"></td>';
 print '<td>';
 print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></td>';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 4ba8ac211c9..96be43b305c 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1971,8 +1971,8 @@ DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
-RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
 RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Based on the library SabreDAV version
 NotAPublicIp=Not a public IP
 MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.

From fb385827a9702c8363d8fe3e35e4c00218b453ed Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 25 Feb 2020 14:04:54 +0100
Subject: [PATCH 54/69] Update README

---
 test/README | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/README b/test/README
index 3e13bbbec70..2c53e31daee 100644
--- a/test/README
+++ b/test/README
@@ -3,6 +3,10 @@ README (English)
 This directory contains unit tests and docs for Dolibarr quality analysis.
 
 
+- PHPUnit          -  https://phpunit.de
+- PHP_CodeSniffer  -  https://pear.php.net/package/PHP_CodeSniffer/ 
+- PHP Depend       -  https://pdepend.org/ 
+
 
 PHPUNIT
 -------

From ec981632ca652c42e4155163f832502237933c20 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 25 Feb 2020 14:11:58 +0100
Subject: [PATCH 55/69] Create README

---
 test/selenium/README | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 test/selenium/README

diff --git a/test/selenium/README b/test/selenium/README
new file mode 100644
index 00000000000..1d0b7ad44d1
--- /dev/null
+++ b/test/selenium/README
@@ -0,0 +1,11 @@
+README (English)
+--------------------------------
+
+This directory contains test files for Selenium.
+
+Selenium is a tool for automatic testing of web applications.
+
+https://www.selenium.dev/
+
+
+

From 7ec32278b4a30c5d566e47d105af7c1b7e660a1d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 14:16:40 +0100
Subject: [PATCH 56/69] FIX API to push an expense report

---
 .../class/api_expensereports.class.php        | 33 +++++++++++-
 .../class/expensereport.class.php             | 51 +++++++++++++------
 2 files changed, 67 insertions(+), 17 deletions(-)

diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 60e5eafcb48..7fdd731aa88 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -33,7 +33,7 @@ class ExpenseReports extends DolibarrApi
      * @var array   $FIELDS     Mandatory fields, checked when create and update object
      */
     static $FIELDS = array(
-        'socid'
+        'fk_user_author'
     );
 
     /**
@@ -501,6 +501,11 @@ class ExpenseReports extends DolibarrApi
         // phpcs:enable
         $object = parent::_cleanObjectDatas($object);
 
+        unset($object->fk_statut);
+        unset($object->statut);
+        unset($object->user);
+        unset($object->thirdparty);
+
         unset($object->cond_reglement);
         unset($object->shipping_method_id);
 
@@ -509,6 +514,32 @@ class ExpenseReports extends DolibarrApi
         unset($object->barcode_type_label);
         unset($object->barcode_type_coder);
 
+        unset($object->code_paiement);
+        unset($object->code_statut);
+        unset($object->fk_c_paiement);
+        unset($object->fk_incoterms);
+        unset($object->label_incoterms);
+        unset($object->location_incoterms);
+        unset($object->mode_reglement_id);
+        unset($object->cond_reglement_id);
+
+        unset($object->name);
+        unset($object->lastname);
+        unset($object->firstname);
+        unset($object->civility_id);
+        unset($object->cond_reglement_id);
+        unset($object->contact);
+        unset($object->contact_id);
+
+        unset($object->state);
+        unset($object->state_id);
+        unset($object->state_code);
+        unset($object->country);
+        unset($object->country_id);
+        unset($object->country_code);
+
+        unset($object->note);	// We already use note_public and note_pricate
+
         return $object;
     }
 
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 14ab2b88f22..c98d8af18d2 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -58,19 +58,20 @@ class ExpenseReport extends CommonObject
 
     public $date_fin;
 
+    /**
+     * 0=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=payed, 99=denied
+     *
+     * @var int		Status
+     */
     public $status;
-    public $fk_statut; // -- 0=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=payed, 99=denied
+    public $fk_statut;
+
     public $fk_c_paiement;
     public $paid;
 
     public $user_author_infos;
     public $user_validator_infos;
 
-    public $fk_typepayment;
-	public $num_payment;
-    public $code_paiement;
-    public $code_statut;
-
     // ACTIONS
 
     // Create
@@ -285,10 +286,33 @@ class ExpenseReport extends CommonObject
             {
                 if (is_array($this->lines) && count($this->lines) > 0)
                 {
-    	            foreach ($this->lines as $i => $val)
+    	            foreach ($this->lines as $line)
     	            {
+    	            	// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
+    	            	//if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
+    	            	if (!is_object($line)) {
+    	            		$line = (object) $line;
+    	            		$newndfline = new ExpenseReportLine($this->db);
+    	            		$newndfline->fk_expensereport = $line->fk_expensereport;
+    	            		$newndfline->fk_c_type_fees = $line->fk_c_type_fees;
+    	            		$newndfline->fk_project = $line->fk_project;
+    	            		$newndfline->vatrate = $line->vatrate;
+    	            		$newndfline->vat_src_code = $line->vat_src_code;
+    	            		$newndfline->comments = $line->comments;
+    	            		$newndfline->qty = $line->qty;
+    	            		$newndfline->value_unit = $line->value_unit;
+    	            		$newndfline->total_ht = $line->total_ht;
+    	            		$newndfline->total_ttc = $line->total_ttc;
+    	            		$newndfline->total_tva = $line->total_tva;
+    	            		$newndfline->date = $line->date;
+    	            		$newndfline->rule_warning_message = $line->rule_warning_message;
+    	            		$newndfline->fk_c_exp_tax_cat = $line->fk_c_exp_tax_cat;
+    	            		$newndfline->fk_ecm_files = $line->fk_ecm_files;
+    	            	}
+    	            	else {
+    	            		$newndfline = $line;
+    	            	}
     	                //$newndfline=new ExpenseReportLine($this->db);
-    	                $newndfline = $this->lines[$i];
     	                $newndfline->fk_expensereport = $this->id;
     	                $result = $newndfline->insert();
         	            if ($result < 0)
@@ -514,10 +538,8 @@ class ExpenseReport extends CommonObject
         $sql .= " d.date_debut, d.date_fin, d.date_create, d.tms as date_modif, d.date_valid, d.date_approve,"; // DATES (datetime)
         $sql .= " d.fk_user_author, d.fk_user_modif, d.fk_user_validator,";
         $sql .= " d.fk_user_valid, d.fk_user_approve,";
-        $sql .= " d.fk_statut as status, d.fk_c_paiement, d.paid,";
-        $sql .= " dp.libelle as label_payment, dp.code as code_paiement"; // INNER JOIN paiement
+        $sql .= " d.fk_statut as status, d.fk_c_paiement, d.paid";
         $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as d";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as dp ON d.fk_c_paiement = dp.id";
         if ($ref) $sql .= " WHERE d.ref = '".$this->db->escape($ref)."'";
         else $sql .= " WHERE d.rowid = ".$id;
         //$sql.= $restrict;
@@ -566,7 +588,7 @@ class ExpenseReport extends CommonObject
                 elseif ($this->fk_user_validator > 0) $user_approver->fetch($this->fk_user_validator); // For backward compatibility
                 $this->user_validator_infos = dolGetFirstLastname($user_approver->firstname, $user_approver->lastname);
 
-                $this->fk_statut                = $obj->status;
+                $this->fk_statut                = $obj->status;		// deprecated
                 $this->status                   = $obj->status;
                 $this->fk_c_paiement            = $obj->fk_c_paiement;
                 $this->paid                     = $obj->paid;
@@ -578,9 +600,6 @@ class ExpenseReport extends CommonObject
                     $this->user_valid_infos = dolGetFirstLastname($user_valid->firstname, $user_valid->lastname);
                 }
 
-                $this->code_statut      = $obj->code_statut;
-                $this->code_paiement    = $obj->code_paiement;
-
                 $this->lines = array();
 
                 $result = $this->fetch_lines();
@@ -2650,7 +2669,7 @@ class ExpenseReportLine
         $sql .= " ".$this->db->escape($this->total_ht).",";
         $sql .= " ".$this->db->escape($this->total_tva).",";
         $sql .= " ".$this->db->escape($this->total_ttc).",";
-        $sql .= "'".$this->db->idate($this->date)."',";
+        $sql .= " '".$this->db->idate($this->date)."',";
 		$sql .= " '".$this->db->escape($this->rule_warning_message)."',";
 		$sql .= " ".$this->db->escape($this->fk_c_exp_tax_cat).",";
 		$sql .= " ".($this->fk_ecm_files > 0 ? $this->fk_ecm_files : 'null');

From 91f7a14602552e0c793d0b5c015ce1cde9d64f6f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 14:16:40 +0100
Subject: [PATCH 57/69] FIX API to push an expense report

---
 .../class/api_expensereports.class.php        | 33 +++++++++++-
 .../class/expensereport.class.php             | 51 +++++++++++++------
 2 files changed, 67 insertions(+), 17 deletions(-)

diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 60e5eafcb48..7fdd731aa88 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -33,7 +33,7 @@ class ExpenseReports extends DolibarrApi
      * @var array   $FIELDS     Mandatory fields, checked when create and update object
      */
     static $FIELDS = array(
-        'socid'
+        'fk_user_author'
     );
 
     /**
@@ -501,6 +501,11 @@ class ExpenseReports extends DolibarrApi
         // phpcs:enable
         $object = parent::_cleanObjectDatas($object);
 
+        unset($object->fk_statut);
+        unset($object->statut);
+        unset($object->user);
+        unset($object->thirdparty);
+
         unset($object->cond_reglement);
         unset($object->shipping_method_id);
 
@@ -509,6 +514,32 @@ class ExpenseReports extends DolibarrApi
         unset($object->barcode_type_label);
         unset($object->barcode_type_coder);
 
+        unset($object->code_paiement);
+        unset($object->code_statut);
+        unset($object->fk_c_paiement);
+        unset($object->fk_incoterms);
+        unset($object->label_incoterms);
+        unset($object->location_incoterms);
+        unset($object->mode_reglement_id);
+        unset($object->cond_reglement_id);
+
+        unset($object->name);
+        unset($object->lastname);
+        unset($object->firstname);
+        unset($object->civility_id);
+        unset($object->cond_reglement_id);
+        unset($object->contact);
+        unset($object->contact_id);
+
+        unset($object->state);
+        unset($object->state_id);
+        unset($object->state_code);
+        unset($object->country);
+        unset($object->country_id);
+        unset($object->country_code);
+
+        unset($object->note);	// We already use note_public and note_pricate
+
         return $object;
     }
 
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 05272aa2ff7..869e1b84e90 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -58,19 +58,20 @@ class ExpenseReport extends CommonObject
 
     public $date_fin;
 
+    /**
+     * 0=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=payed, 99=denied
+     *
+     * @var int		Status
+     */
     public $status;
-    public $fk_statut; // -- 0=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=payed, 99=denied
+    public $fk_statut;
+
     public $fk_c_paiement;
     public $paid;
 
     public $user_author_infos;
     public $user_validator_infos;
 
-    public $fk_typepayment;
-	public $num_payment;
-    public $code_paiement;
-    public $code_statut;
-
     // ACTIONS
 
     // Create
@@ -285,10 +286,33 @@ class ExpenseReport extends CommonObject
             {
                 if (is_array($this->lines) && count($this->lines) > 0)
                 {
-    	            foreach ($this->lines as $i => $val)
+    	            foreach ($this->lines as $line)
     	            {
+    	            	// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
+    	            	//if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
+    	            	if (!is_object($line)) {
+    	            		$line = (object) $line;
+    	            		$newndfline = new ExpenseReportLine($this->db);
+    	            		$newndfline->fk_expensereport = $line->fk_expensereport;
+    	            		$newndfline->fk_c_type_fees = $line->fk_c_type_fees;
+    	            		$newndfline->fk_project = $line->fk_project;
+    	            		$newndfline->vatrate = $line->vatrate;
+    	            		$newndfline->vat_src_code = $line->vat_src_code;
+    	            		$newndfline->comments = $line->comments;
+    	            		$newndfline->qty = $line->qty;
+    	            		$newndfline->value_unit = $line->value_unit;
+    	            		$newndfline->total_ht = $line->total_ht;
+    	            		$newndfline->total_ttc = $line->total_ttc;
+    	            		$newndfline->total_tva = $line->total_tva;
+    	            		$newndfline->date = $line->date;
+    	            		$newndfline->rule_warning_message = $line->rule_warning_message;
+    	            		$newndfline->fk_c_exp_tax_cat = $line->fk_c_exp_tax_cat;
+    	            		$newndfline->fk_ecm_files = $line->fk_ecm_files;
+    	            	}
+    	            	else {
+    	            		$newndfline = $line;
+    	            	}
     	                //$newndfline=new ExpenseReportLine($this->db);
-    	                $newndfline = $this->lines[$i];
     	                $newndfline->fk_expensereport = $this->id;
     	                $result = $newndfline->insert();
         	            if ($result < 0)
@@ -514,10 +538,8 @@ class ExpenseReport extends CommonObject
         $sql .= " d.date_debut, d.date_fin, d.date_create, d.tms as date_modif, d.date_valid, d.date_approve,"; // DATES (datetime)
         $sql .= " d.fk_user_author, d.fk_user_modif, d.fk_user_validator,";
         $sql .= " d.fk_user_valid, d.fk_user_approve,";
-        $sql .= " d.fk_statut as status, d.fk_c_paiement, d.paid,";
-        $sql .= " dp.libelle as label_payment, dp.code as code_paiement"; // INNER JOIN paiement
+        $sql .= " d.fk_statut as status, d.fk_c_paiement, d.paid";
         $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as d";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as dp ON d.fk_c_paiement = dp.id";
         if ($ref) $sql .= " WHERE d.ref = '".$this->db->escape($ref)."'";
         else $sql .= " WHERE d.rowid = ".$id;
         //$sql.= $restrict;
@@ -566,7 +588,7 @@ class ExpenseReport extends CommonObject
                 elseif ($this->fk_user_validator > 0) $user_approver->fetch($this->fk_user_validator); // For backward compatibility
                 $this->user_validator_infos = dolGetFirstLastname($user_approver->firstname, $user_approver->lastname);
 
-                $this->fk_statut                = $obj->status;
+                $this->fk_statut                = $obj->status;		// deprecated
                 $this->status                   = $obj->status;
                 $this->fk_c_paiement            = $obj->fk_c_paiement;
                 $this->paid                     = $obj->paid;
@@ -578,9 +600,6 @@ class ExpenseReport extends CommonObject
                     $this->user_valid_infos = dolGetFirstLastname($user_valid->firstname, $user_valid->lastname);
                 }
 
-                $this->code_statut      = $obj->code_statut;
-                $this->code_paiement    = $obj->code_paiement;
-
                 $this->lines = array();
 
                 $result = $this->fetch_lines();
@@ -2650,7 +2669,7 @@ class ExpenseReportLine
         $sql .= " ".$this->db->escape($this->total_ht).",";
         $sql .= " ".$this->db->escape($this->total_tva).",";
         $sql .= " ".$this->db->escape($this->total_ttc).",";
-        $sql .= "'".$this->db->idate($this->date)."',";
+        $sql .= " '".$this->db->idate($this->date)."',";
 		$sql .= " '".$this->db->escape($this->rule_warning_message)."',";
 		$sql .= " ".$this->db->escape($this->fk_c_exp_tax_cat).",";
 		$sql .= " ".($this->fk_ecm_files > 0 ? $this->fk_ecm_files : 'null');

From f38661451145f1dd33ca9c7fdad08bb916ecb364 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 14:29:41 +0100
Subject: [PATCH 58/69] Doc

---
 htdocs/expensereport/class/api_expensereports.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 7fdd731aa88..770d39ec951 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -384,6 +384,10 @@ class ExpenseReports extends DolibarrApi
      * @param array $request_data   Datas
      *
      * @return int
+     *
+     * @throws	RestException	401		Not allowed
+     * @throws  RestException	404		Expense report not found
+     * @throws	RestException	500
      */
     public function put($id, $request_data = null)
     {

From 2438b48a1d0525aa812ef423c6932706d35e4017 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 14:36:05 +0100
Subject: [PATCH 59/69] FIX API upload/download doc for expensereport

---
 htdocs/api/class/api_documents.class.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 891c3969f81..3d2ff2aadb4 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -401,6 +401,22 @@ class Documents extends DolibarrApi
 
 			$upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($object->ref);
 		}
+		elseif ($modulepart == 'expensereport')
+		{
+			require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+
+			if (!DolibarrApiAccess::$user->rights->expensereport->read && !DolibarrApiAccess::$user->rights->expensereport->read) {
+				throw new RestException(401);
+			}
+
+			$object = new ExpenseReport($this->db);
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
+				throw new RestException(404, 'Expense report not found');
+			}
+
+			$upload_dir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($object->ref);
+		}
 		else
 		{
 			throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
@@ -523,6 +539,11 @@ class Documents extends DolibarrApi
 				require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 				$object = new Product($this->db);
 			}
+			elseif ($modulepart == 'expensereport')
+			{
+				require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+				$object = new ExpenseReport($this->db);
+			}
 			// TODO Implement additional moduleparts
 			else
 			{

From 69c2f4bd27d66af36ff28b5f5280d1ae9a5acae6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 14:36:05 +0100
Subject: [PATCH 60/69] FIX API upload/download doc for expensereport

---
 htdocs/api/class/api_documents.class.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 75e27ad0e0d..ebfe3d7b0e0 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -387,6 +387,22 @@ class Documents extends DolibarrApi
 
 			$upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($object->ref);
 		}
+		elseif ($modulepart == 'expensereport')
+		{
+			require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+
+			if (!DolibarrApiAccess::$user->rights->expensereport->read && !DolibarrApiAccess::$user->rights->expensereport->read) {
+				throw new RestException(401);
+			}
+
+			$object = new ExpenseReport($this->db);
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
+				throw new RestException(404, 'Expense report not found');
+			}
+
+			$upload_dir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($object->ref);
+		}
 		else
 		{
 			throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
@@ -518,6 +534,11 @@ class Documents extends DolibarrApi
 				require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 				$object = new Product($this->db);
 			}
+			elseif ($modulepart == 'expensereport')
+			{
+				require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+				$object = new ExpenseReport($this->db);
+			}
 			// TODO Implement additional moduleparts
 			else
 			{

From 028287d8fa04e176bb8aca21013711149f3e4fc3 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 25 Feb 2020 14:41:18 +0100
Subject: [PATCH 61/69] Update erp_comparison_translation.txt

---
 .../erp_comparison_translation.txt            | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/dev/translation/erp_comparison_translation.txt b/dev/translation/erp_comparison_translation.txt
index c99a5f4cc1c..6cf7c4f7c60 100644
--- a/dev/translation/erp_comparison_translation.txt
+++ b/dev/translation/erp_comparison_translation.txt
@@ -1,17 +1,25 @@
+comparison of terms
 
 
-Term Dolibarr		SAP					Odoo							...
-----------------------------------------------------------------------------
-Thirdparty			Contact partner		Partner/Contact (company)
-Contact/address		Contact person		Partner/Contact (individual)
+Dolibarr             SAP ERP					      Odoo							    
+-------------------------------------------------------------------------
+Thirdparty			     Contact partner	    	Partner/Contact (company)
+Contact/address		   Contact person	  	    Partner/Contact (individual)
 
-Financial			??					Invoicing
-
-Income / Expense	??					Profit / Loss
-Balance				??					Net profit
-Subledger account	Subledger account	??
+Financial 			     Finance (FI)				  	Accounting
+Accounting
 
 
-Proposal            ??                  Quotation                       Proposal is ok but proposition looks better (proposal is for a detailed proposition). We can say also "business proposition or business proposal".
-                                                                        Indian are using "Quotation".
+Income / Expense	       ??					        Profit / Loss
+Balance				           ??					        Net profit
+Subledger account	   Subledger account	        ??
+
+CRM                  Sales & Distribution   Sales 
+Proposal                ??                  Quotation                         
+
+
+
+Proposal is ok but proposition looks better (proposal is for a detailed proposition). 
+We can say also "business proposition or business proposal".
+In India they are using "Quotation".
                                                                         

From 9c7debf27fd31c9714de0675efc87eaead00ac5e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 14:47:05 +0100
Subject: [PATCH 62/69] FIX API Get list of documents for supplier_invoice

---
 htdocs/api/class/api_documents.class.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index d84bb328faa..2f81b7a1695 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -228,7 +228,7 @@ class Documents extends DolibarrApi
 	/**
 	 * Return the list of documents of a dedicated element (from its ID or Ref)
 	 *
-	 * @param   string 	$modulepart		Name of module or area concerned ('thirdparty', 'member', 'proposal', 'order', 'invoice', 'shipment', 'project',  ...)
+	 * @param   string 	$modulepart		Name of module or area concerned ('thirdparty', 'member', 'proposal', 'order', 'invoice', 'supplier_invoice', 'shipment', 'project',  ...)
 	 * @param	int		$id				ID of element
 	 * @param	string	$ref			Ref of element
 	 * @param	string	$sortfield		Sort criteria ('','fullname','relativename','name','date','size')
@@ -369,6 +369,24 @@ class Documents extends DolibarrApi
 
 			$upload_dir = $conf->facture->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'invoice');
 		}
+		elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
+		{
+			$modulepart = 'supplier_invoice';
+
+			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+
+			if (!DolibarrApiAccess::$user->rights->fournisseur->facture->lire) {
+				throw new RestException(401);
+			}
+
+			$object = new FactureFournisseur($this->db);
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
+				throw new RestException(404, 'Invoice not found');
+			}
+
+			$upload_dir = $conf->fournisseur->dir_output."/facture/".get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').dol_sanitizeFileName($object->ref);
+		}
         elseif ($modulepart == 'produit' || $modulepart == 'product')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

From f6014798d9bf5f50ed1abf2f3ffbe660e7b8b3ef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 14:59:47 +0100
Subject: [PATCH 63/69] Comment

---
 htdocs/api/class/api_documents.class.php | 39 ++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 2f81b7a1695..e58ebf7d280 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -80,7 +80,18 @@ class Documents extends DolibarrApi
 		//--- Finds and returns the document
 		$entity = $conf->entity;
 
-		$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, DolibarrApiAccess::$user, '', 'read');
+		// Special cases that need to use get_exdir to get real dir of object
+		// If future, all object should use this to define path of documents.
+		/*
+		$tmpreldir = '';
+		if ($modulepart == 'supplier_invoice') {
+			$tmpreldir = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier');
+		}
+
+		$relativefile = $tmpreldir.dol_sanitizeFileName($object->ref); */
+		$relativefile = $original_file;
+
+		$check_access = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, '', 'read');
 		$accessallowed = $check_access['accessallowed'];
 		$sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 		$original_file = $check_access['original_file'];
@@ -146,7 +157,18 @@ class Documents extends DolibarrApi
 		//--- Finds and returns the document
 		$entity = $conf->entity;
 
-		$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, DolibarrApiAccess::$user, '', 'write');
+		// Special cases that need to use get_exdir to get real dir of object
+		// If future, all object should use this to define path of documents.
+		/*
+		$tmpreldir = '';
+		if ($modulepart == 'supplier_invoice') {
+			$tmpreldir = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier');
+		}
+
+		$relativefile = $tmpreldir.dol_sanitizeFileName($object->ref); */
+		$relativefile = $original_file;
+
+		$check_access = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, '', 'write');
 		$accessallowed              = $check_access['accessallowed'];
 		$sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 		$original_file              = $check_access['original_file'];
@@ -696,7 +718,18 @@ class Documents extends DolibarrApi
 	    //--- Finds and returns the document
 	    $entity = $conf->entity;
 
-	    $check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, DolibarrApiAccess::$user, '', 'read');
+	    // Special cases that need to use get_exdir to get real dir of object
+	    // If future, all object should use this to define path of documents.
+	    /*
+	    $tmpreldir = '';
+	    if ($modulepart == 'supplier_invoice') {
+	    	$tmpreldir = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier');
+	    }
+
+	    $relativefile = $tmpreldir.dol_sanitizeFileName($object->ref); */
+	    $relativefile = $original_file;
+
+	    $check_access = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, '', 'read');
 	    $accessallowed = $check_access['accessallowed'];
 	    $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 	    $original_file = $check_access['original_file'];

From cb9637e38d76ad8d32f24f27ffc1b71f70c48ea2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 15:04:56 +0100
Subject: [PATCH 64/69] Doc

---
 htdocs/langs/en_US/admin.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 96be43b305c..7a4de856ba2 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1688,7 +1688,7 @@ StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatib
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
 CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
 CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
-CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader.
+CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
 ##### Bookmark #####
 BookmarkSetup=Bookmark module setup
 BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu.

From 39624f21e758b3a9bad1575a8181d184728bee91 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 15:36:34 +0100
Subject: [PATCH 65/69] Fix var not always defined

---
 htdocs/core/lib/project.lib.php | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 9eab5cd6a70..dbfeef03259 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -2035,15 +2035,19 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 	$listofstatus = array_keys($listofoppstatus);
-	$statusOppList = array();
-	$themeColorId = 0;
-	foreach ($listofstatus as $oppStatus) {
-		$oppStatusCode = dol_getIdFromCode($db, $oppStatus, 'c_lead_status', 'rowid', 'code');
-		if ($oppStatusCode) {
-			$statusOppList[$oppStatus]['code'] = $oppStatusCode;
-			$statusOppList[$oppStatus]['color'] = isset($theme_datacolor[$themeColorId]) ? implode(', ', $theme_datacolor[$themeColorId]) : '';
+
+	if (is_array($listofstatus) && ! empty($conf->global->USE_COLOR_FOR_PROSPECTION_STATUS)) {
+		// Define $themeColorId and array $statusOppList for each $listofstatus
+		$themeColorId = 0;
+		$statusOppList = array();
+		foreach ($listofstatus as $oppStatus) {
+			$oppStatusCode = dol_getIdFromCode($db, $oppStatus, 'c_lead_status', 'rowid', 'code');
+			if ($oppStatusCode) {
+				$statusOppList[$oppStatus]['code'] = $oppStatusCode;
+				$statusOppList[$oppStatus]['color'] = isset($theme_datacolor[$themeColorId]) ? implode(', ', $theme_datacolor[$themeColorId]) : '';
+			}
+			$themeColorId++;
 		}
-		$themeColorId++;
 	}
 
 	$projectstatic = new Project($db);
@@ -2203,6 +2207,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 						print '<td class="right">';
 						// Because color of prospection status has no meaning yet, it is used if hidden constant is set
 						if (empty($conf->global->USE_COLOR_FOR_PROSPECTION_STATUS)) {
+							$oppStatusCode = dol_getIdFromCode($db, $objp->opp_status, 'c_lead_status', 'rowid', 'code');
 							if ($langs->trans("OppStatus".$oppStatusCode) != "OppStatus".$oppStatusCode) {
 								print $langs->trans("OppStatus".$oppStatusCode);
 							}

From 45771663aafb03ba1d4550a61d39711e9d19b799 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Feb 2020 18:53:25 +0100
Subject: [PATCH 66/69] NEW Add API to get types of expense reports

---
 htdocs/api/class/api_setup.class.php | 64 ++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 7c471dfd0bd..d3543683db2 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -554,6 +554,70 @@ class Setup extends DolibarrApi
         return $list;
     }
 
+
+    /**
+     * Get the list of Expense Report types.
+     *
+     * @param string    $sortfield  Sort field
+     * @param string    $sortorder  Sort order
+     * @param int       $limit      Number of items per page
+     * @param int       $page       Page number (starting from zero)
+     * @param string    $module     To filter on module
+     * @param int       $active     Event's type is active or not {@min 0} {@max 1}
+     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+     * @return array				List of expense report types
+     *
+     * @url     GET dictionary/expensereport_types
+     *
+     * @throws RestException
+     */
+    public function getListOfExpenseReportsTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $module = '', $active = 1, $sqlfilters = '')
+    {
+    	$list = array();
+
+    	$sql = "SELECT id, code, label, accountancy_code, active, module, position";
+    	$sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees as t";
+    	$sql .= " WHERE t.active = ".$active;
+    	if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+    	// Add sql filters
+    	if ($sqlfilters)
+    	{
+    		if (!DolibarrApi::_checkFilters($sqlfilters))
+    		{
+    			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+    		}
+    		$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+    		$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+    	}
+
+
+    	$sql .= $this->db->order($sortfield, $sortorder);
+
+    	if ($limit) {
+    		if ($page < 0) {
+    			$page = 0;
+    		}
+    		$offset = $limit * $page;
+
+    		$sql .= $this->db->plimit($limit, $offset);
+    	}
+
+    	$result = $this->db->query($sql);
+
+    	if ($result) {
+    		$num = $this->db->num_rows($result);
+    		$min = min($num, ($limit <= 0 ? $num : $limit));
+    		for ($i = 0; $i < $min; $i++) {
+    			$list[] = $this->db->fetch_object($result);
+    		}
+    	} else {
+    		throw new RestException(503, 'Error when retrieving list of expense report types : '.$this->db->lasterror());
+    	}
+
+    	return $list;
+    }
+
+
     /**
      * Get the list of contacts types.
      *

From c5ad18b8c82a60ddbb7806d29d1db83228ed18e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Feb 2020 04:24:34 +0100
Subject: [PATCH 67/69] Increase limit per day

---
 .github/workflows/stale-issues.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml
index 0be87022eef..5b55cdc54c8 100644
--- a/.github/workflows/stale-issues.yml
+++ b/.github/workflows/stale-issues.yml
@@ -17,7 +17,7 @@ jobs:
         exempt-issue-label: 'Priority High / Blocking'
         days-before-stale: 365
         days-before-close: 15
-        operations-per-run: 30
+        operations-per-run: 50
         #stale-pr-message: 'This PR is stale because it has been open 1 year with no activity. If this PR is still mergeable (no conflict, nor Continuous Integration errors), please comment to confirm this merge is still expected. Without comment, this issue will be closed automatically by stale bot in 15 days.'
         stale-pr-label: 'PR Stale (automatic label)'
         stale-pr-message: 

From 6cf6719cfb80fc3e1936d9d44d1d65f1e659ad41 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Feb 2020 06:39:02 +0100
Subject: [PATCH 68/69] FIX Bad sort link in accounting report

---
 htdocs/compta/resultat/clientfourn.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index ee76a29d282..0a60e928db9 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -67,8 +67,7 @@ if (!$sortorder) $sortorder = 'ASC';
 
 // Date range
 $year = GETPOST('year', 'int');
-if (empty($year))
-{
+if (empty($year)) {
     $year_current = strftime("%Y", dol_now());
     $month_current = strftime("%m", dol_now());
     $year_start = $year_current;
@@ -114,7 +113,7 @@ $tmps = dol_getdate($date_start);
 $year_start = $tmps['year'];
 $tmpe = dol_getdate($date_end);
 $year_end = $tmpe['year'];
-$nbofyear = ($year_end - $start_year) + 1;
+$nbofyear = ($year_end - $year_start) + 1;
 //var_dump("year_start=".$year_start." year_end=".$year_end." nbofyear=".$nbofyear." date_start=".dol_print_date($date_start, 'dayhour')." date_end=".dol_print_date($date_end, 'dayhour'));
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES' or 'BOOKKEEPING')
@@ -199,11 +198,15 @@ if ($date_startmonth) $param .= '&date_startmonth='.$date_startmonth;
 if ($date_startyear) $param .= '&date_startyear='.$date_startyear;
 if ($date_endday) $param .= '&date_endday='.$date_endday;
 if ($date_endmonth) $param .= '&date_endmonth='.$date_endmonth;
-if ($date_endyear) $param .= '&date_endyear='.$date_startyear;
+if ($date_endyear) $param .= '&date_endyear='.$date_endyear;
 
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print_liste_field_titre("PredefinedGroups", $_SERVER["PHP_SELF"], 'f.thirdparty_code,f.rowid', '', $param, '', $sortfield, $sortorder, 'width200 ');
+if ($modecompta == 'BOOKKEEPING') {
+	print_liste_field_titre("PredefinedGroups", $_SERVER["PHP_SELF"], 'f.thirdparty_code,f.rowid', '', $param, '', $sortfield, $sortorder, 'width200 ');
+} else {
+	print_liste_field_titre("", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'width200 ');
+}
 print_liste_field_titre('');
 if ($modecompta == 'BOOKKEEPING')
 {

From 4831d22354c92cd01d0a5db75f2352d907729b18 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Feb 2020 06:43:21 +0100
Subject: [PATCH 69/69] FIX sort link

---
 htdocs/compta/resultat/clientfourn.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 0a60e928db9..a07aacd127f 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -192,7 +192,7 @@ if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
 }
 
 // Show report array
-$param = '&modecompta='.$modecompta;
+$param = '&modecompta='.urlencode($modecompta).'&showaccountdetail='.urlencode($showaccountdetail);
 if ($date_startday) $param .= '&date_startday='.$date_startday;
 if ($date_startmonth) $param .= '&date_startmonth='.$date_startmonth;
 if ($date_startyear) $param .= '&date_startyear='.$date_startyear;