From 518a225f7baa8f577877392562f1906aa86723ab Mon Sep 17 00:00:00 2001
From: jcp <jcprieto@virtual20.com>
Date: Tue, 3 Nov 2020 19:48:23 +0100
Subject: [PATCH 01/95] NEW massaction for BankTransfer

---
 htdocs/fourn/facture/list.php       | 101 ++++++++++++++++++++++++++++
 htdocs/langs/en_US/withdrawals.lang |   1 +
 2 files changed, 102 insertions(+)

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 0ebfd024658..c1c6329cb43 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -270,6 +270,103 @@ if (empty($reshook))
 }
 
 
+if ($massaction == 'transfer_request')
+{
+	$langs->load("withdrawals");
+
+	if (!$user->rights->paymentbybanktransfer->create)
+	{
+		$error++;
+		setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
+	}
+	else
+	{
+		//Checking error
+		$error = 0;
+
+		$arrayofselected = is_array($toselect) ? $toselect : array();
+		$listofbills = array();
+		foreach ($arrayofselected as $toselectid)
+		{
+			$objecttmp = new FactureFournisseur($db);
+			$result = $objecttmp->fetch($toselectid);
+			if ($result > 0)
+			{
+				$totalpaye = $objecttmp->getSommePaiement();
+				$totalcreditnotes = $objecttmp->getSumCreditNotesUsed();
+				$totaldeposits = $objecttmp->getSumDepositsUsed();
+				$objecttmp->resteapayer = price2num($objecttmp->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+				if ($objecttmp->paye || $objecttmp->resteapayer == 0) {
+					$error++;
+					setEventMessages($objecttmp->ref.' '.$langs->trans("AlreadyPaid"), $objecttmp->errors, 'errors');
+				} elseif ($objecttmp->resteapayer < 0) {
+					$error++;
+					setEventMessages($objecttmp->ref.' '.$langs->trans("AmountMustBePositive"), $objecttmp->errors, 'errors');
+				}
+				if (!($objecttmp->statut > FactureFournisseur::STATUS_DRAFT)) {
+					$error++;
+					setEventMessages($objecttmp->ref.' '.$langs->trans("Draft"), $objecttmp->errors, 'errors');
+				}
+
+				$rsql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande";
+				$rsql .= " , pfd.date_traite as date_traite";
+				$rsql .= " , pfd.amount";
+				$rsql .= " , u.rowid as user_id, u.lastname, u.firstname, u.login";
+				$rsql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+				$rsql .= " , ".MAIN_DB_PREFIX."user as u";
+				$rsql .= " WHERE fk_facture_fourn = ".$objecttmp->id;
+				$rsql .= " AND pfd.fk_user_demande = u.rowid";
+				$rsql .= " AND pfd.traite = 0";
+				$rsql .= " ORDER BY pfd.date_demande DESC";
+
+				$result_sql = $db->query($rsql);
+				if ($result_sql)
+				{
+					$numprlv = $db->num_rows($result_sql);
+				}
+
+				if ($numprlv > 0) {
+					$error++;
+					setEventMessages($objecttmp->ref.' '.$langs->trans("RequestAlreadyDone"), $objecttmp->errors, 'warnings');
+				}
+				elseif (!empty($objecttmp->mode_reglement_code) && $objecttmp->mode_reglement_code != 'VIR') {
+					$error++;
+					setEventMessages($objecttmp->ref.' '.$langs->trans("BadPaymentMethod"), $objecttmp->errors, 'errors');
+				}
+				else {
+					$listofbills[] = $objecttmp; // $listofbills will only contains invoices with good payment method and no request already done
+				}
+			}
+		}
+
+		//Massive withdraw request for request with no errors
+		if (!empty($listofbills))
+		{
+			$nbwithdrawrequestok = 0;
+			foreach ($listofbills as $aBill)
+			{
+				$db->begin();
+				$result = $aBill->demande_prelevement($user, $aBill->resteapayer, 'bank-transfer', 'supplier_invoice');
+				if ($result > 0)
+				{
+					$db->commit();
+					$nbwithdrawrequestok++;
+				}
+				else
+				{
+					$db->rollback();
+					setEventMessages($aBill->error, $aBill->errors, 'errors');
+				}
+			}
+			if ($nbwithdrawrequestok > 0)
+			{
+				setEventMessages($langs->trans("BankTransferRequestsDone", $nbwithdrawrequestok), null, 'mesgs');
+			}
+		}
+	}
+}
+
+
 /*
  * View
  */
@@ -505,6 +602,10 @@ if ($resql)
 		//'builddoc'=>$langs->trans("PDFMerge"),
 	    //'presend'=>$langs->trans("SendByMail"),
 	);
+	if ($conf->paymentbybanktransfer->enabled) {
+        	$langs->load("withdrawals");
+        	$arrayofmassactions['transfer_request'] = $langs->trans("MakeBankTransferOrder");
+	}
 	//if($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
 	if ($user->rights->fournisseur->facture->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 	if (in_array($massaction, array('presend', 'predelete', 'createbills'))) $arrayofmassactions = array();
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index a18ff7a8d31..1b8f2441b33 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited

From 61bca50fa62c0b51127e5802e3926f031afb9812 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 5 Nov 2020 16:56:28 +0100
Subject: [PATCH 02/95] NEW: Dictionary for availability - Add column position

---
 htdocs/admin/dict.php                         | 14 ++++----
 htdocs/core/class/html.form.class.php         |  7 ++--
 .../install/mysql/data/llx_c_availability.sql |  9 ++---
 .../install/mysql/migration/13.0.0-14.0.0.sql | 35 +++++++++++++++++++
 .../mysql/tables/llx_c_availability.sql       |  5 +--
 5 files changed, 54 insertions(+), 16 deletions(-)
 create mode 100644 htdocs/install/mysql/migration/13.0.0-14.0.0.sql

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 43ce69f6e02..adacc0d7b8e 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2011		Remy Younes				<ryounes@gmail.com>
  * Copyright (C) 2012-2015	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2012		Christophe Battarel		<christophe.battarel@ltairis.fr>
- * Copyright (C) 2011-2019	Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2011-2020	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2015		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2016		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2019-2020  Frédéric France         <frederic.france@netlogic.fr>
@@ -205,7 +205,7 @@ $tabsql[17] = "SELECT id      as rowid, code, label, accountancy_code, active FR
 $tabsql[18] = "SELECT rowid   as rowid, code, libelle, tracking, active FROM ".MAIN_DB_PREFIX."c_shipment_mode";
 $tabsql[19] = "SELECT id      as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_effectif";
 $tabsql[20] = "SELECT rowid   as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_input_method";
-$tabsql[21] = "SELECT c.rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_availability AS c";
+$tabsql[21] = "SELECT c.rowid as rowid, c.code, c.label, c.active, c.position FROM ".MAIN_DB_PREFIX."c_availability AS c";
 $tabsql[22] = "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_input_reason";
 $tabsql[23] = "SELECT t.rowid as rowid, t.taux, t.revenuestamp_type, c.label as country, c.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid";
 $tabsql[24] = "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_type_resource";
@@ -250,7 +250,7 @@ $tabsqlsort[17] = "code ASC";
 $tabsqlsort[18] = "code ASC, libelle ASC";
 $tabsqlsort[19] = "id ASC";
 $tabsqlsort[20] = "code ASC, libelle ASC";
-$tabsqlsort[21] = "code ASC, label ASC";
+$tabsqlsort[21] = "code ASC, label ASC, position ASC";
 $tabsqlsort[22] = "code ASC, label ASC";
 $tabsqlsort[23] = "country ASC, taux ASC";
 $tabsqlsort[24] = "code ASC, label ASC";
@@ -295,7 +295,7 @@ $tabfield[17] = "code,label,accountancy_code";
 $tabfield[18] = "code,libelle,tracking";
 $tabfield[19] = "code,libelle";
 $tabfield[20] = "code,libelle";
-$tabfield[21] = "code,label";
+$tabfield[21] = "code,label,position";
 $tabfield[22] = "code,label";
 $tabfield[23] = "country_id,country,taux,revenuestamp_type,accountancy_code_sell,accountancy_code_buy,note";
 $tabfield[24] = "code,label";
@@ -340,7 +340,7 @@ $tabfieldvalue[17] = "code,label,accountancy_code";
 $tabfieldvalue[18] = "code,libelle,tracking";
 $tabfieldvalue[19] = "code,libelle";
 $tabfieldvalue[20] = "code,libelle";
-$tabfieldvalue[21] = "code,label";
+$tabfieldvalue[21] = "code,label,position";
 $tabfieldvalue[22] = "code,label";
 $tabfieldvalue[23] = "country,taux,revenuestamp_type,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldvalue[24] = "code,label";
@@ -385,7 +385,7 @@ $tabfieldinsert[17] = "code,label,accountancy_code";
 $tabfieldinsert[18] = "code,libelle,tracking";
 $tabfieldinsert[19] = "code,libelle";
 $tabfieldinsert[20] = "code,libelle";
-$tabfieldinsert[21] = "code,label";
+$tabfieldinsert[21] = "code,label,position";
 $tabfieldinsert[22] = "code,label";
 $tabfieldinsert[23] = "fk_pays,taux,revenuestamp_type,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldinsert[24] = "code,label";
@@ -523,7 +523,7 @@ $tabhelp[17] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[18] = array('code'=>$langs->trans("EnterAnyCode"), 'tracking'=>$langs->trans("UrlTrackingDesc"));
 $tabhelp[19] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[20] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[21] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[21] = array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"));
 $tabhelp[22] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[23] = array('revenuestamp_type'=>'FixedOrPercent');
 $tabhelp[24] = array('code'=>$langs->trans("EnterAnyCode"));
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 5c457a2a28c..fac12b48d52 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -15,7 +15,7 @@
  * Copyright (C) 2012-2016  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2012       Cedric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2012-2015  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2014       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2014-2020  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2018       Nicolas ZABOURI	        <info@inovea-conseil.com>
@@ -3218,7 +3218,7 @@ class Form
 
 		$langs->load('propal');
 
-		$sql = "SELECT rowid, code, label";
+		$sql = "SELECT rowid, code, label, position";
 		$sql .= " FROM ".MAIN_DB_PREFIX.'c_availability';
 		$sql .= " WHERE active > 0";
 
@@ -3235,10 +3235,11 @@ class Form
 				$label = ($langs->trans("AvailabilityType".$obj->code) != ("AvailabilityType".$obj->code) ? $langs->trans("AvailabilityType".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
 				$this->cache_availability[$obj->rowid]['code'] = $obj->code;
 				$this->cache_availability[$obj->rowid]['label'] = $label;
+				$this->cache_availability[$obj->rowid]['position'] = $obj->position;
 				$i++;
 			}
 
-			$this->cache_availability = dol_sort_array($this->cache_availability, 'label', 'asc', 0, 0, 1);
+			$this->cache_availability = dol_sort_array($this->cache_availability, 'position', 'asc', 0, 0, 1);
 
 			return $num;
 		} else {
diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql
index 7d834aa2809..2e06d1de8b3 100644
--- a/htdocs/install/mysql/data/llx_c_availability.sql
+++ b/htdocs/install/mysql/data/llx_c_availability.sql
@@ -1,4 +1,5 @@
 -- Copyright (C) 2011 Philippe GRAND      <philippe.grand@atoo-net.com>
+-- Copyright (C) 2020 Alexandre SPANGARO  <aspangaro@open-dsi.fr>
 --
 -- 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
@@ -25,7 +26,7 @@
 --
 
 delete from llx_c_availability;
-INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (1, 'AV_NOW', 'Immediate', 1);
-INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (2, 'AV_1W',  '1 week', 1);
-INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (3, 'AV_2W',  '2 weeks', 1);
-INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (4, 'AV_3W',  '3 weeks', 1);
+INSERT INTO llx_c_availability (rowid,code,label,active,position) VALUES (1, 'AV_NOW', 'Immediate', 1, 10);
+INSERT INTO llx_c_availability (rowid,code,label,active,position) VALUES (2, 'AV_1W',  '1 week', 1, 20);
+INSERT INTO llx_c_availability (rowid,code,label,active,position) VALUES (3, 'AV_2W',  '2 weeks', 1, 30);
+INSERT INTO llx_c_availability (rowid,code,label,active,position) VALUES (4, 'AV_3W',  '3 weeks', 1, 40);
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
new file mode 100644
index 00000000000..58a3f962e3c
--- /dev/null
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -0,0 +1,35 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 14.0.0 or higher.
+--
+-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
+-- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
+-- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
+-- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
+-- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
+-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
+-- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
+-- To create a unique index ALTER TABLE llx_table ADD UNIQUE INDEX uk_table_field (field);
+-- To drop an index:        -- VMYSQL4.1 DROP INDEX nomindex on llx_table
+-- To drop an index:        -- VPGSQL8.2 DROP INDEX nomindex
+-- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_table CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres):
+-- -- VPGSQL8.2 CREATE SEQUENCE llx_table_rowid_seq OWNED BY llx_table.rowid;
+-- -- VPGSQL8.2 ALTER TABLE llx_table ADD PRIMARY KEY (rowid);
+-- -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN rowid SET DEFAULT nextval('llx_table_rowid_seq');
+-- -- VPGSQL8.2 SELECT setval('llx_table_rowid_seq', MAX(rowid)) FROM llx_table;
+-- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
+-- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
+-- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
+-- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- Note: fields with type BLOB/TEXT can't have default value.
+
+
+-- Missing in v13 or lower
+
+-- For v14
+
+ALTER TABLE llx_c_availability ADD COLUMN position integer NOT NULL DEFAULT 0;
diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql
index cef03abe548..4cdc8d6203c 100644
--- a/htdocs/install/mysql/tables/llx_c_availability.sql
+++ b/htdocs/install/mysql/tables/llx_c_availability.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2011 Philippe GRAND      <philippe.grand@atoo-net.com>
+-- Copyright (C) 2020 Alexandre SPANGARO  <aspangaro@open-dsi.fr>
 --
 -- 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
@@ -21,6 +22,6 @@ create table llx_c_availability
 	rowid		integer	 	AUTO_INCREMENT PRIMARY KEY,
 	code		varchar(30) NOT NULL,
 	label		varchar(60) NOT NULL,
-	active		tinyint 	DEFAULT 1  NOT NULL
-
+	active		tinyint 	DEFAULT 1  NOT NULL,
+	position    integer NOT NULL DEFAULT 0
 )ENGINE=innodb;

From 1bdd617feb8edb25e07ebdf0c520dee4489e821c Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Sat, 7 Nov 2020 15:31:27 +0100
Subject: [PATCH 03/95] NEW: Multiselect ledger account code filter on book
 keeping list

---
 htdocs/accountancy/admin/index.php            | 20 ++++-
 htdocs/accountancy/bookkeeping/list.php       | 14 +++-
 .../core/class/html.formaccounting.class.php  | 82 ++++++++++++++++++-
 htdocs/core/modules/modAccounting.class.php   |  6 ++
 htdocs/langs/en_US/accountancy.lang           |  2 +-
 htdocs/langs/fr_FR/accountancy.lang           |  2 +-
 6 files changed, 117 insertions(+), 9 deletions(-)

diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 516af988334..92c2df3ba0e 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -48,6 +48,7 @@ $action = GETPOST('action', 'aZ09');
 $list = array(
 	'ACCOUNTING_LENGTH_GACCOUNT',
 	'ACCOUNTING_LENGTH_AACCOUNT',
+	'ACCOUNTING_LIMIT_LIST_VENTILATION'
 //    'ACCOUNTING_LENGTH_DESCRIPTION',         // adjust size displayed for lines description for dol_trunc
 //    'ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT', // adjust size displayed for select account description for dol_trunc
 );
@@ -248,7 +249,7 @@ if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL)) {
 print '</tr>';
 */
 
-print '<tr class="oddeven">';
+/*print '<tr class="oddeven">';
 print '<td>'.$langs->trans("BANK_DISABLE_DIRECT_INPUT").'</td>';
 if (!empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
 	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&disabledirectinput&value=0">';
@@ -259,7 +260,7 @@ if (!empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
 	print img_picto($langs->trans("Disabled"), 'switch_off');
 	print '</a></td>';
 }
-print '</tr>';
+print '</tr>';*/
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ACCOUNTANCY_COMBO_FOR_AUX").'</td>';
@@ -313,6 +314,21 @@ print '<tr class="liste_titre">';
 print '<td colspan="2">'.$langs->trans('BindingOptions').'</td>';
 print "</tr>\n";
 
+
+// TO DO Mutualize code for yes/no constants
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("").'</td>';
+if (!empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO)) {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&listsorttodo&value=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on');
+	print '</a></td>';
+} else {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&listsorttodo&value=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '</a></td>';
+}
+print '</tr>';
+
 // TO DO Mutualize code for yes/no constants
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_TODO").'</td>';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 6d663edcf4e..7219136c2da 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -85,7 +85,7 @@ $search_mvt_label = GETPOST('search_mvt_label', 'alpha');
 $search_direction = GETPOST('search_direction', 'alpha');
 $search_debit = GETPOST('search_debit', 'alpha');
 $search_credit = GETPOST('search_credit', 'alpha');
-$search_ledger_code = GETPOST('search_ledger_code', 'alpha');
+$search_ledger_code = GETPOST('search_ledger_code', 'array');
 $search_lettering_code = GETPOST('search_lettering_code', 'alpha');
 $search_not_reconciled = GETPOST('search_reconciled_option', 'alpha');
 
@@ -192,7 +192,7 @@ if (empty($reshook))
 		$search_accountancy_aux_code_end = '';
 		$search_mvt_label = '';
 		$search_direction = '';
-		$search_ledger_code = '';
+		$search_ledger_code = array();
 		$search_date_start = '';
 		$search_date_end = '';
 		$search_date_creation_start = '';
@@ -267,7 +267,9 @@ if (empty($reshook))
 	}
 	if (!empty($search_ledger_code)) {
 		$filter['t.code_journal'] = $search_ledger_code;
-		$param .= '&search_ledger_code='.urlencode($search_ledger_code);
+		foreach ($search_ledger_code as $code) {
+			$param .= '&search_ledger_code[]='.urlencode($code);
+		}
 	}
 	if (!empty($search_mvt_num)) {
 		$filter['t.piece_num'] = $search_mvt_num;
@@ -447,6 +449,8 @@ if (count($filter) > 0) {
 			$sqlwhere[] = natural_search($key, $value, 1, 1);
 		} elseif ($key == 't.reconciled_option') {
 			$sqlwhere[] = 't.lettering_code IS NULL';
+		} elseif ($key == 't.code_journal' && !empty($value)) {
+			$sqlwhere[] = natural_search("t.code_journal", join(',', $value), 3, 1);
 		} else {
 			$sqlwhere[] = natural_search($key, $value, 0, 1);
 		}
@@ -756,7 +760,9 @@ if (!empty($arrayfields['t.lettering_code']['checked']))
 // Code journal
 if (!empty($arrayfields['t.code_journal']['checked']))
 {
-	print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="'.$search_ledger_code.'"></td>';
+	print '<td class="liste_titre center">';
+	print $formaccounting->multi_select_journal($search_ledger_code, 'search_ledger_code', 0, 1, 1, 1);
+	print '</td>';
 }
 
 // Fields from hook
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index d6f7b269da1..373501a7adf 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -59,7 +59,7 @@ class FormAccounting extends Form
 	/**
 	 * Return list of journals with label by nature
 	 *
-	 * @param	string	$selectid	Preselected pcg_type
+	 * @param	string	$selectid	Preselected journal code
 	 * @param	string	$htmlname	Name of field in html form
 	 * @param	int		$nature		Limit the list to a particular type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
 	 * @param	int		$showempty	Add an empty field
@@ -136,6 +136,86 @@ class FormAccounting extends Form
 		return $out;
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return list of journals with label by nature
+	 *
+	 * @param	array	$selectids	Preselected journal code
+	 * @param	string	$htmlname	Name of field in html form
+	 * @param	int		$nature		Limit the list to a particular type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
+	 * @param	int		$showempty	Add an empty field
+	 * @param	int		$select_in	0=selectid value is the journal rowid (default) or 1=selectid is journal code
+	 * @param	int		$select_out	Set value returned by select. 0=rowid (default), 1=code
+	 * @param	string	$morecss	More css non HTML object
+	 * @param	string	$usecache	Key to use to store result into a cache. Next call with same key will reuse the cache.
+	 * @param   int     $disabledajaxcombo Disable ajax combo box.
+	 * @return	string				String with HTML select
+	 */
+	public function multi_select_journal($selectedIds=array(), $htmlname = 'journal', $nature = 0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss = '', $usecache = '', $disabledajaxcombo = 0)
+	{
+		// phpcs:enable
+		global $conf, $langs;
+
+		$out = '';
+
+		$options = array();
+		if ($usecache && !empty($this->options_cache[$usecache]))
+		{
+			$options = $this->options_cache[$usecache];
+			$selected = $selectedIds;
+		} else {
+			$sql = "SELECT rowid, code, label, nature, entity, active";
+			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
+			$sql .= " WHERE active = 1";
+			$sql .= " AND entity = ".$conf->entity;
+			if ($nature && is_numeric($nature))   $sql .= " AND nature = ".$nature;
+			$sql .= " ORDER BY code";
+
+			dol_syslog(get_class($this)."::multi_select_journal", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+
+			if (!$resql) {
+				$this->error = "Error ".$this->db->lasterror();
+				dol_syslog(get_class($this)."::multi_select_journal ".$this->error, LOG_ERR);
+				return -1;
+			}
+
+			$selected = array();
+			$langs->load('accountancy');
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$label = $langs->trans($obj->label);
+
+				$select_value_in = $obj->rowid;
+				$select_value_out = $obj->rowid;
+
+				// Try to guess if we have found default value
+				if ($select_in == 1) {
+					$select_value_in = $obj->code;
+				}
+				if ($select_out == 1) {
+					$select_value_out = $obj->code;
+				}
+				// Remember guy's we store in database llx_accounting_bookkeeping the code of accounting_journal and not the rowid
+				if (!empty($selectedIds) && in_array($select_value_in, $selectedIds)) {
+					//var_dump("Found ".$selectid." ".$select_value_in);
+					$selected[] = $select_value_out;
+				}
+				$options[$select_value_out] = $label;
+			}
+			$this->db->free($resql);
+
+			if ($usecache)
+			{
+				$this->options_cache[$usecache] = $options;
+			}
+		}
+
+		$out .= Form::multiselectarray($htmlname, $options, $selected, $showempty, 0, $morecss, 0, 0, 0, 'code_journal', '',($disabledajaxcombo ? 0 : 1));
+
+		return $out;
+	}
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of accounting category.
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 811dd57544e..7eff70422ee 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -154,6 +154,12 @@ class modAccounting extends DolibarrModules
 				"csv",
 				"", 0, 'current', 0
 		);
+		$this->const[14] = array(
+			"ACCOUNTING_LIMIT_LIST_VENTILATION",
+			"chaine",
+			"50",
+			"", 0, 'current', 0
+		);
 
 		// Tabs
 		$this->tabs = array();
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 1d75fa153e8..c35d85e7bcb 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -144,7 +144,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to on list and bind shown by page (maximum recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 6381caebbec..5309adfae93 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -137,7 +137,7 @@ NotVentilatedinAccount=Non lié au compte comptable
 XLineSuccessfullyBinded=%s produits/service correctement liés à un compte comptable
 XLineFailedToBeBinded=%s produits/services n'ont pu être liés à un compte comptable
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Nombre d'éléments à lier représentés par page (maximum recommandé: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Nombre de ligne des listes et d'éléments à lier représentés par page (maximum recommandé: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Commencez le tri de la page "Lien à réaliser" par les éléments les plus récents
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Commencez le tri de la page "Liens réalisés" par les éléments les plus récents
 

From c9373e318ed68b9944074e16b743a2ca66e0d8d2 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Sat, 7 Nov 2020 15:33:23 +0100
Subject: [PATCH 04/95] fix admin

---
 htdocs/accountancy/admin/index.php | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 92c2df3ba0e..6a33d009765 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -249,7 +249,7 @@ if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL)) {
 print '</tr>';
 */
 
-/*print '<tr class="oddeven">';
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("BANK_DISABLE_DIRECT_INPUT").'</td>';
 if (!empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
 	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&disabledirectinput&value=0">';
@@ -260,7 +260,7 @@ if (!empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
 	print img_picto($langs->trans("Disabled"), 'switch_off');
 	print '</a></td>';
 }
-print '</tr>';*/
+print '</tr>';
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ACCOUNTANCY_COMBO_FOR_AUX").'</td>';
@@ -314,21 +314,6 @@ print '<tr class="liste_titre">';
 print '<td colspan="2">'.$langs->trans('BindingOptions').'</td>';
 print "</tr>\n";
 
-
-// TO DO Mutualize code for yes/no constants
-print '<tr class="oddeven">';
-print '<td>'.$langs->trans("").'</td>';
-if (!empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO)) {
-	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&listsorttodo&value=0">';
-	print img_picto($langs->trans("Activated"), 'switch_on');
-	print '</a></td>';
-} else {
-	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&listsorttodo&value=1">';
-	print img_picto($langs->trans("Disabled"), 'switch_off');
-	print '</a></td>';
-}
-print '</tr>';
-
 // TO DO Mutualize code for yes/no constants
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_TODO").'</td>';

From 259462b53a2f372a1094a820d42ece8642d7fc64 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 7 Nov 2020 14:36:28 +0000
Subject: [PATCH 05/95] Fixing style errors.

---
 htdocs/core/class/html.formaccounting.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 373501a7adf..14f97d23ebf 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -151,7 +151,7 @@ class FormAccounting extends Form
 	 * @param   int     $disabledajaxcombo Disable ajax combo box.
 	 * @return	string				String with HTML select
 	 */
-	public function multi_select_journal($selectedIds=array(), $htmlname = 'journal', $nature = 0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss = '', $usecache = '', $disabledajaxcombo = 0)
+	public function multi_select_journal($selectedIds = array(), $htmlname = 'journal', $nature = 0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss = '', $usecache = '', $disabledajaxcombo = 0)
 	{
 		// phpcs:enable
 		global $conf, $langs;
@@ -211,7 +211,7 @@ class FormAccounting extends Form
 			}
 		}
 
-		$out .= Form::multiselectarray($htmlname, $options, $selected, $showempty, 0, $morecss, 0, 0, 0, 'code_journal', '',($disabledajaxcombo ? 0 : 1));
+		$out .= Form::multiselectarray($htmlname, $options, $selected, $showempty, 0, $morecss, 0, 0, 0, 'code_journal', '', ($disabledajaxcombo ? 0 : 1));
 
 		return $out;
 	}

From 58cb63adf74c8648037b5067605f9770de4f34d5 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Sat, 7 Nov 2020 15:48:12 +0100
Subject: [PATCH 06/95] fix stockler

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

diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 373501a7adf..08268d6bb32 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -140,7 +140,7 @@ class FormAccounting extends Form
 	/**
 	 * Return list of journals with label by nature
 	 *
-	 * @param	array	$selectids	Preselected journal code
+	 * @param	array	$selectedIds	Preselected journal code array
 	 * @param	string	$htmlname	Name of field in html form
 	 * @param	int		$nature		Limit the list to a particular type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
 	 * @param	int		$showempty	Add an empty field

From 50d530733e7450ff3481baead7cbfb51a9e9fd26 Mon Sep 17 00:00:00 2001
From: jcp <jcprieto@virtual20.com>
Date: Mon, 9 Nov 2020 13:17:24 +0100
Subject: [PATCH 07/95] NEW: ICS fields moved into bank account table

---
 htdocs/admin/paymentbybanktransfer.php        |  6 ++-
 htdocs/admin/prelevement.php                  |  9 ++++-
 htdocs/compta/bank/card.php                   | 22 ++++++++++-
 htdocs/compta/bank/class/account.class.php    | 20 +++++++++-
 htdocs/compta/paymentbybanktransfer/index.php |  2 +-
 .../class/bonprelevement.class.php            |  7 ++--
 htdocs/compta/prelevement/create.php          | 39 +++++++++++++++----
 htdocs/core/lib/prelevement.lib.php           | 18 ++++++---
 .../bank/doc/pdf_sepamandate.modules.php      |  2 +-
 htdocs/langs/en_US/withdrawals.lang           |  6 ++-
 10 files changed, 107 insertions(+), 24 deletions(-)

diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php
index 6a419d39e53..5449e927a4f 100644
--- a/htdocs/admin/paymentbybanktransfer.php
+++ b/htdocs/admin/paymentbybanktransfer.php
@@ -71,10 +71,10 @@ if ($action == "set")
         if (! $res > 0) $error++;
         */
 	} else $error++;
-
+/* Moved to account
 	$res = dolibarr_set_const($db, "PAYMENTBYBANKTRANSFER_ICS", GETPOST("PAYMENTBYBANKTRANSFER_ICS"), 'chaine', 0, '', $conf->entity);
 	if (!$res > 0) $error++;
-
+*/
 	if (GETPOST("PAYMENTBYBANKTRANSFER_USER") > 0)
 	{
 		$res = dolibarr_set_const($db, "PAYMENTBYBANKTRANSFER_USER", GETPOST("PAYMENTBYBANKTRANSFER_USER"), 'chaine', 0, '', $conf->entity);
@@ -156,11 +156,13 @@ print '<td class="left">';
 $form->select_comptes($conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT, 'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT', 0, "courant=1", 1);
 print '</td></tr>';
 
+/* Moved to bank account data
 // ICS
 print '<tr class="oddeven"><td class="fieldrequired">'.$langs->trans("ICS").'</td>';
 print '<td class="left">';
 print '<input type="text" name="PAYMENTBYBANKTRANSFER_ICS" value="'.$conf->global->PAYMENTBYBANKTRANSFER_ICS.'" size="15" ></td>';
 print '</td></tr>';
+*/
 
 //User
 print '<tr class="oddeven"><td class="fieldrequired">'.$langs->trans("ResponsibleUser").'</td>';
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index c16b5c30c47..601cefc1dd2 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -70,11 +70,14 @@ if ($action == "set")
         $res = dolibarr_set_const($db, "PRELEVEMENT_RAISON_SOCIALE", $account->proprio,'chaine',0,'',$conf->entity);
         if (! $res > 0) $error++;
         */
+
 	} else $error++;
 
+/* Moved to account
+
 	$res = dolibarr_set_const($db, "PRELEVEMENT_ICS", GETPOST("PRELEVEMENT_ICS"), 'chaine', 0, '', $conf->entity);
 	if (!$res > 0) $error++;
-
+*/
 	if (GETPOST("PRELEVEMENT_USER") > 0)
 	{
 		$res = dolibarr_set_const($db, "PRELEVEMENT_USER", GETPOST("PRELEVEMENT_USER"), 'chaine', 0, '', $conf->entity);
@@ -149,13 +152,16 @@ print '<td class="titlefieldcreate">'.$langs->trans("Parameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>";
 
+
 // Bank account (from Banks module)
 print '<tr class="oddeven"><td class="fieldrequired">'.$langs->trans("BankToReceiveWithdraw").'</td>';
 print '<td class="left">';
 $form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT, 'PRELEVEMENT_ID_BANKACCOUNT', 0, "courant=1", 1);
 print '</td></tr>';
 
+/* Moved to bank account data
 // ICS
+
 print '<tr class="oddeven"><td class="fieldrequired">';
 $htmltext = $langs->trans("AskThisIDToYourBank");
 print $form->textwithpicto($langs->trans("ICS"), $htmltext);
@@ -164,6 +170,7 @@ print '<td class="left">';
 print '<input type="text" name="PRELEVEMENT_ICS" value="'.$conf->global->PRELEVEMENT_ICS.'" size="15" >';
 print '</td>';
 print '</td></tr>';
+*/
 
 //User
 print '<tr class="oddeven"><td class="fieldrequired">'.$langs->trans("ResponsibleUser").'</td>';
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 8b086516351..83940f4ac43 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -94,6 +94,9 @@ if ($action == 'add')
 
 	$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
 	$object->owner_address   = trim(GETPOST("owner_address", 'nohtml'));
+	
+	$object->ics             = trim($_POST["ics"]);
+	$object->ics_transfer    = trim($_POST["ics_transfer"]);
 
 	$account_number = GETPOST('account_number', 'alphanohtml');
 	if (empty($account_number) || $account_number == '-1')
@@ -195,6 +198,9 @@ if ($action == 'update')
 
 	$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
 	$object->owner_address   = trim(GETPOST("owner_address", 'nohtml'));
+	
+	$object->ics             = trim($_POST["ics"]);
+	$object->ics_transfer    = trim($_POST["ics_transfer"]);
 
 	$account_number = GETPOST('account_number', 'alpha');
 	if (empty($account_number) || $account_number == '-1')
@@ -730,6 +736,14 @@ if ($action == 'create')
 				}
 			}
 			print '</td></tr>';
+			
+			print '<tr><td>'.$langs->trans("ICS").'</td>';
+			print '<td>'.$object->ics.'</td>';
+			print '</tr>';
+			
+			print '<tr><td>'.$langs->trans("ICSTransfer").'</td>';
+			print '<td>'.$object->ics_transfer.'</td>';
+			print '</tr>';
 
 			print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
 			print nl2br($object->domiciliation);
@@ -1010,7 +1024,13 @@ if ($action == 'create')
 
 			print '<tr><td>'.$langs->trans($bickey).'</td>';
 			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="bic" value="'.$object->bic.'"></td></tr>';
-
+			
+			print '<tr><td>'.$langs->trans("ICS").'</td>';
+			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="ics" value="'.$object->ics.'"></td></tr>';
+			
+			print '<tr><td>'.$langs->trans("ICSTransfer").'</td>';
+			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="ics_transfer" value="'.$object->ics_transfer.'"></td></tr>';
+			
 			print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
 			print '<textarea class="flat quatrevingtpercent" name="domiciliation" rows="'.ROWS_2.'">';
 			print $object->domiciliation;
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index e93491ceee4..0e80b21f644 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2015-2016	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2015-2017	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2016		Ferran Marcet   		<fmarcet@2byte.es>
+ * Copyright (C) 2019		JC Prieto				<jcprieto@virtual20.com><prietojc@gmail.com>
  *
  * 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
@@ -213,6 +214,14 @@ class Account extends CommonObject
 	 * @var int
 	 */
 	public $date_solde;
+	
+	/**
+	 * Creditor Identifier CI and Transfer ICS. Some banks use different ICS for direct debit and bank tranfer
+	 * @var string
+	 */
+	public $ics;
+	public $ics_transfer;
+	
 
 
 	/**
@@ -652,6 +661,8 @@ class Account extends CommonObject
 		$sql .= ", comment";
 		$sql .= ", state_id";
 		$sql .= ", fk_pays";
+		$sql .= ", ics";
+		$sql .= ", ics_transfer";
 		$sql .= ") VALUES (";
 		$sql .= "'".$this->db->idate($now)."'";
 		$sql .= ", '".$this->db->escape($this->ref)."'";
@@ -676,6 +687,8 @@ class Account extends CommonObject
 		$sql .= ", '".$this->db->escape($this->comment)."'";
 		$sql .= ", ".($this->state_id > 0 ? $this->state_id : "null");
 		$sql .= ", ".$this->country_id;
+		$sql .= ", ".$this->db->escape($this->ics);
+		$sql .= ", ".$this->db->escape($this->ics_transfer);
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -804,6 +817,8 @@ class Account extends CommonObject
 
 		$sql .= ",state_id = ".($this->state_id > 0 ? $this->state_id : "null");
 		$sql .= ",fk_pays = ".$this->country_id;
+		$sql .= ",ics='".$this->db->escape($this->ics)."'";
+		$sql .= ",ics_transfer='".$this->db->escape($this->ics_transfer)."'";
 
 		$sql .= " WHERE rowid = ".$this->id;
 
@@ -922,7 +937,7 @@ class Account extends CommonObject
 		$sql .= " ba.domiciliation, ba.proprio, ba.owner_address, ba.state_id, ba.fk_pays as country_id,";
 		$sql .= " ba.account_number, ba.fk_accountancy_journal, ba.currency_code,";
 		$sql .= " ba.min_allowed, ba.min_desired, ba.comment,";
-		$sql .= " ba.datec as date_creation, ba.tms as date_update,";
+		$sql .= " ba.datec as date_creation, ba.tms as date_update, ba.ics, ba.ics_transfer,";
 		$sql .= ' c.code as country_code, c.label as country,';
 		$sql .= ' d.code_departement as state_code, d.nom as state';
 		$sql .= ' , aj.code as accountancy_journal';
@@ -983,6 +998,9 @@ class Account extends CommonObject
 
 				$this->date_creation  = $this->db->jdate($obj->date_creation);
 				$this->date_update    = $this->db->jdate($obj->date_update);
+				
+				$this->ics           = $obj->ics;
+				$this->ics_transfer  = $obj->ics_transfer;
 
 				// Retrieve all extrafield
 				// fetch optionals attributes and labels
diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php
index 78425398017..c6788d0edc6 100644
--- a/htdocs/compta/paymentbybanktransfer/index.php
+++ b/htdocs/compta/paymentbybanktransfer/index.php
@@ -55,7 +55,7 @@ $result = restrictedArea($user, 'paymentbybanktransfer', '', '');
 
 llxHeader('', $langs->trans("SuppliersStandingOrdersArea"));
 
-if (prelevement_check_config() < 0)
+if (prelevement_check_config('bank-transfer') < 0)
 {
 	$langs->load("errors");
 	setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Withdraw")), null, 'errors');
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index bcf0ce8aa5a..24cd58a7601 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2010-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014-2016 Ferran Marcet       <fmarcet@2byte.es>
  * Copyright (C) 2018      Nicolas ZABOURI     <info@inovea-conseil.com>
+ * Copyright (C) 2019		JC Prieto			<jcprieto@virtual20.com><prietojc@gmail.com>
  *
  * 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
@@ -1154,7 +1155,7 @@ class BonPrelevement extends CommonObject
 						$this->emetteur_iban               = $account->iban;
 						$this->emetteur_bic                = $account->bic;
 
-						$this->emetteur_ics                = $conf->global->PRELEVEMENT_ICS; // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
+						$this->emetteur_ics                = ($type == 'bank-transfer' ? $account->ics_transfer : $account->ics); 
 
 						$this->raison_sociale              = $account->proprio;
 					}
@@ -1585,7 +1586,7 @@ class BonPrelevement extends CommonObject
 				fputs($this->file, '				<Id>'.$CrLf);
 				fputs($this->file, '				    <PrvtId>'.$CrLf);
 				fputs($this->file, '					<Othr>'.$CrLf);
-				fputs($this->file, '						<Id>'.$conf->global->PRELEVEMENT_ICS.'</Id>'.$CrLf);
+				fputs($this->file, '						<Id>'.$this->emetteur_ics.'</Id>'.$CrLf);
 				fputs($this->file, '					</Othr>'.$CrLf);
 				fputs($this->file, '				    </PrvtId>'.$CrLf);
 				fputs($this->file, '				</Id>'.$CrLf);
@@ -2126,7 +2127,7 @@ class BonPrelevement extends CommonObject
 			$this->emetteur_iban = $account->iban;
 			$this->emetteur_bic = $account->bic;
 
-			$this->emetteur_ics = $conf->global->PRELEVEMENT_ICS; // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
+			$this->emetteur_ics = $account->ics; // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
 
 			$this->raison_sociale = $account->proprio;
 		}
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index e93b2a7472d..0d29c578a8e 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -49,6 +49,7 @@ $type = GETPOST('type', 'aZ09');
 $action = GETPOST('action', 'aZ09');
 $mode = GETPOST('mode', 'alpha') ?GETPOST('mode', 'alpha') : 'real';
 $format = GETPOST('format', 'aZ09');
+$id_bankaccount = GETPOST ( 'id_bankaccount','int' );
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
@@ -77,11 +78,28 @@ if (empty($reshook))
 	}
 	if ($action == 'create')
 	{
+		$default_account=($type == 'bank-transfer' ? 'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT' : 'PRELEVEMENT_ID_BANKACCOUNT');
+		
+		if($id_bankaccount != $conf->global->{$default_account}){
+			$res = dolibarr_set_const($db, $default_account, $id_bankaccount, 'chaine', 0, '', $conf->entity);	//Set as default
+			
+		}
+		
+		require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+		$bank = new Account($db);
+		$bank->fetch($conf->global->{$default_account});
+		if (empty($bank->ics) || empty($bank->ics_transfer)){
+			setEventMessages($langs->trans("ErrorICSmissing", $bank->getNomUrl(1)), null, 'errors');
+			header("Location: ".DOL_URL_ROOT.'/compta/prelevement/create.php');
+			exit;
+		}
+			
+
 		$delayindays = 0;
 		if ($type != 'bank-transfer') {
-			$conf->global->PRELEVEMENT_ADDDAYS;
+			$delayindays = $conf->global->PRELEVEMENT_ADDDAYS;
 		} else {
-			$conf->global->PAYMENTBYBANKTRANSFER_ADDDAYS;
+			$delayindays = $conf->global->PAYMENTBYBANKTRANSFER_ADDDAYS;
 		}
 		$bprev = new BonPrelevement($db);
 		$executiondate = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), (GETPOST('reday', 'int') + $delayindays), GETPOST('reyear', 'int'));
@@ -128,12 +146,13 @@ $bprev = new BonPrelevement($db);
 
 llxHeader('', $langs->trans("NewStandingOrder"));
 
-if (prelevement_check_config() < 0)
+if (prelevement_check_config($type) < 0)
 {
 	$langs->load("errors");
 	setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Withdraw")), null, 'errors');
 }
 
+
 /*$h=0;
 $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/create.php';
 $head[$h][1] = $langs->trans("NewStandingOrder");
@@ -188,10 +207,16 @@ print '<form action="'.$_SERVER['PHP_SELF'].'?action=create" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="type" value="'.$type.'">';
 if ($nb) {
-	if ($pricetowithdraw) {
-		print $langs->trans('ExecutionDate').' ';
-		$datere = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-		print $form->selectDate($datere, 're');
+
+    if ($pricetowithdraw) {
+    	print $langs->trans('BankToReceiveWithdraw').': ';
+    	$form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT, 'id_bankaccount', 0, "courant=1");
+    	print ' - ';
+    	
+        print $langs->trans('ExecutionDate').' ';
+        $datere = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+        print $form->selectDate($datere, 're');
+
 
 		if ($mysoc->isInEEC()) {
 			$title = $langs->trans("CreateForSepa");
diff --git a/htdocs/core/lib/prelevement.lib.php b/htdocs/core/lib/prelevement.lib.php
index 8008c9fd51f..ac3c7b8b0fd 100644
--- a/htdocs/core/lib/prelevement.lib.php
+++ b/htdocs/core/lib/prelevement.lib.php
@@ -78,13 +78,21 @@ function prelevement_prepare_head(BonPrelevement $object)
 /**
  *	Check need data to create standigns orders receipt file
  *
+ *	@param	string	$type		'bank-transfer' or 'direct-debit'
+ *
  *	@return    	int		-1 if ko 0 if ok
  */
-function prelevement_check_config()
+function prelevement_check_config($type='direct-debit')
 {
-	global $conf;
-	if (empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1;
-	if (empty($conf->global->PRELEVEMENT_ICS)) return -1;
-	if (empty($conf->global->PRELEVEMENT_USER)) return -1;
+	global $conf, $db;
+	if ($type == 'bank-transfer'){
+		if (empty($conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT)) return -1;
+		//if (empty($conf->global->PRELEVEMENT_ICS)) return -1;
+		if (empty($conf->global->PAYMENTBYBANKTRANSFER_USER)) return -1;
+	}else{
+		if (empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1;
+		//if (empty($conf->global->PRELEVEMENT_ICS)) return -1;
+		if (empty($conf->global->PRELEVEMENT_USER)) return -1;
+	}
 	return 0;
 }
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index 2b8987958f4..17f1252925a 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -229,7 +229,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$posY += 2;
 				$pdf->SetXY($this->marge_gauche, $posY);
 				$ics = '';
-				if (!empty($conf->global->PRELEVEMENT_ICS)) $ics = $conf->global->PRELEVEMENT_ICS;
+				if (!empty($conf->global->PRELEVEMENT_ICS)) $ics = $conf->global->PRELEVEMENT_ICS;	
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("CreditorIdentifier").' ('.$outputlangs->transnoentitiesnoconv("ICS").') : '.$ics, 0, 'L');
 
 				$posY = $pdf->GetY();
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index 553e3ac0eaa..c044ba16613 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -131,7 +131,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -145,4 +146,5 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
\ No newline at end of file
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s 
\ No newline at end of file

From eb0fd1674d26a8157ff133173f9177ee6a23e81f Mon Sep 17 00:00:00 2001
From: jcp <jcprieto@virtual20.com>
Date: Mon, 9 Nov 2020 18:39:34 +0100
Subject: [PATCH 08/95] Update ICS

---
 htdocs/compta/prelevement/class/bonprelevement.class.php | 2 +-
 htdocs/install/mysql/tables/llx_bank_account.sql         | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 24cd58a7601..2fff6336985 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -2127,7 +2127,7 @@ class BonPrelevement extends CommonObject
 			$this->emetteur_iban = $account->iban;
 			$this->emetteur_bic = $account->bic;
 
-			$this->emetteur_ics = $account->ics; // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
+			$this->emetteur_ics = ($type == 'bank-transfer' ? $account->ics_transfer : $account->ics);  // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
 
 			$this->raison_sociale = $account->proprio;
 		}
diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql
index 4ac90dd961d..aed803cc7ea 100644
--- a/htdocs/install/mysql/tables/llx_bank_account.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account.sql
@@ -59,5 +59,7 @@ create table llx_bank_account
   note_public				text,
   model_pdf					varchar(255),
   import_key				varchar(14),
-  extraparams			    varchar(255)				-- for other parameters with json format
+  extraparams			    varchar(255),				-- for other parameters with json format
+  ics						varchar(32),			-- Creditor Identifier CI
+  ics_transfer			varchar(32)				-- Creditor Identifier CI for transfer
 )ENGINE=innodb;

From 25fd41fa93023b1e9e4bbc20c5ca52a951d98c68 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 10 Nov 2020 04:17:07 +0100
Subject: [PATCH 09/95] Dev multifilter jounal on ledger (complete)

---
 htdocs/accountancy/bookkeeping/listbyaccount.php | 16 ++++++++++------
 .../accountancy/bookkeeping/listbysubaccount.php | 14 +++++++++-----
 htdocs/accountancy/class/bookkeeping.class.php   |  4 +++-
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 45e8c6aee70..a46a12625fa 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2016       Neil Orley          <neil.orley@oeris.fr>
  * Copyright (C) 2013-2016  Olivier Geffroy     <jeff@jeffinfo.com>
- * Copyright (C) 2013-2016  Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2020  Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2013-2020  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
  *
@@ -22,7 +22,7 @@
 /**
  * \file 		htdocs/accountancy/bookkeeping/listbyaccount.php
  * \ingroup 	Accountancy (Double entries)
- * \brief 		List operation of book keeping ordered by account number
+ * \brief 		List operation of ledger ordered by account number
  */
 
 require '../../main.inc.php';
@@ -56,7 +56,7 @@ $search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 $search_label_operation = GETPOST('search_label_operation', 'alpha');
 $search_mvt_num = GETPOST('search_mvt_num', 'int');
 $search_direction = GETPOST('search_direction', 'alpha');
-$search_ledger_code = GETPOST('search_ledger_code', 'alpha');
+$search_ledger_code = GETPOST('search_ledger_code', 'array');
 $search_debit = GETPOST('search_debit', 'alpha');
 $search_credit = GETPOST('search_credit', 'alpha');
 $search_lettering_code = GETPOST('search_lettering_code', 'alpha');
@@ -151,7 +151,7 @@ if (empty($reshook))
 		$search_label_operation = '';
 		$search_mvt_num = '';
 		$search_direction = '';
-		$search_ledger_code = '';
+		$search_ledger_code = array();
 		$search_date_start = '';
 		$search_date_end = '';
 		$search_date_startyear = '';
@@ -212,7 +212,9 @@ if (empty($reshook))
 	}
 	if (!empty($search_ledger_code)) {
 		$filter['t.code_journal'] = $search_ledger_code;
-		$param .= '&search_ledger_code='.urlencode($search_ledger_code);
+		foreach ($search_ledger_code as $code) {
+			$param .= '&search_ledger_code[]='.urlencode($code);
+		}
 	}
 	if (!empty($search_debit)) {
 		$filter['t.debit'] = $search_debit;
@@ -426,7 +428,9 @@ print '<tr class="liste_titre_filter">';
 
 // Code journal
 if (!empty($arrayfields['t.code_journal']['checked'])) {
-	print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="'.dol_escape_htmltag($search_ledger_code).'"></td>';
+	print '<td class="liste_titre center">';
+	print $formaccounting->multi_select_journal($search_ledger_code, 'search_ledger_code', 0, 1, 1, 1);
+	print '</td>';
 }
 // Date document
 if (!empty($arrayfields['t.doc_date']['checked'])) {
diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
index c286780e572..a7ceeaa2114 100644
--- a/htdocs/accountancy/bookkeeping/listbysubaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2016       Neil Orley          <neil.orley@oeris.fr>
  * Copyright (C) 2013-2016  Olivier Geffroy     <jeff@jeffinfo.com>
- * Copyright (C) 2013-2016  Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2020  Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2013-2020  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  *
@@ -56,7 +56,7 @@ $search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 $search_label_operation = GETPOST('search_label_operation', 'alpha');
 $search_mvt_num = GETPOST('search_mvt_num', 'int');
 $search_direction = GETPOST('search_direction', 'alpha');
-$search_ledger_code = GETPOST('search_ledger_code', 'alpha');
+$search_ledger_code = GETPOST('search_ledger_code', 'array');
 $search_debit = GETPOST('search_debit', 'alpha');
 $search_credit = GETPOST('search_credit', 'alpha');
 $search_lettering_code = GETPOST('search_lettering_code', 'alpha');
@@ -151,7 +151,7 @@ if (empty($reshook))
 		$search_label_operation = '';
 		$search_mvt_num = '';
 		$search_direction = '';
-		$search_ledger_code = '';
+		$search_ledger_code = array();
 		$search_date_start = '';
 		$search_date_end = '';
 		$search_date_startyear = '';
@@ -212,7 +212,9 @@ if (empty($reshook))
 	}
 	if (!empty($search_ledger_code)) {
 		$filter['t.code_journal'] = $search_ledger_code;
-		$param .= '&search_ledger_code='.urlencode($search_ledger_code);
+		foreach ($search_ledger_code as $code) {
+			$param .= '&search_ledger_code[]='.urlencode($code);
+		}
 	}
 	if (!empty($search_debit)) {
 		$filter['t.debit'] = $search_debit;
@@ -423,7 +425,9 @@ print '<tr class="liste_titre_filter">';
 
 // Code journal
 if (!empty($arrayfields['t.code_journal']['checked'])) {
-	print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="'.dol_escape_htmltag($search_ledger_code).'"></td>';
+	print '<td class="liste_titre center">';
+	print $formaccounting->multi_select_journal($search_ledger_code, 'search_ledger_code', 0, 1, 1, 1);
+	print '</td>';
 }
 // Date document
 if (!empty($arrayfields['t.doc_date']['checked'])) {
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 505c51d27fe..fa5df691fdc 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2014-2017  Olivier Geffroy     <jeff@jeffinfo.com>
  * Copyright (C) 2015-2017  Alexandre Spangaro  <aspangaro@open-dsi.fr>
- * Copyright (C) 2015-2017  Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2015-2020  Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2018-2020  Frédéric France     <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -825,6 +825,8 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.credit' || $key == 't.debit') {
 					$sqlwhere[] = natural_search($key, $value, 1, 1);
+                } elseif ($key == 't.code_journal' && !empty($value)) {
+                    $sqlwhere[] = natural_search("t.code_journal", join(',', $value), 3, 1);
 				} else {
 					$sqlwhere[] = natural_search($key, $value, 0, 1);
 				}

From 7e3ef08b253e988d067eeae151ea7211989a4916 Mon Sep 17 00:00:00 2001
From: jcp <jcprieto@virtual20.com>
Date: Tue, 10 Nov 2020 19:14:49 +0100
Subject: [PATCH 10/95] ICS update

---
 htdocs/compta/bank/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 83940f4ac43..1e79b801385 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -1026,10 +1026,10 @@ if ($action == 'create')
 			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="bic" value="'.$object->bic.'"></td></tr>';
 			
 			print '<tr><td>'.$langs->trans("ICS").'</td>';
-			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="ics" value="'.$object->ics.'"></td></tr>';
+			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics" value="'.$object->ics.'"></td></tr>';
 			
 			print '<tr><td>'.$langs->trans("ICSTransfer").'</td>';
-			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="ics_transfer" value="'.$object->ics_transfer.'"></td></tr>';
+			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics_transfer" value="'.$object->ics_transfer.'"></td></tr>';
 			
 			print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
 			print '<textarea class="flat quatrevingtpercent" name="domiciliation" rows="'.ROWS_2.'">';

From 615342aa77d5bc23911ad686010295af535fbf52 Mon Sep 17 00:00:00 2001
From: JC Prieto <jcprieto@virtual20.com>
Date: Thu, 12 Nov 2020 10:32:52 +0100
Subject: [PATCH 11/95] Update account.class.php

Doc on ics_transfer var
---
 htdocs/compta/bank/class/account.class.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 0e80b21f644..ea6491c7636 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -216,10 +216,15 @@ class Account extends CommonObject
 	public $date_solde;
 	
 	/**
-	 * Creditor Identifier CI and Transfer ICS. Some banks use different ICS for direct debit and bank tranfer
+	 * Creditor Identifier CI. Some banks use different ICS for direct debit and bank tranfer
 	 * @var string
 	 */
 	public $ics;
+	
+	/**
+	 * Creditor Identifier for Bank Transfer.
+	 * @var string
+	 */
 	public $ics_transfer;
 	
 

From 10ae18fe44cadd964bf48f66b96af5d994c5020c Mon Sep 17 00:00:00 2001
From: jcp <jcprieto@virtual20.com>
Date: Thu, 12 Nov 2020 19:42:20 +0100
Subject: [PATCH 12/95] Update SQL migration

---
 htdocs/compta/bank/card.php                      | 8 ++++----
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 3 +++
 htdocs/langs/en_US/withdrawals.lang              | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 1e79b801385..469165b4b6e 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -95,8 +95,8 @@ if ($action == 'add')
 	$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
 	$object->owner_address   = trim(GETPOST("owner_address", 'nohtml'));
 	
-	$object->ics             = trim($_POST["ics"]);
-	$object->ics_transfer    = trim($_POST["ics_transfer"]);
+	$object->ics             = trim(GETPOST("ics", 'alpha');
+	$object->ics_transfer    = trim(GETPOST("ics_transfer", 'alpha');
 
 	$account_number = GETPOST('account_number', 'alphanohtml');
 	if (empty($account_number) || $account_number == '-1')
@@ -199,8 +199,8 @@ if ($action == 'update')
 	$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
 	$object->owner_address   = trim(GETPOST("owner_address", 'nohtml'));
 	
-	$object->ics             = trim($_POST["ics"]);
-	$object->ics_transfer    = trim($_POST["ics_transfer"]);
+	$object->ics             = trim(GETPOST("ics", 'alpha');
+	$object->ics_transfer    = trim(GETPOST("ics_transfer", 'alpha');
 
 	$account_number = GETPOST('account_number', 'alpha');
 	if (empty($account_number) || $account_number == '-1')
diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index e0fd93aa005..c55da956241 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -372,6 +372,9 @@ ALTER TABLE llx_bank ADD COLUMN origin_id integer;
 ALTER TABLE llx_bank ADD COLUMN origin_type varchar(64) NULL;
 ALTER TABLE llx_bank ADD COLUMN import_key varchar(14);
 
+ALTER TABLE llx_bank_account ADD COLUMN ics varchar(32) NULL;
+ALTER TABLE llx_bank_account ADD COLUMN ics_transfer varchar(32) NULL;
+
 ALTER TABLE llx_menu MODIFY COLUMN enabled text;
 
 CREATE TABLE llx_ecm_files_extrafields
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index c044ba16613..0f64f8fbece 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -147,4 +147,4 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
-ErrorICSmissing=Missing ICS in Bank account %s 
\ No newline at end of file
+ErrorICSmissing=Missing ICS in Bank account %s 

From a40d63296a1168977c672ac80f7029ba3a475967 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 17 Nov 2020 13:14:16 +0100
Subject: [PATCH 13/95] add good date filter

---
 .../modulebuilder/template/myobject_list.php  | 44 ++++++++++++++++---
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 8e3a4da30e8..49962635fc6 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -115,6 +115,10 @@ $search = array();
 foreach ($object->fields as $key => $val)
 {
 	if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha');
+	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+	}
 }
 
 // List of fields to search into when doing a "search in all"
@@ -185,6 +189,10 @@ if (empty($reshook))
 		foreach ($object->fields as $key => $val)
 		{
 			$search[$key] = '';
+			if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+				$search[$key.'_dtstart'] = '';
+				$search[$key.'_dtend'] = '';
+			}
 		}
 		$toselect = '';
 		$search_array_options = array();
@@ -243,13 +251,27 @@ if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity
 else $sql .= " WHERE 1 = 1";
 foreach ($search as $key => $val)
 {
-	if ($key == 'status' && $search[$key] == -1) continue;
-	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
-	if (strpos($object->fields[$key]['type'], 'integer:') === 0) {
-		if ($search[$key] == '-1') $search[$key] = '';
-		$mode_search = 2;
+	if (in_array($key,$object->fields)) {
+		if ($key == 'status' && $search[$key] == -1) continue;
+		$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
+		if (strpos($object->fields[$key]['type'], 'integer:') === 0) {
+			if ($search[$key] == '-1') $search[$key] = '';
+			$mode_search = 2;
+		}
+		if ($search[$key] != '') $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+	} else {
+		if(preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
+			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
+			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
+				if (preg_match('/_dtstart$/', $key)) {
+					$sql .= " AND t." . $columnName . " >= '" . $db->idate($search[$key]) . "'";
+				}
+				if (preg_match('/_dtend$/', $key)) {
+					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+				}
+			}
+		}
 	}
-	if ($search[$key] != '') $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
 }
 if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 //$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
@@ -434,7 +456,15 @@ foreach ($object->fields as $key => $val)
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
-		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+			print '<div class="nowrap">';
+			print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+			print '</div>';
+			print '<div class="nowrap">';
+			print $form->selectDate($search[$key.'_dtend'] ? $search[$key.'_dtend'] : '', "search_".$key."_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+			print '</div>';
+		}
 		print '</td>';
 	}
 }

From e22c8f76a68fac9dfdf0ed252aba17b1659920b2 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 17 Nov 2020 13:15:50 +0100
Subject: [PATCH 14/95] add good date filter

---
 htdocs/modulebuilder/template/myobject_list.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 49962635fc6..59e7e650572 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -456,8 +456,9 @@ foreach ($object->fields as $key => $val)
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
-		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
-		elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
 			print '<div class="nowrap">';
 			print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 			print '</div>';

From dc5d67e1cd74dcd5344c8c23c0202f914951c2de Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 17 Nov 2020 12:18:27 +0000
Subject: [PATCH 15/95] Fixing style errors.

---
 htdocs/modulebuilder/template/myobject_list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 59e7e650572..289eabbe0ca 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -251,7 +251,7 @@ if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity
 else $sql .= " WHERE 1 = 1";
 foreach ($search as $key => $val)
 {
-	if (in_array($key,$object->fields)) {
+	if (in_array($key, $object->fields)) {
 		if ($key == 'status' && $search[$key] == -1) continue;
 		$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
 		if (strpos($object->fields[$key]['type'], 'integer:') === 0) {
@@ -260,7 +260,7 @@ foreach ($search as $key => $val)
 		}
 		if ($search[$key] != '') $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
 	} else {
-		if(preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
+		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
 			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
 			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
 				if (preg_match('/_dtstart$/', $key)) {

From f273273129526bb0ecaccf2a42932a96166fa449 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 22 Dec 2020 06:57:55 +0100
Subject: [PATCH 16/95] FIX: Accountancy - Retire entire opening balance
 feature

---
 htdocs/accountancy/bookkeeping/balance.php | 46 +++++++++++++++-------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 29e56cd4233..961a012f396 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -77,7 +77,7 @@ $form = new Form($db);
 if (empty($search_date_start) && !GETPOSTISSET('formfilteraction'))
 {
 	$sql = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
-	$sql .= " where date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."'";
+	$sql .= " WHERE date_start < '".$db->idate(dol_now())."' AND date_end > '".$db->idate(dol_now())."'";
 	$sql .= $db->plimit(1);
 	$res = $db->query($sql);
 	if ($res->num_rows > 0) {
@@ -237,7 +237,7 @@ if ($action != 'export_csv')
 	print '<table class="liste '.($moreforfilter ? "listwithfilterbefore" : "").'">';
 
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre" colspan="6">';
+	print '<td class="liste_titre" colspan="5">';
 	print $langs->trans('From');
 	print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, '');
 	print ' ';
@@ -254,7 +254,7 @@ if ($action != 'export_csv')
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("AccountAccounting", $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("Label", $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("OpeningBalance", $_SERVER['PHP_SELF'], "", $param, "", 'class="right"', $sortfield, $sortorder);
+	// print_liste_field_titre("OpeningBalance", $_SERVER['PHP_SELF'], "", $param, "", 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Balance", $_SERVER["PHP_SELF"], "", $param, "", 'class="right"', $sortfield, $sortorder);
@@ -265,10 +265,13 @@ if ($action != 'export_csv')
 	$total_credit = 0;
 	$sous_total_debit = 0;
 	$sous_total_credit = 0;
-	$total_opening_balance = 0;
-	$sous_total_opening_balance = 0;
+	// $total_opening_balance = 0;
+	// $sous_total_opening_balance = 0;
 	$displayed_account = "";
 
+	// TODO Debug - In French accounting, this functionality is dangerous, it takes all the entries and adds all the accounts
+	// without time and class limits (Class 6 and 7 accounts ???) and does not take into account the "a-nouveau" journal.
+	/*
 	$sql = "SELECT t.numero_compte, (SUM(t.debit) - SUM(t.credit)) as opening_balance";
 	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as t";
 	$sql .= " WHERE t.entity = ".$conf->entity;		// Never do sharing into accounting features
@@ -282,6 +285,7 @@ if ($action != 'export_csv')
 		$arr = $resql->fetch_array();
 		$opening_balances["'".$arr['numero_compte']."'"] = $arr['opening_balance'];
 	}
+	*/
 
 	foreach ($object->lines as $line)
 	{
@@ -290,8 +294,8 @@ if ($action != 'export_csv')
 		$total_credit += $line->credit;
 		$description = $object->get_compte_desc($line->numero_compte); // Search description of the account
 		$root_account_description = $object->get_compte_racine($line->numero_compte);
-		$opening_balance = isset($opening_balances["'".$line->numero_compte."'"]) ? $opening_balances["'".$line->numero_compte."'"] : 0;
-		$total_opening_balance += $opening_balance;
+		// $opening_balance = isset($opening_balances["'".$line->numero_compte."'"]) ? $opening_balances["'".$line->numero_compte."'"] : 0;
+		// $total_opening_balance += $opening_balance;
 		if (empty($description)) {
 			$link = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/card.php?action=create&accountingaccount='.length_accountg($line->numero_compte).'">'.img_edit_add().'</a>';
 		}
@@ -302,30 +306,34 @@ if ($action != 'export_csv')
 		{
 			// Display a sub-total per account
 			if ($displayed_account != "") {
-				print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("SubTotal").':</td><td class="nowrap right">'.price($sous_total_opening_balance).'</td><td class="nowrap right">'.price($sous_total_debit).'</td><td class="nowrap right">'.price($sous_total_credit).'</td><td class="nowrap right">'.price(price2num($sous_total_credit - $sous_total_debit)).'</td>';
+				print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("SubTotal").':</td>';
+				// print '<td class="nowrap right">'.price($sous_total_opening_balance).'</td>';
+				print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
+				print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
+				print '<td class="nowrap right">'.price(price2num($sous_total_credit - $sous_total_debit)).'</td>';
 				print "<td>&nbsp;</td>\n";
 				print '</tr>';
 			}
 
 			// Show first line of a break
 			print '<tr class="trforbreak">';
-			print '<td colspan="7" style="font-weight:bold; border-bottom: 1pt solid black;">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
+			print '<td colspan="6" style="font-weight:bold; border-bottom: 1pt solid black;">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
 			print '</tr>';
 
 			$displayed_account = $root_account_description;
 			$sous_total_debit = 0;
 			$sous_total_credit = 0;
-			$sous_total_opening_balance = 0;
+			// $sous_total_opening_balance = 0;
 		}
 
 		// $object->get_compte_racine($line->numero_compte);
 
 		print '<td>'.length_accountg($line->numero_compte).'</td>';
 		print '<td>'.$description.'</td>';
-		print '<td class="nowraponall right">'.price($opening_balance).'</td>';
+		// print '<td class="nowraponall right">'.price($opening_balance).'</td>';
 		print '<td class="nowraponall right">'.price($line->debit).'</td>';
 		print '<td class="nowraponall right">'.price($line->credit).'</td>';
-		print '<td class="nowraponall right">'.price($opening_balance + $line->debit - $line->credit).'</td>';
+		print '<td class="nowraponall right">'.price(/*$opening_balance +*/ $line->debit - $line->credit).'</td>';
 		print '<td class="center">'.$link;
 		print '</td>';
 		print "</tr>\n";
@@ -333,14 +341,22 @@ if ($action != 'export_csv')
 		// Records the sub-total
 		$sous_total_debit += $line->debit;
 		$sous_total_credit += $line->credit;
-		$sous_total_opening_balance += $opening_balance;
+		// $sous_total_opening_balance += $opening_balance;
 	}
 
-	print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("SubTotal").':</td><td class="nowrap right">'.price($sous_total_opening_balance).'</td><td class="nowrap right">'.price($sous_total_debit).'</td><td class="nowrap right">'.price($sous_total_credit).'</td><td class="nowrap right">'.price(price2num($sous_total_opening_balance + $sous_total_debit - $sous_total_credit, 'MT')).'</td>';
+	print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("SubTotal").':</td>';
+	// print '<td class="nowrap right">'.price($sous_total_opening_balance).'</td>';
+	print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
+	print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
+	print '<td class="nowrap right">'.price(price2num(/*$sous_total_opening_balance +*/ $sous_total_debit - $sous_total_credit, 'MT')).'</td>';
 	print "<td>&nbsp;</td>\n";
 	print '</tr>';
 
-	print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("AccountBalance").':</td><td class="nowrap right">'.price($total_opening_balance).'</td><td class="nowrap right">'.price($total_debit).'</td><td class="nowrap right">'.price($total_credit).'</td><td class="nowrap right">'.price(price2num($total_opening_balance + $total_debit - $total_credit, 'MT')).'</td>';
+	print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("AccountBalance").':</td>';
+	// print '<td class="nowrap right">'.price($total_opening_balance).'</td>';
+	print '<td class="nowrap right">'.price($total_debit).'</td>';
+	print '<td class="nowrap right">'.price($total_credit).'</td>';
+	print '<td class="nowrap right">'.price(price2num(/*$total_opening_balance +*/ $total_debit - $total_credit, 'MT')).'</td>';
 	print "<td>&nbsp;</td>\n";
 	print '</tr>';
 

From 1017fad75406340c08cae59dbc835d9d62034640 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Tue, 22 Dec 2020 16:07:07 +0100
Subject: [PATCH 17/95] NEW add form confirm hook on company card

---
 htdocs/societe/card.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 0fc33232c5d..486e68f4d83 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2222,10 +2222,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		print dol_get_fiche_head($head, 'card', $langs->trans("ThirdParty"), -1, 'company');
 
+		$formconfirm = '';
+
 		// Confirm delete third party
 		if ($action == 'delete' || ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)))
 		{
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("DeleteACompany"), $langs->trans("ConfirmDeleteCompany"), "confirm_delete", '', 0, "action-delete");
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("DeleteACompany"), $langs->trans("ConfirmDeleteCompany"), "confirm_delete", '', 0, "action-delete");
 		}
 
 		if ($action == 'merge')
@@ -2239,9 +2241,18 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				)
 			);
 
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("MergeThirdparties"), $langs->trans("ConfirmMergeThirdparties"), "confirm_merge", $formquestion, 'no', 1, 250);
+			$formconfirm .= $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("MergeThirdparties"), $langs->trans("ConfirmMergeThirdparties"), "confirm_merge", $formquestion, 'no', 1, 250);
 		}
 
+		// Call Hook formConfirm
+		$parameters = array('formConfirm' => $formconfirm);
+		$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
+		elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+
+		// Print form confirm
+		print $formconfirm;
+
 		dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';

From 26d3ea222799159229fbd022e633b81a49a444e2 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 23 Dec 2020 23:32:50 +0100
Subject: [PATCH 18/95] on going

---
 htdocs/adherents/class/adherent.class.php | 32 +-----------
 htdocs/contact/class/contact.class.php    | 32 +-----------
 htdocs/contact/list.php                   |  2 +
 htdocs/core/actions_massactions.inc.php   | 62 +++++++++++++++++++++++
 htdocs/core/class/commonobject.class.php  | 48 +++++++++++++-----
 htdocs/core/tpl/massactions_pre.tpl.php   | 36 +++++++++++++
 htdocs/langs/en_US/main.lang              |  5 +-
 htdocs/product/class/product.class.php    | 33 +-----------
 htdocs/societe/class/societe.class.php    | 42 +--------------
 htdocs/societe/list.php                   |  2 +
 htdocs/user/class/user.class.php          | 35 +------------
 htdocs/user/list.php                      |  1 +
 12 files changed, 149 insertions(+), 181 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 5df6db52f3d..b26d45c34e2 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -2585,38 +2585,8 @@ class Adherent extends CommonObject
 	 */
 	public function setCategories($categories)
 	{
-		// Handle single category
-		if (!is_array($categories)) {
-			$categories = array($categories);
-		}
-
-		// Get current categories
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$c = new Categorie($this->db);
-		$existing = $c->containing($this->id, Categorie::TYPE_MEMBER, 'id');
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $categories);
-			$to_add = array_diff($categories, $existing);
-		} else {
-			$to_del = array(); // Nothing to delete
-			$to_add = $categories;
-		}
-
-		// Process
-		foreach ($to_del as $del) {
-			if ($c->fetch($del) > 0) {
-				$c->del_type($this, Categorie::TYPE_MEMBER);
-			}
-		}
-		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0) {
-				$c->add_type($this, Categorie::TYPE_MEMBER);
-			}
-		}
-
-		return;
+		return parent::setCategoriesCommon($categories, Categorie::TYPE_MEMBER);
 	}
 
 	/**
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 367a2e7cd62..8fe4943d267 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -1579,38 +1579,8 @@ class Contact extends CommonObject
 	 */
 	public function setCategories($categories)
 	{
-		// Handle single category
-		if (!is_array($categories)) {
-			$categories = array($categories);
-		}
-
-		// Get current categories
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$c = new Categorie($this->db);
-		$existing = $c->containing($this->id, Categorie::TYPE_CONTACT, 'id');
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $categories);
-			$to_add = array_diff($categories, $existing);
-		} else {
-			$to_del = array(); // Nothing to delete
-			$to_add = $categories;
-		}
-
-		// Process
-		foreach ($to_del as $del) {
-			if ($c->fetch($del) > 0) {
-				$c->del_type($this, Categorie::TYPE_CONTACT);
-			}
-		}
-		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0) {
-				$c->add_type($this, Categorie::TYPE_CONTACT);
-			}
-		}
-
-		return;
+		return parent::setCategoriesCommon($categories, Categorie::TYPE_CONTACT);
 	}
 
 	/**
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 00c74544d17..ecde0faf245 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -277,6 +277,7 @@ if (empty($reshook))
 	$objectlabel = 'Contact';
 	$permissiontoread = $user->rights->societe->lire;
 	$permissiontodelete = $user->rights->societe->supprimer;
+	$permissiontoadd = $user->rights->societe->creer;
 	$uploaddir = $conf->societe->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
@@ -525,6 +526,7 @@ $arrayofmassactions = array(
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
 if ($user->rights->societe->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+if ($user->rights->societe->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
 if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 356eb36a04b..7331a9f40a5 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1291,6 +1291,68 @@ if (!$error && $massaction == 'generate_doc' && $permissiontoread)
 	}
 }
 
+if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd) {
+
+	$db->begin();
+
+	$affecttag_type=GETPOST('affecttag_type','alpha');
+	if (!empty($affecttag_type)) {
+		$affecttag_type_array=explode(',',$affecttag_type);
+	} else {
+		setEventMessage('CategTypeNotFound','errors');
+	}
+	if (!empty($affecttag_type_array)) {
+		//check if tag type submited exists into Tag Map categorie class
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		$categ = new Categorie($db);
+		$to_affecttag_type_array=array();
+		$categ_type_array=$categ->getMapList();
+		foreach($categ_type_array as $categdef) {
+
+			if (in_array($categdef['code'],  $affecttag_type_array)) {
+				$to_affecttag_type_array[] = $categdef['code'];
+			}
+		}
+
+		//For each valid categ type set common categ
+		$nbok = 0;
+		if (!empty($to_affecttag_type_array)) {
+			foreach ($to_affecttag_type_array as $categ_type) {
+				$contcats = GETPOST('contcats_' . $categ_type, 'array');
+var_dump($toselect);exit;
+				foreach ($toselect as $toselectid) {
+					$result = $object->fetch($toselectid);
+					var_dump($contcats);exit;
+					if ($result > 0) {
+
+						$result = $object->setCategoriesCommon($contcats, $categ_type, false);
+						if ($result > 0) {
+							$nbok++;
+						} else {
+							setEventMessages($object->error, $object->errors, 'errors');
+						}
+
+					} else {
+						setEventMessages($object->error, $object->errors, 'errors');
+						$error++;
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	if (!$error)
+	{
+		if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null);
+		else setEventMessages($langs->trans("RecordsModified", $nbok), null);
+		$db->commit();
+		$toselect=array();
+	} else {
+		$db->rollback();
+	}
+}
+
 $parameters['toselect'] = $toselect;
 $parameters['uploaddir'] = $uploaddir;
 $parameters['massaction'] = $massaction;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index bfdea016ea6..f97f583fc87 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8377,18 +8377,26 @@ abstract class CommonObject
 	/**
 	 * Sets object to given categories.
 	 *
-	 * Deletes object from existing categories not supplied.
 	 * Adds it to non existing supplied categories.
+	 * Deletes object from existing categories not supplied (if remove_existing==true).
 	 * Existing categories are left untouch.
 	 *
-	 * @param 	int[]|int 	$categories 	Category ID or array of Categories IDs
-	 * @param 	string 		$type_categ 	Category type ('customer', 'supplier', 'website_page', ...)
+	 * @param 	int[]|int 	$categories 		Category ID or array of Categories IDs
+	 * @param 	string 		$type_categ 		Category type ('customer', 'supplier', 'website_page', ...) definied into const class Categorie type
+	 * @param 	boolean		$remove_existing 	True: Remove existings categories from Object if not supplies by $categories, False: let them
 	 * @return	int							<0 if KO, >0 if OK
 	 */
-	public function setCategoriesCommon($categories, $type_categ)
+	public function setCategoriesCommon($categories, $type_categ='', $remove_existing=true)
 	{
+		dol_syslog(get_class($this)."::setCategoriesCommon Oject Id:".$this->id.' type_categ:'.$type_categ.' nb tag add:'.count($categories), LOG_DEBUG);
+
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
+		if (empty($type_categ)) {
+			dol_syslog(__METHOD__.': Type '.$type_categ.'is an unknown category type. Done nothing.', LOG_ERR);
+			return -1;
+		}
+
 		// Handle single category
 		if (!is_array($categories)) {
 			$categories = array($categories);
@@ -8397,22 +8405,36 @@ abstract class CommonObject
 		// Get current categories
 		$c = new Categorie($this->db);
 		$existing = $c->containing($this->id, $type_categ, 'id');
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $categories);
-			$to_add = array_diff($categories, $existing);
+		if ($remove_existing) {
+			// Diff
+			if (is_array($existing)) {
+				$to_del = array_diff($existing, $categories);
+				$to_add = array_diff($categories, $existing);
+			} else {
+				$to_del = array(); // Nothing to delete
+				$to_add = $categories;
+			}
 		} else {
 			$to_del = array(); // Nothing to delete
-			$to_add = $categories;
+			$to_add = array_diff($categories, $existing);
 		}
 
 		$error = 0;
+		$ok=0;
 
 		// Process
 		foreach ($to_del as $del) {
 			if ($c->fetch($del) > 0) {
-				$c->del_type($this, $type_categ);
+				$result=$c->del_type($this, $type_categ);
+				if ($result < 0)
+				{
+					$error++;
+					$this->error = $c->error;
+					$this->errors = $c->errors;
+					break;
+				} else {
+					$ok+=$result;
+				}
 			}
 		}
 		foreach ($to_add as $add) {
@@ -8425,11 +8447,13 @@ abstract class CommonObject
 					$this->error = $c->error;
 					$this->errors = $c->errors;
 					break;
+				} else {
+					$ok+=$result;
 				}
 			}
 		}
 
-		return $error ? -1 : 1;
+		return $error ? -1 * $error : $ok;
 	}
 
 	/**
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 21070467f57..a5ce87ae932 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -37,6 +37,42 @@ if ($massaction == 'predelete')
 	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDeletion"), $langs->trans("ConfirmMassDeletionQuestion", count($toselect)), "delete", null, '', 0, 200, 500, 1);
 }
 
+if ($massaction == 'preaffecttag')
+{
+	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+	$categ = new Categorie($db);
+	$categ_types=array();
+	$categ_type_array=$categ->getMapList();
+	foreach($categ_type_array as $categdef) {
+		if (isset($object) && $categdef['obj_table']==$object->table_element) {
+			if (!array_key_exists($categdef['code'],$categ_types)) $categ_types[$categdef['code']] = array('code'=>$categdef['code'],'label'=>$langs->trans($categdef['obj_class']));
+		}
+		if (isset($objecttmp) && $categdef['obj_table']==$objecttmp->table_element) {
+			if (!array_key_exists($categdef['code'],$categ_types)) $categ_types[$categdef['code']] = array('code'=>$categdef['code'],'label'=>$langs->trans($categdef['obj_class']));
+		}
+	}
+
+	$formquestion = array();
+	if (!empty($categ_types)) {
+		foreach($categ_types as $categ_type) {
+			$cate_arbo = $form->select_all_categories($categ_type['code'], null, 'parent', null, null, 1);
+			$formquestion[]=
+				array('type' => 'other',
+					'name' => 'affecttag_'.$categ_type['code'],
+					'label' => $langs->trans("Tag").' '.$categ_type['label'],
+					'value' => $form->multiselectarray('contcats_'.$categ_type['code'], $cate_arbo, GETPOST('contcats_'.$categ_type['code'], 'array'), null, null, null, null, '60%'));
+		}
+		$formquestion[]=
+			array('type' => 'other',
+				'name' => 'affecttag_type',
+				'label' => '',
+				'value' => '<input type="hidden" name="affecttag_type"  id="affecttag_type" value="'.implode(",",array_keys($categ_types)).'"/>');
+		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmAffectTag"), $langs->trans("ConfirmAffectTagQuestion", count($toselect)), "affecttag", $formquestion, 1, 0, 200, 500, 1);
+	} else {
+		setEventMessage('CategTypeNotFound');
+	}
+}
+
 if ($massaction == 'presend')
 {
 	$langs->load("mails");
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 7075df90783..07aafadd636 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1112,4 +1112,7 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
-OnHold=On hold
\ No newline at end of file
+OnHold=On hold
+ConfirmAffectTag=Bulk Tag Affect
+ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
+CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index c40ffd4e0a9..4e94380a54f 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -5497,38 +5497,9 @@ class Product extends CommonObject
 	 */
 	public function setCategories($categories)
 	{
-		// Handle single category
-		if (!is_array($categories)) {
-			$categories = array($categories);
-		}
 
-		// Get current categories
-		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$c = new Categorie($this->db);
-		$existing = $c->containing($this->id, Categorie::TYPE_PRODUCT, 'id');
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $categories);
-			$to_add = array_diff($categories, $existing);
-		} else {
-			$to_del = array(); // Nothing to delete
-			$to_add = $categories;
-		}
-
-		// Process
-		foreach ($to_del as $del) {
-			if ($c->fetch($del) > 0) {
-				$c->del_type($this, Categorie::TYPE_PRODUCT);
-			}
-		}
-		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0) {
-				$c->add_type($this, Categorie::TYPE_PRODUCT);
-			}
-		}
-
-		return;
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		return parent::setCategoriesCommon($categories, Categorie::TYPE_PRODUCT);
 	}
 
 	/**
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 0aeb64aa427..70f561acf2a 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -4266,47 +4266,7 @@ class Societe extends CommonObject
 			return -1;
 		}
 
-		// Handle single category
-		if (!is_array($categories)) {
-			$categories = array($categories);
-		}
-
-		// Get current categories
-		$c = new Categorie($this->db);
-		$existing = $c->containing($this->id, $type_categ, 'id');
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $categories);
-			$to_add = array_diff($categories, $existing);
-		} else {
-			$to_del = array(); // Nothing to delete
-			$to_add = $categories;
-		}
-
-		$error = 0;
-
-		// Process
-		foreach ($to_del as $del) {
-			if ($c->fetch($del) > 0) {
-				$c->del_type($this, $type_categ);
-			}
-		}
-		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0)
-			{
-				$result = $c->add_type($this, $type_categ);
-				if ($result < 0)
-				{
-					$error++;
-					$this->error = $c->error;
-					$this->errors = $c->errors;
-					break;
-				}
-			}
-		}
-
-		return $error ? -1 : 1;
+		return parent::setCategoriesCommon($categories, $type_categ);
 	}
 
 	/**
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 2e24f355b37..ffdba17d24d 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -324,6 +324,7 @@ if (empty($reshook))
 	$objectlabel = 'ThirdParty';
 	$permissiontoread = $user->rights->societe->lire;
 	$permissiontodelete = $user->rights->societe->supprimer;
+	$permissiontoadd = $user->rights->societe->creer;
 	$uploaddir = $conf->societe->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
@@ -595,6 +596,7 @@ $arrayofmassactions = array(
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
 if ($user->rights->societe->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+if ($user->rights->societe->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index eb92bd51eb9..7e0c4628250 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1159,40 +1159,7 @@ class User extends CommonObject
 	public function setCategories($categories)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-
-		$type_categ = Categorie::TYPE_USER;
-
-		// Handle single category
-		if (!is_array($categories)) {
-			$categories = array($categories);
-		}
-
-		// Get current categories
-		$c = new Categorie($this->db);
-		$existing = $c->containing($this->id, $type_categ, 'id');
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $categories);
-			$to_add = array_diff($categories, $existing);
-		} else {
-			$to_del = array(); // Nothing to delete
-			$to_add = $categories;
-		}
-
-		// Process
-		foreach ($to_del as $del) {
-			if ($c->fetch($del) > 0) {
-				$c->del_type($this, $type_categ);
-			}
-		}
-		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0) {
-				$c->add_type($this, $type_categ);
-			}
-		}
-
-		return;
+		return parent::setCategoriesCommon($categories, Categorie::TYPE_USER);
 	}
 
 	/**
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index e7a8a31af4e..3e486fb0c70 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -422,6 +422,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 $arrayofmassactions = array();
 if ($permissiontoadd) $arrayofmassactions['disable'] = $langs->trans("DisableUser");
 if ($permissiontoadd) $arrayofmassactions['reactivate'] = $langs->trans("Reactivate");
+if ($permissiontoadd) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
 //if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();

From 055a2b6fec88e201a10b56c67ad27526f85d4506 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 23 Dec 2020 23:44:38 +0100
Subject: [PATCH 19/95] on goung

---
 htdocs/contact/list.php                 | 2 +-
 htdocs/core/actions_massactions.inc.php | 5 ++---
 htdocs/product/list.php                 | 2 ++
 htdocs/user/list.php                    | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index ecde0faf245..7ca0e431c5a 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -267,7 +267,7 @@ if (empty($reshook))
 		$search_categ_thirdparty = '';
 		$search_categ_supplier = '';
 		$search_import_key = '';
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 		$search_roles = array();
 	}
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 7331a9f40a5..abc244ba255 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1308,7 +1308,6 @@ if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd
 		$to_affecttag_type_array=array();
 		$categ_type_array=$categ->getMapList();
 		foreach($categ_type_array as $categdef) {
-
 			if (in_array($categdef['code'],  $affecttag_type_array)) {
 				$to_affecttag_type_array[] = $categdef['code'];
 			}
@@ -1319,10 +1318,10 @@ if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd
 		if (!empty($to_affecttag_type_array)) {
 			foreach ($to_affecttag_type_array as $categ_type) {
 				$contcats = GETPOST('contcats_' . $categ_type, 'array');
-var_dump($toselect);exit;
+				//var_dump($toselect);exit;
 				foreach ($toselect as $toselectid) {
 					$result = $object->fetch($toselectid);
-					var_dump($contcats);exit;
+					//var_dump($contcats);exit;
 					if ($result > 0) {
 
 						$result = $object->setCategoriesCommon($contcats, $categ_type, false);
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 86b8b62fc81..a6b164772ba 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -301,6 +301,7 @@ if (empty($reshook))
 
 	$permissiontoread = $user->rights->produit->lire;
 	$permissiontodelete = $user->rights->produit->supprimer;
+	$permissiontoadd = $user->rights->{$rightskey}->creer;
 	$uploaddir = $conf->product->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
@@ -533,6 +534,7 @@ if ($resql)
 	$rightskey = 'produit';
 	if ($type == Product::TYPE_SERVICE) $rightskey = 'service';
 	if ($user->rights->{$rightskey}->supprimer) $arrayofmassactions['predelete'] = "<span class='fa fa-trash paddingrightonly'></span>".$langs->trans("Delete");
+	if ($user->rights->{$rightskey}->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
 	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 3e486fb0c70..6c43f7e7c6e 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -648,7 +648,7 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
-$arrayofselected = array();
+$arrayofselected = is_array($toselect) ? $toselect : array();
 while ($i < ($limit ? min($num, $limit) : $num))
 {
 	$obj = $db->fetch_object($resql);

From 5ae5f3e7ac6fd072f411205d0987666cfb85003e Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 24 Dec 2020 00:32:54 +0100
Subject: [PATCH 20/95] let societe project acctioncomme website accounr

---
 htdocs/adherents/list.php                        | 2 ++
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 2 +-
 htdocs/langs/en_US/main.lang                     | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 9c9df8e25b5..ed4bf7bdb8b 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -230,6 +230,7 @@ if (empty($reshook)) {
 	$objectlabel = 'Members';
 	$permissiontoread = $user->rights->adherent->lire;
 	$permissiontodelete = $user->rights->adherent->supprimer;
+	$permissiontoadd = $user->rights->adherent->creer;
 	$uploaddir = $conf->adherent->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
@@ -399,6 +400,7 @@ $arrayofmassactions = array(
 );
 if ($user->rights->adherent->creer) $arrayofmassactions['close'] = $langs->trans("Resiliate");
 if ($user->rights->adherent->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+if ($user->rights->societe->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
 if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 309d4d4b170..b5d20b96434 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -543,7 +543,7 @@ CREATE TABLE llx_session(
   fk_user integer NOT NULL,
   remote_ip varchar(64) NULL,
   user_agent varchar(128) NULL
-)ENGINE=innodb;
+) ENGINE=innodb;
 
 INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'github', 'Github', 'https://github.com/{socialid}', 'fa-github', 1);
 
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 07aafadd636..e196120c27d 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1113,6 +1113,7 @@ OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
 OnHold=On hold
+AffectTag=Affect Tag
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records

From 1978e23c5e63e9af73bd78a109136bf2bb57d51b Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 24 Dec 2020 00:48:22 +0100
Subject: [PATCH 21/95] ongoing

---
 htdocs/projet/list.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 988f16a962a..f9190a3404c 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -218,6 +218,7 @@ if (empty($reshook))
 	$objectlabel = 'Project';
 	$permissiontoread = $user->rights->projet->lire;
 	$permissiontodelete = $user->rights->projet->supprimer;
+	$permissiontoadd = $user->rights->projet->creer;
 	$uploaddir = $conf->projet->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
@@ -454,7 +455,8 @@ $arrayofmassactions = array(
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
 if ($user->rights->projet->creer) $arrayofmassactions['close'] = $langs->trans("Close");
-if ($user->rights->societe->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+if ($user->rights->projet->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+if ($user->rights->projet->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
 if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);

From 268618d0456ab9b4a31aa1cd314f8580cd1ee3eb Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 24 Dec 2020 00:53:10 +0100
Subject: [PATCH 22/95] project done

---
 htdocs/projet/class/project.class.php | 44 +--------------------------
 1 file changed, 1 insertion(+), 43 deletions(-)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index f58886c9a3b..4fff4297854 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -2135,50 +2135,8 @@ class Project extends CommonObject
 	 */
 	public function setCategories($categories)
 	{
-		$type_categ = Categorie::TYPE_PROJECT;
-
-		// Handle single category
-		if (!is_array($categories)) {
-			$categories = array($categories);
-		}
-
-		// Get current categories
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$c = new Categorie($this->db);
-		$existing = $c->containing($this->id, $type_categ, 'id');
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $categories);
-			$to_add = array_diff($categories, $existing);
-		} else {
-			$to_del = array(); // Nothing to delete
-			$to_add = $categories;
-		}
-
-		// Process
-		foreach ($to_del as $del) {
-			if ($c->fetch($del) > 0) {
-				$result = $c->del_type($this, $type_categ);
-				if ($result < 0) {
-					$this->errors = $c->errors;
-					$this->error = $c->error;
-					return -1;
-				}
-			}
-		}
-		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0) {
-				$result = $c->add_type($this, $type_categ);
-				if ($result < 0) {
-					$this->errors = $c->errors;
-					$this->error = $c->error;
-					return -1;
-				}
-			}
-		}
-
-		return 1;
+		return parent::setCategoriesCommon($categories, Categorie::TYPE_PROJECT);
 	}
 
 

From e4bd4ce78e8a1d1b1e86e893063629f7c68af3c0 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 24 Dec 2020 00:58:21 +0100
Subject: [PATCH 23/95] stock done

---
 htdocs/product/stock/class/entrepot.class.php | 34 +------------------
 htdocs/product/stock/list.php                 |  6 +++-
 2 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index d7a52cd1910..f975eaabc67 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -890,39 +890,7 @@ class Entrepot extends CommonObject
 	 */
 	public function setCategories($categories)
 	{
-		$type_categ = Categorie::TYPE_WAREHOUSE;
-
-		// Handle single category
-		if (!is_array($categories)) {
-			$categories = array($categories);
-		}
-
-		// Get current categories
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$c = new Categorie($this->db);
-		$existing = $c->containing($this->id, $type_categ, 'id');
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $categories);
-			$to_add = array_diff($categories, $existing);
-		} else {
-			$to_del = array(); // Nothing to delete
-			$to_add = $categories;
-		}
-
-		// Process
-		foreach ($to_del as $del) {
-			if ($c->fetch($del) > 0) {
-				$c->del_type($this, $type_categ);
-			}
-		}
-		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0) {
-				$c->add_type($this, $type_categ);
-			}
-		}
-
-		return;
+		return parent::setCategoriesCommon($categories, Categorie::TYPE_WAREHOUSE);
 	}
 }
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index f2c7133618b..0ff7cf029c7 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -46,6 +46,8 @@ $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'stocklist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$toselect = GETPOST('toselect', 'array');
+
 
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_ref = GETPOST("sref", "alpha") ?GETPOST("sref", "alpha") : GETPOST("search_ref", "alpha");
@@ -160,7 +162,7 @@ if (empty($reshook))
 		{
 			$search[$key] = '';
 		}
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
@@ -174,6 +176,7 @@ if (empty($reshook))
 	$objectlabel = 'Warehouse';
 	$permissiontoread = $user->rights->stock->lire;
 	$permissiontodelete = $user->rights->stock->supprimer;
+	$permissiontoadd = $user->rights->stock->creer;
 	$uploaddir = $conf->stock->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
@@ -344,6 +347,7 @@ $arrayofmassactions = array(
 );
 //if ($user->rights->stock->supprimer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if ($user->rights->stock->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" id="searchFormList" method="POST" name="formulaire">';

From 79fe5ee34ce6085cc70ffd94a199c25e3522465a Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 24 Dec 2020 14:35:40 +0100
Subject: [PATCH 24/95] actioncomm ok

---
 htdocs/comm/action/list.php    | 3 +++
 htdocs/core/lib/agenda.lib.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 2fe47ab39f1..ee0a041aed8 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -233,6 +233,7 @@ if (empty($reshook))
 	$uploaddir = true;
 	// Only users that can delete any event can remove records.
 	$permissiontodelete = $user->rights->agenda->allactions->delete;
+	$permissiontoadd = $user->rights->agenda->myactions->create;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
@@ -297,6 +298,7 @@ if ($user->rights->agenda->allactions->delete)
 	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 }
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if ($user->rights->agenda->myactions->create) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $sql = "SELECT";
@@ -532,6 +534,7 @@ if ($resql)
 
 	print $s;
 
+	$objecttmp = new ActionComm($db);
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 	$moreforfilter = '';
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index fd3ba8c6fb2..8e25deb21cb 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -64,7 +64,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 	print '<input type="hidden" name="year" value="'.$year.'">';
 	print '<input type="hidden" name="month" value="'.$month.'">';
 	print '<input type="hidden" name="day" value="'.$day.'">';
-	if ($massaction != 'predelete') {		// When $massaction == 'predelete', action may be already output to 'delete' by the mass action system.
+	if ($massaction != 'predelete' && $massaction != 'preaffecttag') {		// When $massaction == 'predelete', action may be already output to 'delete' by the mass action system.
 		print '<input type="hidden" name="action" value="'.$action.'">';
 	}
 	print '<input type="hidden" name="search_showbirthday" value="'.$showbirthday.'">';

From f03574d06119f13debaff0a42bc7108ef7c6d417 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 24 Dec 2020 14:56:26 +0100
Subject: [PATCH 25/95] bank ok

---
 htdocs/adherents/list.php                  |  2 +-
 htdocs/comm/action/list.php                |  2 +-
 htdocs/compta/bank/class/account.class.php | 32 +---------------------
 htdocs/compta/bank/list.php                | 31 +++++++++++++--------
 htdocs/contact/list.php                    |  2 +-
 htdocs/product/list.php                    |  2 +-
 htdocs/product/stock/list.php              |  2 +-
 7 files changed, 26 insertions(+), 47 deletions(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index ed4bf7bdb8b..ac9260d091e 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -401,7 +401,7 @@ $arrayofmassactions = array(
 if ($user->rights->adherent->creer) $arrayofmassactions['close'] = $langs->trans("Resiliate");
 if ($user->rights->adherent->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if ($user->rights->societe->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
-if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if (in_array($massaction, array('presend', 'predelete','preaffecttag'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = '';
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index ee0a041aed8..4d863a655b4 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -297,7 +297,7 @@ if ($user->rights->agenda->allactions->delete)
 {
 	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) $arrayofmassactions = array();
 if ($user->rights->agenda->myactions->create) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index b2d499c5f34..db6c950af4a 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1011,38 +1011,8 @@ class Account extends CommonObject
 	 */
 	public function setCategories($categories)
 	{
-		// Handle single category
-		if (!is_array($categories)) {
-			$categories = array($categories);
-		}
-
-		// Get current categories
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$c = new Categorie($this->db);
-		$existing = $c->containing($this->id, Categorie::TYPE_ACCOUNT, 'id');
-
-		// Diff
-		if (is_array($existing)) {
-			$to_del = array_diff($existing, $categories);
-			$to_add = array_diff($categories, $existing);
-		} else {
-			$to_del = array(); // Nothing to delete
-			$to_add = $categories;
-		}
-
-		// Process
-		foreach ($to_del as $del) {
-			if ($c->fetch($del) > 0) {
-				$c->del_type($this, Categorie::TYPE_ACCOUNT);
-			}
-		}
-		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0) {
-				$c->add_type($this, Categorie::TYPE_ACCOUNT);
-			}
-		}
-
-		return;
+		return parent::setCategoriesCommon($categories, Categorie::TYPE_ACCOUNT);
 	}
 
 	/**
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index f3efea15235..1184da6d7ac 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -123,18 +123,26 @@ $parameters = array('socid'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+if (empty($reshook)) {
+	include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
 
-// Purge search criteria
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-{
-	$search_ref = '';
-	$search_label = '';
-	$search_number = '';
-	$search_status = '';
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$search_ref = '';
+		$search_label = '';
+		$search_number = '';
+		$search_status = '';
+	}
+
+	// Mass actions
+	$objectclass = 'Account';
+	$objectlabel = 'FinancialAccount';
+	$permissiontoadd = $user->rights->banque->modifier;
+	$uploaddir = $conf->banque->dir_output;
+	include DOL_DOCUMENT_ROOT . '/core/actions_massactions.inc.php';
 }
 
-
 /*
  * View
  */
@@ -235,7 +243,8 @@ $arrayofmassactions = array(
 //    'builddoc'=>$langs->trans("PDFMerge"),
 );
 if ($user->rights->banque->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if ($user->rights->banque->modifier) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
+if (in_array($massaction, array('presend', 'predelete','preaffecttag'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = dolGetButtonTitle($langs->trans('NewFinancialAccount'), '', 'fa fa-plus-circle', 'card.php?action=create', '', $user->rights->banque->configurer);
@@ -251,7 +260,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="search_status" value="'.$search_status.'">';
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bank_account', 0, $newcardbutton, '', $limit, 1);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bank_account', 0, $newcardbutton, '', $limit, 1);
 
 $topicmail = "Information";
 //$modelmail="subscription";
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 7ca0e431c5a..8d6b11e19f0 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -527,7 +527,7 @@ $arrayofmassactions = array(
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
 if ($user->rights->societe->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if ($user->rights->societe->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
-if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if (in_array($massaction, array('presend', 'predelete','preaffecttag'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = dolGetButtonTitle($langs->trans('NewContactAddress'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/contact/card.php?action=create', '', $user->rights->societe->contact->creer);
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 3830f0bdafb..b0507a83c19 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -536,7 +536,7 @@ if ($resql)
 	);
 	if ($user->rights->{$rightskey}->supprimer) $arrayofmassactions['predelete'] = "<span class='fa fa-trash paddingrightonly'></span>".$langs->trans("Delete");
 	if ($user->rights->{$rightskey}->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
-	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+	if (in_array($massaction, array('presend', 'predelete','preaffecttag'))) $arrayofmassactions = array();
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	$newcardbutton = '';
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 0ff7cf029c7..1470bdc2aa0 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -346,7 +346,7 @@ $arrayofmassactions = array(
 	//'builddoc'=>$langs->trans("PDFMerge"),
 );
 //if ($user->rights->stock->supprimer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) $arrayofmassactions = array();
 if ($user->rights->stock->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 

From c7b4f20f6ed6227cfc88b0b5b93e755d5a6e39d3 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 24 Dec 2020 15:00:26 +0100
Subject: [PATCH 26/95] merge

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

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index ffdba17d24d..f4ddb7e571f 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -597,7 +597,7 @@ $arrayofmassactions = array(
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
 if ($user->rights->societe->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if ($user->rights->societe->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $typefilter = '';

From d3bdb72cc863a035cb80b2e21ff38c0a34113ded Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 24 Dec 2020 15:03:12 +0100
Subject: [PATCH 27/95] finish

---
 htdocs/comm/action/list.php | 2 +-
 htdocs/projet/list.php      | 2 +-
 htdocs/user/list.php        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 4d863a655b4..7fc58b73c9f 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -297,8 +297,8 @@ if ($user->rights->agenda->allactions->delete)
 {
 	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) $arrayofmassactions = array();
 if ($user->rights->agenda->myactions->create) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $sql = "SELECT";
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index f9190a3404c..b246d88de93 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -457,7 +457,7 @@ $arrayofmassactions = array(
 if ($user->rights->projet->creer) $arrayofmassactions['close'] = $langs->trans("Close");
 if ($user->rights->projet->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if ($user->rights->projet->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
-if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if (in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) $arrayofmassactions = array();
 
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 6c43f7e7c6e..acf0f93a1b3 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -425,7 +425,7 @@ if ($permissiontoadd) $arrayofmassactions['reactivate'] = $langs->trans("Reactiv
 if ($permissiontoadd) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
 //if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";

From 7f1d0b9dc29710019351c048dfdf42babf59a2eb Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 24 Dec 2020 14:06:55 +0000
Subject: [PATCH 28/95] Fixing style errors.

---
 htdocs/core/actions_massactions.inc.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index abc244ba255..81cc4d81bd4 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1292,14 +1292,13 @@ if (!$error && $massaction == 'generate_doc' && $permissiontoread)
 }
 
 if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd) {
-
 	$db->begin();
 
-	$affecttag_type=GETPOST('affecttag_type','alpha');
+	$affecttag_type=GETPOST('affecttag_type', 'alpha');
 	if (!empty($affecttag_type)) {
-		$affecttag_type_array=explode(',',$affecttag_type);
+		$affecttag_type_array=explode(',', $affecttag_type);
 	} else {
-		setEventMessage('CategTypeNotFound','errors');
+		setEventMessage('CategTypeNotFound', 'errors');
 	}
 	if (!empty($affecttag_type_array)) {
 		//check if tag type submited exists into Tag Map categorie class
@@ -1307,7 +1306,7 @@ if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd
 		$categ = new Categorie($db);
 		$to_affecttag_type_array=array();
 		$categ_type_array=$categ->getMapList();
-		foreach($categ_type_array as $categdef) {
+		foreach ($categ_type_array as $categdef) {
 			if (in_array($categdef['code'],  $affecttag_type_array)) {
 				$to_affecttag_type_array[] = $categdef['code'];
 			}
@@ -1323,14 +1322,12 @@ if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd
 					$result = $object->fetch($toselectid);
 					//var_dump($contcats);exit;
 					if ($result > 0) {
-
 						$result = $object->setCategoriesCommon($contcats, $categ_type, false);
 						if ($result > 0) {
 							$nbok++;
 						} else {
 							setEventMessages($object->error, $object->errors, 'errors');
 						}
-
 					} else {
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;

From 26791714cee70a00bc05243c49645c0d47ee4cff Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 28 Dec 2020 03:07:33 +0100
Subject: [PATCH 29/95] Fix : Introduce constant
 ACCOUNTANCY_SHOW_OPENING_BALANCE

---
 htdocs/accountancy/bookkeeping/balance.php | 76 +++++++++++++---------
 1 file changed, 47 insertions(+), 29 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 961a012f396..b71c633b1e5 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -237,7 +237,8 @@ if ($action != 'export_csv')
 	print '<table class="liste '.($moreforfilter ? "listwithfilterbefore" : "").'">';
 
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre" colspan="5">';
+	$colspan = (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE) ? 6 : 5);
+	print '<td class="liste_titre" colspan="'.$colspan.'">';
 	print $langs->trans('From');
 	print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, '');
 	print ' ';
@@ -254,7 +255,7 @@ if ($action != 'export_csv')
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("AccountAccounting", $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("Label", $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
-	// print_liste_field_titre("OpeningBalance", $_SERVER['PHP_SELF'], "", $param, "", 'class="right"', $sortfield, $sortorder);
+	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) print_liste_field_titre("OpeningBalance", $_SERVER['PHP_SELF'], "", $param, "", 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Balance", $_SERVER["PHP_SELF"], "", $param, "", 'class="right"', $sortfield, $sortorder);
@@ -265,27 +266,29 @@ if ($action != 'export_csv')
 	$total_credit = 0;
 	$sous_total_debit = 0;
 	$sous_total_credit = 0;
-	// $total_opening_balance = 0;
-	// $sous_total_opening_balance = 0;
+	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
+		$total_opening_balance = 0;
+		$sous_total_opening_balance = 0;
+	}
 	$displayed_account = "";
 
 	// TODO Debug - In French accounting, this functionality is dangerous, it takes all the entries and adds all the accounts
 	// without time and class limits (Class 6 and 7 accounts ???) and does not take into account the "a-nouveau" journal.
-	/*
-	$sql = "SELECT t.numero_compte, (SUM(t.debit) - SUM(t.credit)) as opening_balance";
-	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as t";
-	$sql .= " WHERE t.entity = ".$conf->entity;		// Never do sharing into accounting features
-	$sql .= " AND t.doc_date < '".$db->idate($search_date_start)."'";
-	$sql .= " GROUP BY t.numero_compte";
+	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
+		$sql = "SELECT t.numero_compte, (SUM(t.debit) - SUM(t.credit)) as opening_balance";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as t";
+		$sql .= " WHERE t.entity = " . $conf->entity;        // Never do sharing into accounting features
+		$sql .= " AND t.doc_date < '" . $db->idate($search_date_start) . "'";
+		$sql .= " GROUP BY t.numero_compte";
 
-	$resql = $db->query($sql);
-	$nrows = $resql->num_rows;
-	$opening_balances = array();
-	for ($i = 0; $i < $nrows; $i++) {
-		$arr = $resql->fetch_array();
-		$opening_balances["'".$arr['numero_compte']."'"] = $arr['opening_balance'];
+		$resql = $db->query($sql);
+		$nrows = $resql->num_rows;
+		$opening_balances = array();
+		for ($i = 0; $i < $nrows; $i++) {
+			$arr = $resql->fetch_array();
+			$opening_balances["'" . $arr['numero_compte'] . "'"] = $arr['opening_balance'];
+		}
 	}
-	*/
 
 	foreach ($object->lines as $line)
 	{
@@ -294,8 +297,10 @@ if ($action != 'export_csv')
 		$total_credit += $line->credit;
 		$description = $object->get_compte_desc($line->numero_compte); // Search description of the account
 		$root_account_description = $object->get_compte_racine($line->numero_compte);
-		// $opening_balance = isset($opening_balances["'".$line->numero_compte."'"]) ? $opening_balances["'".$line->numero_compte."'"] : 0;
-		// $total_opening_balance += $opening_balance;
+		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
+			$opening_balance = isset($opening_balances["'".$line->numero_compte."'"]) ? $opening_balances["'".$line->numero_compte."'"] : 0;
+			$total_opening_balance += $opening_balance;
+		}
 		if (empty($description)) {
 			$link = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/card.php?action=create&accountingaccount='.length_accountg($line->numero_compte).'">'.img_edit_add().'</a>';
 		}
@@ -307,7 +312,7 @@ if ($action != 'export_csv')
 			// Display a sub-total per account
 			if ($displayed_account != "") {
 				print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("SubTotal").':</td>';
-				// print '<td class="nowrap right">'.price($sous_total_opening_balance).'</td>';
+				if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) print '<td class="nowrap right">'.price($sous_total_opening_balance).'</td>';
 				print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
 				print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
 				print '<td class="nowrap right">'.price(price2num($sous_total_credit - $sous_total_debit)).'</td>';
@@ -317,23 +322,28 @@ if ($action != 'export_csv')
 
 			// Show first line of a break
 			print '<tr class="trforbreak">';
-			print '<td colspan="6" style="font-weight:bold; border-bottom: 1pt solid black;">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
+			$colspan = (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE) ? 7 : 6);
+			print '<td colspan="'.$colspan.'" style="font-weight:bold; border-bottom: 1pt solid black;">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
 			print '</tr>';
 
 			$displayed_account = $root_account_description;
 			$sous_total_debit = 0;
 			$sous_total_credit = 0;
-			// $sous_total_opening_balance = 0;
+			if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) $sous_total_opening_balance = 0;
 		}
 
 		// $object->get_compte_racine($line->numero_compte);
 
 		print '<td>'.length_accountg($line->numero_compte).'</td>';
 		print '<td>'.$description.'</td>';
-		// print '<td class="nowraponall right">'.price($opening_balance).'</td>';
+		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) print '<td class="nowraponall right">'.price($opening_balance).'</td>';
 		print '<td class="nowraponall right">'.price($line->debit).'</td>';
 		print '<td class="nowraponall right">'.price($line->credit).'</td>';
-		print '<td class="nowraponall right">'.price(/*$opening_balance +*/ $line->debit - $line->credit).'</td>';
+		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
+			print '<td class="nowraponall right">'.price($opening_balance + $line->debit - $line->credit).'</td>';
+		} else {
+			print '<td class="nowraponall right">'.price($line->debit - $line->credit).'</td>';
+		}
 		print '<td class="center">'.$link;
 		print '</td>';
 		print "</tr>\n";
@@ -341,22 +351,30 @@ if ($action != 'export_csv')
 		// Records the sub-total
 		$sous_total_debit += $line->debit;
 		$sous_total_credit += $line->credit;
-		// $sous_total_opening_balance += $opening_balance;
+		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) $sous_total_opening_balance += $opening_balance;
 	}
 
 	print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("SubTotal").':</td>';
-	// print '<td class="nowrap right">'.price($sous_total_opening_balance).'</td>';
+	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) print '<td class="nowrap right">'.price($sous_total_opening_balance).'</td>';
 	print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
 	print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
-	print '<td class="nowrap right">'.price(price2num(/*$sous_total_opening_balance +*/ $sous_total_debit - $sous_total_credit, 'MT')).'</td>';
+	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
+		print '<td class="nowrap right">' . price(price2num($sous_total_opening_balance + $sous_total_debit - $sous_total_credit, 'MT')) . '</td>';
+	} else {
+		print '<td class="nowrap right">' . price(price2num($sous_total_debit - $sous_total_credit, 'MT')) . '</td>';
+	}
 	print "<td>&nbsp;</td>\n";
 	print '</tr>';
 
 	print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("AccountBalance").':</td>';
-	// print '<td class="nowrap right">'.price($total_opening_balance).'</td>';
+	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) print '<td class="nowrap right">'.price($total_opening_balance).'</td>';
 	print '<td class="nowrap right">'.price($total_debit).'</td>';
 	print '<td class="nowrap right">'.price($total_credit).'</td>';
-	print '<td class="nowrap right">'.price(price2num(/*$total_opening_balance +*/ $total_debit - $total_credit, 'MT')).'</td>';
+	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
+		print '<td class="nowrap right">' . price(price2num($total_opening_balance + $total_debit - $total_credit, 'MT')) . '</td>';
+	} else {
+		print '<td class="nowrap right">' . price(price2num($total_debit - $total_credit, 'MT')) . '</td>';
+	}
 	print "<td>&nbsp;</td>\n";
 	print '</tr>';
 

From 1e438b686ecf87ee4baa74f5314a94bdae0bb633 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 28 Dec 2020 21:32:46 +0100
Subject: [PATCH 30/95] fix stickler

---
 htdocs/core/class/commonobject.class.php |  2 +-
 htdocs/core/tpl/massactions_pre.tpl.php  | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 95af26992cb..0a9b7838e97 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8393,7 +8393,7 @@ abstract class CommonObject
 	 * @param 	boolean		$remove_existing 	True: Remove existings categories from Object if not supplies by $categories, False: let them
 	 * @return	int							<0 if KO, >0 if OK
 	 */
-	public function setCategoriesCommon($categories, $type_categ='', $remove_existing=true)
+	public function setCategoriesCommon($categories, $type_categ = '', $remove_existing = true)
 	{
 		dol_syslog(get_class($this)."::setCategoriesCommon Oject Id:".$this->id.' type_categ:'.$type_categ.' nb tag add:'.count($categories), LOG_DEBUG);
 
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index a5ce87ae932..f79abfe9c42 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -43,18 +43,18 @@ if ($massaction == 'preaffecttag')
 	$categ = new Categorie($db);
 	$categ_types=array();
 	$categ_type_array=$categ->getMapList();
-	foreach($categ_type_array as $categdef) {
+	foreach ($categ_type_array as $categdef) {
 		if (isset($object) && $categdef['obj_table']==$object->table_element) {
-			if (!array_key_exists($categdef['code'],$categ_types)) $categ_types[$categdef['code']] = array('code'=>$categdef['code'],'label'=>$langs->trans($categdef['obj_class']));
+			if (!array_key_exists($categdef['code'], $categ_types)) $categ_types[$categdef['code']] = array('code'=>$categdef['code'],'label'=>$langs->trans($categdef['obj_class']));
 		}
 		if (isset($objecttmp) && $categdef['obj_table']==$objecttmp->table_element) {
-			if (!array_key_exists($categdef['code'],$categ_types)) $categ_types[$categdef['code']] = array('code'=>$categdef['code'],'label'=>$langs->trans($categdef['obj_class']));
+			if (!array_key_exists($categdef['code'], $categ_types)) $categ_types[$categdef['code']] = array('code'=>$categdef['code'],'label'=>$langs->trans($categdef['obj_class']));
 		}
 	}
 
 	$formquestion = array();
 	if (!empty($categ_types)) {
-		foreach($categ_types as $categ_type) {
+		foreach ($categ_types as $categ_type) {
 			$cate_arbo = $form->select_all_categories($categ_type['code'], null, 'parent', null, null, 1);
 			$formquestion[]=
 				array('type' => 'other',
@@ -66,7 +66,7 @@ if ($massaction == 'preaffecttag')
 			array('type' => 'other',
 				'name' => 'affecttag_type',
 				'label' => '',
-				'value' => '<input type="hidden" name="affecttag_type"  id="affecttag_type" value="'.implode(",",array_keys($categ_types)).'"/>');
+				'value' => '<input type="hidden" name="affecttag_type"  id="affecttag_type" value="'.implode(",", array_keys($categ_types)).'"/>');
 		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmAffectTag"), $langs->trans("ConfirmAffectTagQuestion", count($toselect)), "affecttag", $formquestion, 1, 0, 200, 500, 1);
 	} else {
 		setEventMessage('CategTypeNotFound');
@@ -83,8 +83,7 @@ if ($massaction == 'presend')
 
 	if (!GETPOST('cancel', 'alpha'))
 	{
-		foreach ($arrayofselected as $toselectid)
-		{
+		foreach ($arrayofselected as $toselectid) {
 			$result = $objecttmp->fetch($toselectid);
 			if ($result > 0)
 			{

From b3dae016afd4fc8ef32aad7262b0101398ee27a0 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 28 Dec 2020 21:38:17 +0100
Subject: [PATCH 31/95] fix sticker

---
 htdocs/core/tpl/massactions_pre.tpl.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index f79abfe9c42..7c6ab6deaa5 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -56,14 +56,12 @@ if ($massaction == 'preaffecttag')
 	if (!empty($categ_types)) {
 		foreach ($categ_types as $categ_type) {
 			$cate_arbo = $form->select_all_categories($categ_type['code'], null, 'parent', null, null, 1);
-			$formquestion[]=
-				array('type' => 'other',
+			$formquestion[]=array('type' => 'other',
 					'name' => 'affecttag_'.$categ_type['code'],
 					'label' => $langs->trans("Tag").' '.$categ_type['label'],
 					'value' => $form->multiselectarray('contcats_'.$categ_type['code'], $cate_arbo, GETPOST('contcats_'.$categ_type['code'], 'array'), null, null, null, null, '60%'));
 		}
-		$formquestion[]=
-			array('type' => 'other',
+		$formquestion[]=array('type' => 'other',
 				'name' => 'affecttag_type',
 				'label' => '',
 				'value' => '<input type="hidden" name="affecttag_type"  id="affecttag_type" value="'.implode(",", array_keys($categ_types)).'"/>');

From 3fe495756be00966aa18de72a0afd963f0df4833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 29 Dec 2020 21:44:41 +0100
Subject: [PATCH 32/95] add $fields in paymentsalary class

---
 htdocs/salaries/class/paymentsalary.class.php | 296 +++++++++---------
 htdocs/salaries/list.php                      | 270 ++++++++++------
 2 files changed, 323 insertions(+), 243 deletions(-)

diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 6aee986396b..83371cd6f24 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -88,6 +88,10 @@ class PaymentSalary extends CommonObject
 	 */
 	public $fk_user_modif;
 
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields = array();
 
 	/**
 	 *	Constructor
@@ -120,8 +124,7 @@ class PaymentSalary extends CommonObject
 		$this->note = trim($this->note);
 
 		// Check parameters
-		if (empty($this->fk_user) || $this->fk_user < 0)
-		{
+		if (empty($this->fk_user) || $this->fk_user < 0) {
 			$this->error = 'ErrorBadParameter';
 			return -1;
 		}
@@ -151,35 +154,29 @@ class PaymentSalary extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 
 		// Update extrafield
-		if (!$error)
-		{
-			if (!$error)
-			{
-				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
-					$error++;
-				}
+		if (!$error) {
+			$result = $this->insertExtraFields();
+			if ($result < 0) {
+				$error++;
 			}
 		}
 
-		if (!$notrigger)
-		{
+		if (!$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('PAYMENT_SALARY_MODIFY', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -227,26 +224,24 @@ class PaymentSalary extends CommonObject
 
 		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->id = $obj->rowid;
-				$this->ref				= $obj->rowid;
-				$this->tms				= $this->db->jdate($obj->tms);
+				$this->ref = $obj->rowid;
+				$this->tms = $this->db->jdate($obj->tms);
 				$this->fk_user = $obj->fk_user;
-				$this->datep			= $this->db->jdate($obj->datep);
-				$this->datev			= $this->db->jdate($obj->datev);
+				$this->datep = $this->db->jdate($obj->datep);
+				$this->datev = $this->db->jdate($obj->datev);
 				$this->amount = $obj->amount;
 				$this->fk_project = $obj->fk_project;
 				$this->type_payement = $obj->fk_typepayment;
 				$this->num_payment = $obj->num_payment;
-				$this->label			= $obj->label;
-				$this->datesp			= $this->db->jdate($obj->datesp);
-				$this->dateep			= $this->db->jdate($obj->dateep);
-				$this->note				= $obj->note;
+				$this->label = $obj->label;
+				$this->datesp = $this->db->jdate($obj->datesp);
+				$this->dateep = $this->db->jdate($obj->dateep);
+				$this->note = $obj->note;
 				$this->fk_bank = $obj->fk_bank;
 				$this->fk_user_author = $obj->fk_user_author;
 				$this->fk_user_modif = $obj->fk_user_modif;
@@ -282,18 +277,18 @@ class PaymentSalary extends CommonObject
 
 		// Call trigger
 		$result = $this->call_trigger('PAYMENT_SALARY_DELETE', $user);
-		if ($result < 0) return -1;
+		if ($result < 0) {
+			return -1;
+		}
 		// End call triggers
 
 		// Delete donation
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_salary_extrafields";
 			$sql .= " WHERE fk_object=".$this->id;
 
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->lasterror();
 				$error++;
 			}
@@ -304,8 +299,7 @@ class PaymentSalary extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -326,7 +320,7 @@ class PaymentSalary extends CommonObject
 		$this->id = 0;
 
 		$this->tms = '';
-		$this->fk_user = '';
+		$this->fk_user = 1;
 		$this->datep = '';
 		$this->datev = '';
 		$this->amount = '';
@@ -335,8 +329,8 @@ class PaymentSalary extends CommonObject
 		$this->dateep = '';
 		$this->note = '';
 		$this->fk_bank = '';
-		$this->fk_user_author = '';
-		$this->fk_user_modif = '';
+		$this->fk_user_author = 1;
+		$this->fk_user_modif = 1;
 	}
 
 	/**
@@ -356,34 +350,29 @@ class PaymentSalary extends CommonObject
 		$this->amount = price2num(trim($this->amount));
 		$this->label = trim($this->label);
 		$this->note = trim($this->note);
-		$this->fk_bank = trim($this->fk_bank);
-		$this->fk_user_author = trim($this->fk_user_author);
-		$this->fk_user_modif = trim($this->fk_user_modif);
+		$this->fk_bank = (int) $this->fk_bank;
+		$this->fk_user_author = (int) $this->fk_user_author;
+		$this->fk_user_modif = (int) $this->fk_user_modif;
 
 		// Check parameters
-		if (!$this->label)
-		{
-			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
+		if (!$this->label) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
 			return -3;
 		}
-		if ($this->fk_user < 0 || $this->fk_user == '')
-		{
-			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Employee"));
+		if ($this->fk_user <= 0 || $this->fk_user == '') {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Employee"));
 			return -4;
 		}
-		if ($this->amount < 0 || $this->amount == '')
-		{
-			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
+		if ($this->amount < 0 || $this->amount == '') {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
 			return -5;
 		}
-		if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
-		{
-			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
+		if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
 			return -6;
 		}
-		if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0))
-		{
-			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
+		if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
 			return -7;
 		}
 
@@ -398,7 +387,9 @@ class PaymentSalary extends CommonObject
 		$sql .= ", salary";
 		$sql .= ", fk_typepayment";
 		$sql .= ", num_payment";
-		if ($this->note) $sql .= ", note";
+		if ($this->note) {
+			$sql .= ", note";
+		}
 		$sql .= ", label";
 		$sql .= ", datesp";
 		$sql .= ", dateep";
@@ -416,7 +407,9 @@ class PaymentSalary extends CommonObject
 		$sql .= ", ".($this->salary > 0 ? $this->salary : "null");
 		$sql .= ", ".$this->db->escape($this->type_payment);
 		$sql .= ", '".$this->db->escape($this->num_payment)."'";
-		if ($this->note) $sql .= ", '".$this->db->escape($this->note)."'";
+		if ($this->note) {
+			$sql .= ", '".$this->db->escape($this->note)."'";
+		}
 		$sql .= ", '".$this->db->escape($this->label)."'";
 		$sql .= ", '".$this->db->idate($this->datesp)."'";
 		$sql .= ", '".$this->db->idate($this->dateep)."'";
@@ -428,30 +421,25 @@ class PaymentSalary extends CommonObject
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_salary");
 
-			if ($this->id > 0)
-			{
-				if (!empty($conf->banque->enabled) && !empty($this->amount))
-				{
+			if ($this->id > 0) {
+				if (!empty($conf->banque->enabled) && !empty($this->amount)) {
 					// Insert into llx_bank
 					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 					$acc = new Account($this->db);
 					$result = $acc->fetch($this->accountid);
-					if ($result <= 0) dol_print_error($this->db);
+					if ($result <= 0) {
+						dol_print_error($this->db);
+					}
 
 					// Update extrafield
 					if (!$error) {
-						if (!$error)
-						{
-							$result = $this->insertExtraFields();
-							if ($result < 0)
-							{
-								$error++;
-							}
+						$result = $this->insertExtraFields();
+						if ($result < 0) {
+							$error++;
 						}
 					}
 
@@ -473,22 +461,19 @@ class PaymentSalary extends CommonObject
 
 					// Update fk_bank into llx_paiement.
 					// So we know the payment which has generate the banking ecriture
-					if ($bank_line_id > 0)
-					{
+					if ($bank_line_id > 0) {
 						$this->update_fk_bank($bank_line_id);
 					} else {
 						$this->error = $acc->error;
 						$error++;
 					}
 
-					if (!$error)
-					{
+					if (!$error) {
 						// Add link 'payment_salary' in bank_url between payment and bank transaction
 						$url = DOL_URL_ROOT.'/salaries/card.php?id=';
 
 						$result = $acc->add_url_line($bank_line_id, $this->id, $url, "(SalaryPayment)", "payment_salary");
-						if ($result <= 0)
-						{
+						if ($result <= 0) {
 							$this->error = $acc->error;
 							$error++;
 						}
@@ -507,8 +492,7 @@ class PaymentSalary extends CommonObject
 						'user'
 					);
 
-					if ($result <= 0)
-					{
+					if ($result <= 0) {
 						$this->error = $acc->error;
 						$error++;
 					}
@@ -516,12 +500,15 @@ class PaymentSalary extends CommonObject
 
 				// Call trigger
 				$result = $this->call_trigger('PAYMENT_SALARY_CREATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
-			} else $error++;
+			} else {
+				$error++;
+			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return $this->id;
 			} else {
@@ -548,8 +535,7 @@ class PaymentSalary extends CommonObject
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'payment_salary SET fk_bank = '.$id_bank;
 		$sql .= ' WHERE rowid = '.$this->id;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			return 1;
 		} else {
 			dol_print_error($this->db);
@@ -574,7 +560,9 @@ class PaymentSalary extends CommonObject
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
 		global $menumanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 
@@ -583,10 +571,11 @@ class PaymentSalary extends CommonObject
 		if (!empty($this->label)) {
 			$labeltoshow = $this->label;
 			$reg = array();
-			if (preg_match('/^\((.*)\)$/i', $this->label, $reg))
-			{
+			if (preg_match('/^\((.*)\)$/i', $this->label, $reg)) {
 				// Label generique car entre parentheses. On l'affiche en le traduisant
-				if ($reg[1] == 'paiement') $reg[1] = 'Payment';
+				if ($reg[1] == 'paiement') {
+					$reg[1] = 'Payment';
+				}
 				$labeltoshow = $langs->trans($reg[1]);
 			}
 			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$labeltoshow;
@@ -594,19 +583,20 @@ class PaymentSalary extends CommonObject
 
 		$url = DOL_URL_ROOT.'/salaries/card.php?id='.$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';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -614,20 +604,26 @@ class PaymentSalary extends CommonObject
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
 			/*
-             $hookmanager->initHooks(array('myobjectdao'));
-             $parameters=array('id'=>$this->id);
-             $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-             if ($reshook > 0) $linkclose = $hookmanager->resPrint;
-             */
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+			 $hookmanager->initHooks(array('myobjectdao'));
+			 $parameters=array('id'=>$this->id);
+			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+			 */
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
@@ -635,8 +631,11 @@ class PaymentSalary extends CommonObject
 		$hookmanager->initHooks(array('salarypayment'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -656,14 +655,11 @@ class PaymentSalary extends CommonObject
 		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;
@@ -703,40 +699,40 @@ class PaymentSalary extends CommonObject
 
 		$langs->load('compta');
 		/*if ($mode == 0)
-        {
-            if ($status == 0) return $langs->trans('ToValidate');
-            if ($status == 1) return $langs->trans('Validated');
-        }
-        if ($mode == 1)
-        {
-            if ($status == 0) return $langs->trans('ToValidate');
-            if ($status == 1) return $langs->trans('Validated');
-        }
-        if ($mode == 2)
-        {
-            if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1').' '.$langs->trans('ToValidate');
-            if ($status == 1) return img_picto($langs->trans('Validated'),'statut4').' '.$langs->trans('Validated');
-        }
-        if ($mode == 3)
-        {
-            if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1');
-            if ($status == 1) return img_picto($langs->trans('Validated'),'statut4');
-        }
-        if ($mode == 4)
-        {
-            if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1').' '.$langs->trans('ToValidate');
-            if ($status == 1) return img_picto($langs->trans('Validated'),'statut4').' '.$langs->trans('Validated');
-        }
-        if ($mode == 5)
-        {
-            if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
-            if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
-        }
-        if ($mode == 6)
-        {
-            if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
-            if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
-        }*/
+		{
+			if ($status == 0) return $langs->trans('ToValidate');
+			if ($status == 1) return $langs->trans('Validated');
+		}
+		if ($mode == 1)
+		{
+			if ($status == 0) return $langs->trans('ToValidate');
+			if ($status == 1) return $langs->trans('Validated');
+		}
+		if ($mode == 2)
+		{
+			if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1').' '.$langs->trans('ToValidate');
+			if ($status == 1) return img_picto($langs->trans('Validated'),'statut4').' '.$langs->trans('Validated');
+		}
+		if ($mode == 3)
+		{
+			if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1');
+			if ($status == 1) return img_picto($langs->trans('Validated'),'statut4');
+		}
+		if ($mode == 4)
+		{
+			if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1').' '.$langs->trans('ToValidate');
+			if ($status == 1) return img_picto($langs->trans('Validated'),'statut4').' '.$langs->trans('Validated');
+		}
+		if ($mode == 5)
+		{
+			if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
+			if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
+		}
+		if ($mode == 6)
+		{
+			if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
+			if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
+		}*/
 		return '';
 	}
 }
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index b8a0ba69ef7..8d253e6799a 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -26,7 +26,9 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "salaries", "bills", "hrm"));
@@ -46,12 +48,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "s.datep,s.rowid";
-if (!$sortorder) $sortorder = "DESC,DESC";
+if (!$sortfield) {
+	$sortfield = "s.datep,s.rowid";
+}
+if (!$sortorder) {
+	$sortorder = "DESC,DESC";
+}
 
 // Initialize technical objects
 $object = new PaymentSalary($db);
@@ -64,8 +72,12 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-if (!$sortfield) $sortfield = "s.datep,s.rowid";
-if (!$sortorder) $sortorder = "DESC,DESC";
+if (!$sortfield) {
+	$sortfield = "s.datep,s.rowid";
+}
+if (!$sortorder) {
+	$sortorder = "DESC,DESC";
+}
 
 $search_ref = GETPOST('search_ref', 'int');
 $search_user = GETPOST('search_user', 'alpha');
@@ -77,14 +89,14 @@ $search_account = GETPOST('search_account', 'int');
 
 $filtre = GETPOST("filtre", 'restricthtml');
 
-if (!GETPOST('search_type_id', 'int'))
-{
+if (!GETPOST('search_type_id', 'int')) {
 	$newfiltre = str_replace('filtre=', '', $filtre);
 	$filterarray = explode('-', $newfiltre);
-	foreach ($filterarray as $val)
-	{
+	foreach ($filterarray as $val) {
 		$part = explode(':', $val);
-		if ($part[0] == 's.fk_typepayment') $search_type_id = $part[1];
+		if ($part[0] == 's.fk_typepayment') {
+			$search_type_id = $part[1];
+		}
 	}
 } else {
 	$search_type_id = GETPOST('search_type_id', 'int');
@@ -94,22 +106,27 @@ $childids = $user->getAllChildIds(1);
 
 // Security check
 $socid = GETPOST("socid", "int");
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'salaries', '', '', '');
 
 // Initialize array of search criterias
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
-foreach ($object->fields as $key => $val)
-{
-	if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha');
+var_dump($object->fields);
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_'.$key, 'alpha') !== '') {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
 }
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
-foreach ($object->fields as $key => $val)
-{
-	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
+foreach ($object->fields as $key => $val) {
+	if ($val['searchall']) {
+		$fieldstosearchall['t.'.$key] = $val['label'];
+	}
 }
 
 $permissiontoread = $user->rights->salaries->read;
@@ -121,21 +138,25 @@ $permissiontodelete = $user->rights->salaries->delete;
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
 		$search_ref = "";
 		$search_user = "";
 		$search_label = "";
@@ -146,8 +167,7 @@ if (empty($reshook))
 		$search_type_id = "";
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
-		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
-	{
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
 		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
 	}
 
@@ -158,8 +178,7 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 	// Validate records
-	if (!$error && $massaction == 'buildsepa' && $permissiontoadd)
-	{
+	if (!$error && $massaction == 'buildsepa' && $permissiontoadd) {
 		$objecttmp = new $objectclass($db);
 
 		// TODO
@@ -192,16 +211,32 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.ro
 $sql .= " ".MAIN_DB_PREFIX."user as u";
 $sql .= " WHERE u.rowid = s.fk_user";
 $sql .= " AND s.entity IN (".getEntity('payment_salaries').")";
-if (empty($user->rights->salaries->readall)) $sql .= " AND s.fk_user IN (".join(',', $childids).")";
+if (empty($user->rights->salaries->readall)) {
+	$sql .= " AND s.fk_user IN (".join(',', $childids).")";
+}
 
 // Search criteria
-if ($search_ref)			$sql .= " AND s.rowid=".((int) $search_ref);
-if ($search_user)			$sql .= natural_search(array('u.login', 'u.lastname', 'u.firstname', 'u.email'), $search_user);
-if ($search_label)			$sql .= natural_search(array('s.label'), $search_label);
-if ($search_date_start)     $sql .= " AND s.datep >= '".$db->idate($search_date_start)."'";
-if ($search_date_end)		$sql .= " AND s.datep <= '".$db->idate($search_date_end)."'";
-if ($search_amount)			$sql .= natural_search("s.amount", $search_amount, 1);
-if ($search_account > 0)	$sql .= " AND b.fk_account=".((int) $search_account);
+if ($search_ref) {
+	$sql .= " AND s.rowid=".((int) $search_ref);
+}
+if ($search_user) {
+	$sql .= natural_search(array('u.login', 'u.lastname', 'u.firstname', 'u.email'), $search_user);
+}
+if ($search_label) {
+	$sql .= natural_search(array('s.label'), $search_label);
+}
+if ($search_date_start) {
+	$sql .= " AND s.datep >= '".$db->idate($search_date_start)."'";
+}
+if ($search_date_end) {
+	$sql .= " AND s.datep <= '".$db->idate($search_date_end)."'";
+}
+if ($search_amount) {
+	$sql .= natural_search("s.amount", $search_amount, 1);
+}
+if ($search_account > 0) {
+	$sql .= " AND b.fk_account=".((int) $search_account);
+}
 if ($filtre) {
 	$filtre = str_replace(":", "=", $filtre);
 	$sql .= " AND ".$filtre;
@@ -213,26 +248,24 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$resql = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($resql);
-	if (($page * $limit) > $nbtotalofrecords)	// if total of record found is smaller than page * limit, goto and load page 0
-	{
+	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
 }
 // if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
-if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
-{
+if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
 	$num = $nbtotalofrecords;
 } else {
-	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
+	if ($limit) {
+		$sql .= $db->plimit($limit + 1, $offset);
+	}
 
 	$resql = $db->query($sql);
-	if (!$resql)
-	{
+	if (!$resql) {
 		dol_print_error($db);
 		exit;
 	}
@@ -248,16 +281,36 @@ llxHeader('', $title, $help_url);
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-if ($search_type_id) $param .= '&search_type_id='.urlencode($search_type_id);
-if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
-if ($search_ref) $param .= '&search_ref='.urlencode($search_ref);
-if ($search_user > 0) $param .= '&search_user='.urlencode($search_user);
-if ($search_label) $param .= '&search_label='.urlencode($search_label);
-if ($search_account) $param .= '&search_account='.urlencode($search_account);
-if ($search_date_start) $param .= '&search_date_startday='.urlencode(GETPOST('search_date_startday', 'int')).'&search_date_startmonth='.urlencode(GETPOST('search_date_startmonth', 'int')).'&search_date_startyear='.urlencode(GETPOST('search_date_startyear', 'int'));
-if ($search_date_end) $param .= '&search_date_endday='.urlencode(GETPOST('search_date_endday', 'int')).'&search_date_endmonth='.urlencode(GETPOST('search_date_endmonth', 'int')).'&search_date_endyear='.urlencode(GETPOST('search_date_endyear', 'int'));
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+if ($search_type_id) {
+	$param .= '&search_type_id='.urlencode($search_type_id);
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
+if ($search_ref) {
+	$param .= '&search_ref='.urlencode($search_ref);
+}
+if ($search_user > 0) {
+	$param .= '&search_user='.urlencode($search_user);
+}
+if ($search_label) {
+	$param .= '&search_label='.urlencode($search_label);
+}
+if ($search_account) {
+	$param .= '&search_account='.urlencode($search_account);
+}
+if ($search_date_start) {
+	$param .= '&search_date_startday='.urlencode(GETPOST('search_date_startday', 'int')).'&search_date_startmonth='.urlencode(GETPOST('search_date_startmonth', 'int')).'&search_date_startyear='.urlencode(GETPOST('search_date_startyear', 'int'));
+}
+if ($search_date_end) {
+	$param .= '&search_date_endday='.urlencode(GETPOST('search_date_endday', 'int')).'&search_date_endmonth='.urlencode(GETPOST('search_date_endmonth', 'int')).'&search_date_endyear='.urlencode(GETPOST('search_date_endyear', 'int'));
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -267,11 +320,15 @@ $arrayofmassactions = array(
 	//'buildsepa'=>$langs->trans("BuildSepa"),	// TODO
 );
 //if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+	$arrayofmassactions = array();
+}
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="action" value="list">';
@@ -280,7 +337,9 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $url = DOL_URL_ROOT.'/salaries/card.php?action=create';
-if (!empty($socid)) $url .= '&socid='.$socid;
+if (!empty($socid)) {
+	$url .= '&socid='.$socid;
+}
 $newcardbutton = dolGetButtonTitle($langs->trans('NewSalaryPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->salaries->write);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $totalnboflines, 'object_payment', 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -323,8 +382,7 @@ print '<td class="liste_titre left">';
 $form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16);
 print '</td>';
 // Account
-if (!empty($conf->banque->enabled))
-{
+if (!empty($conf->banque->enabled)) {
 	print '<td class="liste_titre">';
 	$form->select_comptes($search_account, 'search_account', 0, '', 1);
 	print '</td>';
@@ -356,7 +414,9 @@ print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "s.label", "", $param, 'c
 print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "s.datep,s.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
 print_liste_field_titre("DateValue", $_SERVER["PHP_SELF"], "s.datev,s.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
 print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "type", "", $param, 'class="left"', $sortfield, $sortorder);
-if (!empty($conf->banque->enabled)) print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
+if (!empty($conf->banque->enabled)) {
+	print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
+}
 print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'class="right"', $sortfield, $sortorder);
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -371,11 +431,11 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val)
-	{
-		if (preg_match('/\$object/', $val)) $needToFetchEachLine++; // There is at least one compute field that use $object
+if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
+		if (preg_match('/\$object/', $val)) {
+			$needToFetchEachLine++; // There is at least one compute field that use $object
+		}
 	}
 }
 
@@ -384,10 +444,11 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 $i = 0;
 $total = 0;
 $totalarray = array();
-while ($i < ($limit ? min($num, $limit) : $num))
-{
+while ($i < ($limit ? min($num, $limit) : $num)) {
 	$obj = $db->fetch_object($resql);
-	if (empty($obj)) break; // Should not happen
+	if (empty($obj)) {
+		break; // Should not happen
+	}
 
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
@@ -409,41 +470,50 @@ while ($i < ($limit ? min($num, $limit) : $num))
 
 	// Ref
 	print "<td>".$salstatic->getNomUrl(1)."</td>\n";
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Employee
 	print "<td>".$userstatic->getNomUrl(1)."</td>\n";
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Label payment
 	print "<td>".dol_trunc($obj->label, 40)."</td>\n";
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Date payment
 	print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Date value
 	print '<td class="center">'.dol_print_date($db->jdate($obj->datev), 'day')."</td>\n";
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Type
 	print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Account
-	if (!empty($conf->banque->enabled))
-	{
+	if (!empty($conf->banque->enabled)) {
 		print '<td>';
-		if ($obj->fk_bank > 0)
-		{
+		if ($obj->fk_bank > 0) {
 			//$accountstatic->fetch($obj->fk_bank);
 			$accountstatic->id = $obj->bid;
 			$accountstatic->ref = $obj->bref;
 			$accountstatic->number = $obj->bnumber;
 
-			if (!empty($conf->accounting->enabled))
-			{
+			if (!empty($conf->accounting->enabled)) {
 				$accountstatic->account_number = $obj->account_number;
 
 				$accountingjournal = new AccountingJournal($db);
@@ -453,15 +523,23 @@ while ($i < ($limit ? min($num, $limit) : $num))
 			}
 			$accountstatic->label = $obj->blabel;
 			print $accountstatic->getNomUrl(1);
-		} else print '&nbsp;';
+		} else {
+			print '&nbsp;';
+		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Amount
 	print '<td class="nowrap right">'.price($obj->amount).'</td>';
-	if (!$i) $totalarray['nbfield']++;
-	if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+	if (!$i) {
+		$totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
+	}
 	$totalarray['val']['totalttcfield'] += $obj->amount;
 
 	// Extra fields
@@ -472,14 +550,17 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	print $hookmanager->resPrint;
 	// Action column
 	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-	{
+	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 		$selected = 0;
-		if (in_array($object->id, $arrayofselected)) $selected = 1;
+		if (in_array($object->id, $arrayofselected)) {
+			$selected = 1;
+		}
 		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	print '</tr>'."\n";
 
@@ -491,10 +572,13 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
 
 // If no record found
-if ($num == 0)
-{
+if ($num == 0) {
 	$colspan = 1;
-	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
+	foreach ($arrayfields as $key => $val) {
+		if (!empty($val['checked'])) {
+			$colspan++;
+		}
+	}
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 

From 8d526f8f79003def92face3bbd296d2143d788d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 29 Dec 2020 21:48:53 +0100
Subject: [PATCH 33/95] remove debug

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

diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 8d253e6799a..2b700108d10 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -114,7 +114,6 @@ $result = restrictedArea($user, 'salaries', '', '', '');
 // Initialize array of search criterias
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
-var_dump($object->fields);
 foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha') !== '') {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
@@ -139,7 +138,8 @@ $permissiontodelete = $user->rights->salaries->delete;
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';

From 0e2b7d8b3c9fc50d01239cdd01929e5e2ed141d9 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 30 Dec 2020 07:23:26 +0100
Subject: [PATCH 34/95] Remove typo

---
 htdocs/compta/bank/various_payment/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index ddad89e22fc..0e3c80a6ef8 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -392,7 +392,7 @@ if ($action == 'create')
     // Subledger account
     if (!empty($conf->accounting->enabled))
     {
-        print '<tr><td>'.$langs->trans("SubledgerAccount").'aaaa</td>';
+        print '<tr><td>'.$langs->trans("SubledgerAccount").'</td>';
         print '<td>';
         if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
         {

From a336e4509802386f15c50afa977b5bd521ca475a Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 30 Dec 2020 08:11:20 +0100
Subject: [PATCH 35/95] FIX: #15751 Miscellaneous payment type change to 0
 after updating subledger

---
 htdocs/compta/bank/class/paymentvarious.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index aec104028c0..348c24acd83 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -137,7 +137,7 @@ class PaymentVarious extends CommonObject
 		$sql .= " datev='".$this->db->idate($this->datev)."',";
 		$sql .= " sens=".(int) $this->sens.",";
 		$sql .= " amount=".price2num($this->amount).",";
-		$sql .= " fk_typepayment=".(int) $this->fk_typepayment.",";
+		$sql .= " fk_typepayment=".(int) $this->type_payment.",";
 		$sql .= " num_payment='".$this->db->escape($this->num_payment)."',";
 		$sql .= " label='".$this->db->escape($this->label)."',";
 		$sql .= " note='".$this->db->escape($this->note)."',";

From 87a452c6f401eb63e8161fb4740948a9d8f990a4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 12:16:01 +0100
Subject: [PATCH 36/95] Fix warning

---
 htdocs/user/class/user.class.php      | 2 +-
 htdocs/webservices/server_contact.php | 6 +++---
 htdocs/webservices/server_order.php   | 4 ++--
 htdocs/webservices/server_other.php   | 6 +++---
 htdocs/webservices/server_user.php    | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 98e70cf66b7..7f9c87ab7a7 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1806,7 +1806,7 @@ class User extends CommonObject
 
 						$adh->pass = $this->pass;
 
-						$adh->societe = (empty($adh->societe) && $this->societe_id ? $this->societe_id : $adh->societe);
+						//$adh->societe = (empty($adh->societe) && $this->societe_id ? $this->societe_id : $adh->societe);
 
 						$adh->address = $this->address;
 						$adh->town = $this->town;
diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php
index 6fc521a43c7..97b219c7aba 100644
--- a/htdocs/webservices/server_contact.php
+++ b/htdocs/webservices/server_contact.php
@@ -270,10 +270,10 @@ function getContact($authentication, $id, $ref_ext)
 		if ($result > 0)
 		{
 			// Only internal user who have contact read permission
-			// Or for external user who have contact read permission, with restrict on societe_id
+			// Or for external user who have contact read permission, with restrict on socid
 			if (
-				$fuser->rights->societe->contact->lire && !$fuser->societe_id
-				|| ($fuser->rights->societe->contact->lire && ($fuser->societe_id == $contact->socid))
+				$fuser->rights->societe->contact->lire && !$fuser->socid
+				|| ($fuser->rights->societe->contact->lire && ($fuser->socid == $contact->socid))
 			) {
 				$contact_result_fields = array(
 					'id' => $contact->id,
diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index 361b2a08f4a..5cc964dde4e 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -367,7 +367,7 @@ function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
 
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
-	if ($fuser->societe_id) $socid = $fuser->societe_id;
+	if ($fuser->socid) $socid = $fuser->socid;
 
 	// Check parameters
 	if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
@@ -516,7 +516,7 @@ function getOrdersForThirdParty($authentication, $idthirdparty)
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
-	if ($fuser->societe_id) $socid = $fuser->societe_id;
+	if ($fuser->socid) $socid = $fuser->socid;
 
 	// Check parameters
 	if (!$error && empty($idthirdparty))
diff --git a/htdocs/webservices/server_other.php b/htdocs/webservices/server_other.php
index 61f53f7e275..3494f928cde 100644
--- a/htdocs/webservices/server_other.php
+++ b/htdocs/webservices/server_other.php
@@ -208,7 +208,7 @@ function getDocument($authentication, $modulepart, $file, $refname = '')
 
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
-	if ($fuser->societe_id) $socid = $fuser->societe_id;
+	if ($fuser->socid) $socid = $fuser->socid;
 
 	// Check parameters
 	if (!$error && (!$file || !$modulepart))
@@ -234,7 +234,7 @@ function getDocument($authentication, $modulepart, $file, $refname = '')
 		$original_file              = $check_access['original_file'];
 
 		// Basic protection (against external users only)
-		if ($fuser->societe_id > 0)
+		if ($fuser->socid > 0)
 		{
 			if ($sqlprotectagainstexternals)
 			{
@@ -246,7 +246,7 @@ function getDocument($authentication, $modulepart, $file, $refname = '')
 					while ($i < $num)
 					{
 						$obj = $db->fetch_object($resql);
-						if ($fuser->societe_id != $obj->fk_soc)
+						if ($fuser->socid != $obj->fk_soc)
 						{
 							$accessallowed = 0;
 							break;
diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php
index 8619a952ea1..6c4e472d1c7 100644
--- a/htdocs/webservices/server_user.php
+++ b/htdocs/webservices/server_user.php
@@ -485,7 +485,7 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
-	if ($fuser->societe_id) $socid = $fuser->societe_id;
+	if ($fuser->socid) $socid = $fuser->socid;
 
 	if (!$error && !$thirdpartywithuser)
 	{
@@ -502,7 +502,7 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 			$thirdparty = new Societe($db);
 
 			// If a contact / company already exists with the email, return the corresponding socid
-			$sql = "SELECT s.rowid as societe_id FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql = "SELECT s.rowid as socid FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON sp.fk_soc = s.rowid";
 			$sql .= " WHERE s.entity=".$conf->entity;
 			$sql .= " AND s.email='".$db->escape($thirdpartywithuser['email'])."'";
@@ -690,7 +690,7 @@ function setUserPassword($authentication, $shortuser)
 
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
-	if ($fuser->societe_id) $socid = $fuser->societe_id;
+	if ($fuser->socid) $socid = $fuser->socid;
 
 	if (!$error && !$shortuser)
 	{

From 7e9fcfe6649b681aa1e98c100c9c776c211db54c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 12:31:33 +0100
Subject: [PATCH 37/95] Fix warning

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

diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index 5cc964dde4e..7f2f2ebd43f 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -387,10 +387,10 @@ function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
 			if ($result > 0)
 			{
 				// Security for external user
-				if ($socid && ($socid != $order->socid))
+				if ($socid && (empty($order->socid) || $socid != $order->socid))
 				{
 					$error++;
-					$errorcode = 'PERMISSION_DENIED'; $errorlabel = $order->socid.'User does not have permission for this request';
+					$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 				}
 
 				if (!$error)

From e34fb394a0078ac8e19a14d6059b796166c3d8fc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 12:38:45 +0100
Subject: [PATCH 38/95] Fix warning

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

diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index d35dc705b6f..f04ade49f05 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -154,7 +154,7 @@ if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafie
 	}
 }
 
-if (is_array($extrafield_array)) $productorservice_fields = array_merge($productorservice_fields, $extrafield_array);
+if (!empty($extrafield_array) && is_array($extrafield_array)) $productorservice_fields = array_merge($productorservice_fields, $extrafield_array);
 
 // Define other specific objects
 $server->wsdl->addComplexType(

From a77d0d90ffca061f2106f78e105af6750cf4d645 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 30 Dec 2020 11:46:33 +0000
Subject: [PATCH 39/95] Fixing style errors.

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

diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index c8475089212..3b2110b9602 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -158,7 +158,7 @@ if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafie
 }
 
 if (!empty($extrafield_array) && is_array($extrafield_array)) {
-  $productorservice_fields = array_merge($productorservice_fields, $extrafield_array);
+	$productorservice_fields = array_merge($productorservice_fields, $extrafield_array);
 }
 
 // Define other specific objects

From 6a63fea184d0d0c2dfe8378acb4d6dc61968cadb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 13:00:10 +0100
Subject: [PATCH 40/95] FIX #15817

---
 htdocs/salaries/class/paymentsalary.class.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 6aee986396b..807d3537775 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -88,6 +88,11 @@ class PaymentSalary extends CommonObject
 	 */
 	public $fk_user_modif;
 
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields = array();
+
 
 	/**
 	 *	Constructor

From e5da047134964ecb8c2d1d2b5f9f27abe1887663 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 13:16:38 +0100
Subject: [PATCH 41/95] Update index.php

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

diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 6a33d009765..7eae1eb6536 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -48,7 +48,7 @@ $action = GETPOST('action', 'aZ09');
 $list = array(
 	'ACCOUNTING_LENGTH_GACCOUNT',
 	'ACCOUNTING_LENGTH_AACCOUNT',
-	'ACCOUNTING_LIMIT_LIST_VENTILATION'
+//	'ACCOUNTING_LIMIT_LIST_VENTILATION'		   // there is already a global parameter to define the nb of records in lists, we must use it in priority. Having one parameter for nb of record for each page is deprecated.	
 //    'ACCOUNTING_LENGTH_DESCRIPTION',         // adjust size displayed for lines description for dol_trunc
 //    'ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT', // adjust size displayed for select account description for dol_trunc
 );

From 7165bd43d999cb170b6f484b9ffa03385081d62b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 13:17:57 +0100
Subject: [PATCH 42/95] Update modAccounting.class.php

---
 htdocs/core/modules/modAccounting.class.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 7eff70422ee..811dd57544e 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -154,12 +154,6 @@ class modAccounting extends DolibarrModules
 				"csv",
 				"", 0, 'current', 0
 		);
-		$this->const[14] = array(
-			"ACCOUNTING_LIMIT_LIST_VENTILATION",
-			"chaine",
-			"50",
-			"", 0, 'current', 0
-		);
 
 		// Tabs
 		$this->tabs = array();

From b6e33771be7bc98dc44ce462f2f85d4f2da9b55c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 13:19:15 +0100
Subject: [PATCH 43/95] Update accountancy.lang

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

diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index c35d85e7bcb..7d1e9bf4fbc 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -144,7 +144,7 @@ NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to on list and bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 

From 39ff3d3190f94840068b85d9ac2f7bf491db3565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 30 Dec 2020 19:07:46 +0100
Subject: [PATCH 44/95] phpcs

---
 htdocs/fourn/facture/list.php | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 08bab0b4c76..eef93849c8b 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2015-2016 Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2017      Josep Lluís Amador   <joseplluis@lliuretic.cat>
  * Copyright (C) 2018      Charlene Benke       <charlie@patas-monkey.com>
- * Copyright (C) 2018-2019 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020 Frédéric France      <frederic.france@netlogic.fr>
  *
  * 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
@@ -60,8 +60,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'sup
 $socid = GETPOST('socid', 'int');
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$_GET["action"] = '';
 	$socid = $user->socid;
@@ -363,13 +362,10 @@ if ($massaction == 'transfer_request')
 {
 	$langs->load("withdrawals");
 
-	if (!$user->rights->paymentbybanktransfer->create)
-	{
+	if (!$user->rights->paymentbybanktransfer->create) {
 		$error++;
 		setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
-	}
-	else
-	{
+	} else {
 		//Checking error
 		$error = 0;
 
@@ -421,34 +417,27 @@ if ($massaction == 'transfer_request')
 				elseif (!empty($objecttmp->mode_reglement_code) && $objecttmp->mode_reglement_code != 'VIR') {
 					$error++;
 					setEventMessages($objecttmp->ref.' '.$langs->trans("BadPaymentMethod"), $objecttmp->errors, 'errors');
-				}
-				else {
+				} else {
 					$listofbills[] = $objecttmp; // $listofbills will only contains invoices with good payment method and no request already done
 				}
 			}
 		}
 
 		//Massive withdraw request for request with no errors
-		if (!empty($listofbills))
-		{
+		if (!empty($listofbills)) {
 			$nbwithdrawrequestok = 0;
-			foreach ($listofbills as $aBill)
-			{
+			foreach ($listofbills as $aBill) {
 				$db->begin();
 				$result = $aBill->demande_prelevement($user, $aBill->resteapayer, 'bank-transfer', 'supplier_invoice');
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$db->commit();
 					$nbwithdrawrequestok++;
-				}
-				else
-				{
+				} else {
 					$db->rollback();
 					setEventMessages($aBill->error, $aBill->errors, 'errors');
 				}
 			}
-			if ($nbwithdrawrequestok > 0)
-			{
+			if ($nbwithdrawrequestok > 0) {
 				setEventMessages($langs->trans("BankTransferRequestsDone", $nbwithdrawrequestok), null, 'mesgs');
 			}
 		}

From 123101542b3f044f280ee88a552960a7546534d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 30 Dec 2020 19:13:20 +0100
Subject: [PATCH 45/95] Update paiement.php

---
 htdocs/fourn/facture/paiement.php | 53 +++++++++++++++++--------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 8a7e0cc8054..f88e6dfd834 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2017       Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  *
  * 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
@@ -42,15 +42,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills', 'banks', 'compta'));
 
-$action		= GETPOST('action', 'alpha');
-$confirm	= GETPOST('confirm', 'alpha');
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 
-$facid		= GETPOST('facid', 'int');
-$socid		= GETPOST('socid', 'int');
+$facid = GETPOST('facid', 'int');
+$socid = GETPOST('socid', 'int');
 $accountid = GETPOST('accountid', 'int');
 $day = GETPOST('day', 'int');
-$month		= GETPOST('month', 'int');
+$month = GETPOST('month', 'int');
 $year = GETPOST('year', 'int');
 
 $search_ref = GETPOST("search_ref", "alpha");
@@ -562,15 +562,19 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 						print '<td>'.$langs->trans('RefSupplier').'</td>';
 						print '<td class="center">'.$langs->trans('Date').'</td>';
 						print '<td class="center">'.$langs->trans('DateMaxPayment').'</td>';
-						if (!empty($conf->multicurrency->enabled)) print '<td>'.$langs->trans('Currency').'</td>';
-						if (!empty($conf->multicurrency->enabled)) print '<td class="right">'.$langs->trans('MulticurrencyAmountTTC').'</td>';
-						if (!empty($conf->multicurrency->enabled)) print '<td class="right">'.$langs->trans('MulticurrencyAlreadyPaid').'</td>';
-						if (!empty($conf->multicurrency->enabled)) print '<td class="right">'.$langs->trans('MulticurrencyRemainderToPay').'</td>';
+						if (!empty($conf->multicurrency->enabled)) {
+							print '<td>'.$langs->trans('Currency').'</td>';
+							print '<td class="right">'.$langs->trans('MulticurrencyAmountTTC').'</td>';
+							print '<td class="right">'.$langs->trans('MulticurrencyAlreadyPaid').'</td>';
+							print '<td class="right">'.$langs->trans('MulticurrencyRemainderToPay').'</td>';
+						}
 						print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
 						print '<td class="right">'.$langs->trans('AlreadyPaid').'</td>';
 						print '<td class="right">'.$langs->trans('RemainderToPay').'</td>';
 						print '<td class="center">'.$langs->trans('PaymentAmount').'</td>';
-						if (!empty($conf->multicurrency->enabled)) print '<td class="center">'.$langs->trans('MulticurrencyPaymentAmount').'</td>';
+						if (!empty($conf->multicurrency->enabled)) {
+							print '<td class="center">'.$langs->trans('MulticurrencyPaymentAmount').'</td>';
+						}
 						print '</tr>';
 
 						$total = 0;
@@ -596,8 +600,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							$remaintopay = price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits, 'MT');
 
 							// Multicurrency Price
-							if (!empty($conf->multicurrency->enabled))
-							{
+							if (!empty($conf->multicurrency->enabled)) {
 								$multicurrency_payment = $invoice->getSommePaiement(1);
 								$multicurrency_creditnotes = $invoice->getSumCreditNotesUsed(1);
 								$multicurrency_deposits = $invoice->getSumDepositsUsed(1);
@@ -616,8 +619,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							print '<td>'.$objp->ref_supplier.'</td>';
 
 							// Date
-							if ($objp->df > 0)
-							{
+							if ($objp->df > 0) {
 								print '<td class="center nowraponall">';
 								print dol_print_date($db->jdate($objp->df), 'day').'</td>';
 							} else {
@@ -728,15 +730,16 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							$totalrecudeposits += $deposits;
 							$i++;
 						}
-						if ($i > 1)
-						{
+						if ($i > 1) {
 							// Print total
 							print '<tr class="liste_total">';
 							print '<td colspan="4" class="left">'.$langs->trans('TotalTTC').':</td>';
-							if (!empty($conf->multicurrency->enabled)) print '<td>&nbsp;</td>';
-							if (!empty($conf->multicurrency->enabled)) print '<td>&nbsp;</td>';
-							if (!empty($conf->multicurrency->enabled)) print '<td>&nbsp;</td>';
-							if (!empty($conf->multicurrency->enabled)) print '<td>&nbsp;</td>';
+							if (!empty($conf->multicurrency->enabled)) {
+								print '<td>&nbsp;</td>';
+								print '<td>&nbsp;</td>';
+								print '<td>&nbsp;</td>';
+								print '<td>&nbsp;</td>';
+							}
 							print '<td class="right"><b>'.price($sign * $total_ttc).'</b></td>';
 							print '<td class="right"><b>'.price($sign * $totalrecu);
 							if ($totalrecucreditnote) print '+'.price($totalrecucreditnote);
@@ -744,7 +747,9 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							print	'</b></td>';
 							print '<td class="right"><b>'.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT')).'</b></td>';
 							print '<td class="center" id="result" style="font-weight: bold;"></td>'; // Autofilled
-							if (!empty($conf->multicurrency->enabled)) print '<td class="right" id="multicurrency_result" style="font-weight: bold;"></td>';
+							if (!empty($conf->multicurrency->enabled)) {
+								print '<td class="right" id="multicurrency_result" style="font-weight: bold;"></td>';
+							}
 							print "</tr>\n";
 						}
 						print "</table>\n";
@@ -785,7 +790,9 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 			print '</form>';
 		}
-	} else dol_print_error($db);
+	} else {
+		dol_print_error($db);
+	}
 }
 
 // End of page

From 9916335d932f88dbaeca617cca3434c42fcd7e2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 30 Dec 2020 19:17:28 +0100
Subject: [PATCH 46/95] remove whitespace

---
 htdocs/accountancy/admin/index.php | 55 ++++++++++++++++--------------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 7eae1eb6536..ae36f0f7fa6 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -37,8 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 $langs->loadLangs(array("compta", "bills", "admin", "accountancy", "other"));
 
 // Security access
-if (empty($user->rights->accounting->chartofaccount))
-{
+if (empty($user->rights->accounting->chartofaccount)) {
 	accessforbidden();
 }
 
@@ -48,9 +47,9 @@ $action = GETPOST('action', 'aZ09');
 $list = array(
 	'ACCOUNTING_LENGTH_GACCOUNT',
 	'ACCOUNTING_LENGTH_AACCOUNT',
-//	'ACCOUNTING_LIMIT_LIST_VENTILATION'		   // there is already a global parameter to define the nb of records in lists, we must use it in priority. Having one parameter for nb of record for each page is deprecated.	
-//    'ACCOUNTING_LENGTH_DESCRIPTION',         // adjust size displayed for lines description for dol_trunc
-//    'ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT', // adjust size displayed for select account description for dol_trunc
+//	'ACCOUNTING_LIMIT_LIST_VENTILATION'		   // there is already a global parameter to define the nb of records in lists, we must use it in priority. Having one parameter for nb of record for each page is deprecated.
+//	'ACCOUNTING_LENGTH_DESCRIPTION',         // adjust size displayed for lines description for dol_trunc
+//	'ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT', // adjust size displayed for select account description for dol_trunc
 );
 
 $list_binding = array(
@@ -65,10 +64,8 @@ $list_binding = array(
 if ($action == 'update') {
 	$error = 0;
 
-	if (!$error)
-	{
-		foreach ($list as $constname)
-		{
+	if (!$error) {
+		foreach ($list as $constname) {
 			$constvalue = GETPOST($constname, 'alpha');
 
 			if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
@@ -79,8 +76,7 @@ if ($action == 'update') {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 
-		foreach ($list_binding as $constname)
-		{
+		foreach ($list_binding as $constname) {
 			$constvalue = GETPOST($constname, 'alpha');
 
 			if ($constname == 'ACCOUNTING_DATE_START_BINDING') {
@@ -104,8 +100,9 @@ if ($action == 'update') {
 if ($action == 'setlistsorttodo') {
 	$setlistsorttodo = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_LIST_SORT_VENTILATION_TODO", $setlistsorttodo, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
+	if (!$res > 0) {
 		$error++;
+	}
 
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -117,8 +114,9 @@ if ($action == 'setlistsorttodo') {
 if ($action == 'setlistsortdone') {
 	$setlistsortdone = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_LIST_SORT_VENTILATION_DONE", $setlistsortdone, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
+	if (!$res > 0) {
 		$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -129,8 +127,9 @@ if ($action == 'setlistsortdone') {
 if ($action == 'setmanagezero') {
 	$setmanagezero = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_MANAGE_ZERO", $setmanagezero, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
+	if (!$res > 0) {
 		$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -141,8 +140,9 @@ if ($action == 'setmanagezero') {
 if ($action == 'setdisabledirectinput') {
 	$setdisabledirectinput = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "BANK_DISABLE_DIRECT_INPUT", $setdisabledirectinput, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
+	if (!$res > 0) {
 		$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -153,8 +153,9 @@ if ($action == 'setdisabledirectinput') {
 if ($action == 'setenabledraftexport') {
 	$setenabledraftexport = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL", $setenabledraftexport, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
+	if (!$res > 0) {
 		$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -165,8 +166,9 @@ if ($action == 'setenabledraftexport') {
 if ($action == 'setenablesubsidiarylist') {
 	$setenablesubsidiarylist = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTANCY_COMBO_FOR_AUX", $setenablesubsidiarylist, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
+	if (!$res > 0) {
 		$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -177,8 +179,9 @@ if ($action == 'setenablesubsidiarylist') {
 if ($action == 'setdisablebindingonsales') {
 	$setdisablebindingonsales = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_BINDING_ON_SALES", $setdisablebindingonsales, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
+	if (!$res > 0) {
 		$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -189,8 +192,9 @@ if ($action == 'setdisablebindingonsales') {
 if ($action == 'setdisablebindingonpurchases') {
 	$setdisablebindingonpurchases = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_BINDING_ON_PURCHASES", $setdisablebindingonpurchases, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
+	if (!$res > 0) {
 		$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -201,8 +205,9 @@ if ($action == 'setdisablebindingonpurchases') {
 if ($action == 'setdisablebindingonexpensereports') {
 	$setdisablebindingonexpensereports = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS", $setdisablebindingonexpensereports, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
+	if (!$res > 0) {
 		$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -289,11 +294,12 @@ if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
 print '</tr>';
 
 // Param a user $user->rights->accounting->chartofaccount can access
-foreach ($list as $key)
-{
+foreach ($list as $key) {
 	print '<tr class="oddeven value">';
 
-	if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO) && ($key == 'ACCOUNTING_LENGTH_GACCOUNT' || $key == 'ACCOUNTING_LENGTH_AACCOUNT')) continue;
+	if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO) && ($key == 'ACCOUNTING_LENGTH_GACCOUNT' || $key == 'ACCOUNTING_LENGTH_AACCOUNT')) {
+		continue;
+	}
 
 	// Param
 	$label = $langs->trans($key);
@@ -342,8 +348,7 @@ if (!empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE)) {
 print '</tr>';
 
 // Param a user $user->rights->accounting->chartofaccount can access
-foreach ($list_binding as $key)
-{
+foreach ($list_binding as $key) {
 	print '<tr class="oddeven value">';
 
 	// Param

From 1620ab31185dc7f83b7ca22dbc7a74dc5d066ad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 30 Dec 2020 20:47:57 +0100
Subject: [PATCH 47/95] societe_id to socid

---
 scripts/user/migrate_picture_path.php     |  6 ++-
 scripts/user/sync_users_ldap2dolibarr.php | 49 +++++++++++++++++------
 2 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/scripts/user/migrate_picture_path.php b/scripts/user/migrate_picture_path.php
index 795d03b710d..dd395dc0629 100755
--- a/scripts/user/migrate_picture_path.php
+++ b/scripts/user/migrate_picture_path.php
@@ -19,12 +19,14 @@
  */
 
 /**
- * \file scripts/product/migrate_picture_path.php
+ * \file scripts/user/migrate_picture_path.php
  * \ingroup scripts
  * \brief Migrate pictures from old system prior to 3.7 to new path for 3.7+
  */
 
-if (!defined('NOSESSION')) define('NOSESSION', '1');
+if (!defined('NOSESSION')) {
+	define('NOSESSION', '1');
+}
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php
index 375cb2f43ba..a040599bfc2 100755
--- a/scripts/user/sync_users_ldap2dolibarr.php
+++ b/scripts/user/sync_users_ldap2dolibarr.php
@@ -24,7 +24,9 @@
  * \brief Script to update users into Dolibarr from LDAP
  */
 
-if (!defined('NOSESSION')) define('NOSESSION', '1');
+if (!defined('NOSESSION')) {
+	define('NOSESSION', '1');
+}
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
@@ -59,12 +61,27 @@ print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 // List of fields to get from LDAP
-$required_fields = array($conf->global->LDAP_KEY_USERS, $conf->global->LDAP_FIELD_FULLNAME, $conf->global->LDAP_FIELD_NAME, $conf->global->LDAP_FIELD_FIRSTNAME, $conf->global->LDAP_FIELD_LOGIN, $conf->global->LDAP_FIELD_LOGIN_SAMBA, $conf->global->LDAP_FIELD_PASSWORD, $conf->global->LDAP_FIELD_PASSWORD_CRYPTED, $conf->global->LDAP_FIELD_PHONE, $conf->global->LDAP_FIELD_FAX, $conf->global->LDAP_FIELD_MOBILE,
+$required_fields = array(
+	$conf->global->LDAP_KEY_USERS,
+	$conf->global->LDAP_FIELD_FULLNAME,
+	$conf->global->LDAP_FIELD_NAME,
+	$conf->global->LDAP_FIELD_FIRSTNAME,
+	$conf->global->LDAP_FIELD_LOGIN,
+	$conf->global->LDAP_FIELD_LOGIN_SAMBA,
+	$conf->global->LDAP_FIELD_PASSWORD,
+	$conf->global->LDAP_FIELD_PASSWORD_CRYPTED,
+	$conf->global->LDAP_FIELD_PHONE,
+	$conf->global->LDAP_FIELD_FAX,
+	$conf->global->LDAP_FIELD_MOBILE,
 	// $conf->global->LDAP_FIELD_ADDRESS,
 	// $conf->global->LDAP_FIELD_ZIP,
 	// $conf->global->LDAP_FIELD_TOWN,
 	// $conf->global->LDAP_FIELD_COUNTRY,
-	$conf->global->LDAP_FIELD_MAIL, $conf->global->LDAP_FIELD_TITLE, $conf->global->LDAP_FIELD_DESCRIPTION, $conf->global->LDAP_FIELD_SID);
+	$conf->global->LDAP_FIELD_MAIL,
+	$conf->global->LDAP_FIELD_TITLE,
+	$conf->global->LDAP_FIELD_DESCRIPTION,
+	$conf->global->LDAP_FIELD_SID
+);
 
 // Remove from required_fields all entries not configured in LDAP (empty) and duplicated
 $required_fields = array_unique(array_values(array_filter($required_fields, "dolValidElement")));
@@ -75,14 +92,18 @@ if (!isset($argv[1])) {
 }
 
 foreach ($argv as $key => $val) {
-	if ($val == 'commitiferror')
+	if ($val == 'commitiferror') {
 		$forcecommit = 1;
-	if (preg_match('/--server=([^\s]+)$/', $val, $reg))
+	}
+	if (preg_match('/--server=([^\s]+)$/', $val, $reg)) {
 		$conf->global->LDAP_SERVER_HOST = $reg[1];
-	if (preg_match('/--excludeuser=([^\s]+)$/', $val, $reg))
+	}
+	if (preg_match('/--excludeuser=([^\s]+)$/', $val, $reg)) {
 		$excludeuser = explode(',', $reg[1]);
-	if (preg_match('/-y$/', $val, $reg))
+	}
+	if (preg_match('/-y$/', $val, $reg)) {
 		$confirmed = 1;
+	}
 }
 
 print "Mails sending disabled (useless in batch mode)\n";
@@ -94,9 +115,11 @@ print "port=".$conf->global->LDAP_SERVER_PORT."\n";
 print "login=".$conf->global->LDAP_ADMIN_DN."\n";
 print "pass=".preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)."\n";
 print "DN to extract=".$conf->global->LDAP_USER_DN."\n";
-if (!empty($conf->global->LDAP_FILTER_CONNECTION))
+if (!empty($conf->global->LDAP_FILTER_CONNECTION)) {
 	print 'Filter=('.$conf->global->LDAP_FILTER_CONNECTION.')'."\n"; // Note: filter is defined into function getRecords
-else print 'Filter=('.$conf->global->LDAP_KEY_USERS.'=*)'."\n";
+} else {
+	print 'Filter=('.$conf->global->LDAP_KEY_USERS.'=*)'."\n";
+}
 print "----- To Dolibarr database:\n";
 print "type=".$conf->db->type."\n";
 print "host=".$conf->db->host."\n";
@@ -200,7 +223,7 @@ if ($result >= 0) {
 			$fuser->job = $ldapuser[$conf->global->LDAP_FIELD_TITLE];
 			$fuser->note = $ldapuser[$conf->global->LDAP_FIELD_DESCRIPTION];
 			$fuser->admin = 0;
-			$fuser->societe_id = 0;
+			$fuser->socid = 0;
 			$fuser->contact_id = 0;
 			$fuser->fk_member = 0;
 
@@ -254,9 +277,11 @@ if ($result >= 0) {
 		}
 
 		if (!$error || $forcecommit) {
-			if (!$error)
+			if (!$error) {
 				print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			} else {
+				print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			}
 			$db->commit();
 		} else {
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error)."\n";

From a5e0352031781fb95e15dcd8b6eaff7bda608b88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 30 Dec 2020 21:18:12 +0100
Subject: [PATCH 48/95] modify animation speed of tooltips

---
 htdocs/core/js/lib_foot.js.php | 50 ++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php
index d04379210a6..de19f674659 100644
--- a/htdocs/core/js/lib_foot.js.php
+++ b/htdocs/core/js/lib_foot.js.php
@@ -21,13 +21,27 @@
  * \brief      File that include javascript functions (included if option use_javascript activated)
  */
 
-if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
-if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
-if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
-if (!defined('NOLOGIN'))         define('NOLOGIN', 1);
-if (!defined('NOREQUIREMENU'))   define('NOREQUIREMENU', 1);
-if (!defined('NOREQUIREHTML'))   define('NOREQUIREHTML', 1);
-if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
+if (!defined('NOLOGIN')) {
+	define('NOLOGIN', 1);
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', 1);
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', 1);
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 session_cache_limiter('public');
 
@@ -36,8 +50,11 @@ require_once '../../main.inc.php';
 // Define javascript type
 top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
-if (empty($dolibarr_nocache)) header('Cache-Control: max-age=10800, public, must-revalidate');
-else header('Cache-Control: no-cache');
+if (empty($dolibarr_nocache)) {
+	header('Cache-Control: max-age=10800, public, must-revalidate');
+} else {
+	header('Cache-Control: no-cache');
+}
 
 //var_dump($conf);
 
@@ -46,15 +63,14 @@ else header('Cache-Control: no-cache');
 print "\n/* JS CODE TO ENABLE Tooltips on all object with class classfortooltip */\n";
 print "jQuery(document).ready(function () {\n";
 
-if (empty($conf->dol_no_mouse_hover))
-{
+if (empty($conf->dol_no_mouse_hover)) {
 	print 'jQuery(".classfortooltip").tooltip({
-				show: { collision: "flipfit", effect:\'toggle\', delay:50 },
-				hide: { delay: 250 },
+				show: { collision: "flipfit", effect:"toggle", delay:75, duration:150 },
+				hide: { delay: 250, duration: 20 },
 				tooltipClass: "mytooltip",
 				content: function () {
                     console.log("Return title for popup");
-            		return $(this).prop(\'title\');		/* To force to get title as is */
+            		return $(this).prop("title");		/* To force to get title as is */
           		}
 			});'."\n";
 }
@@ -79,8 +95,7 @@ print "});\n";
 
 
 // Wrapper to manage dropdown
-if (!defined('JS_JQUERY_DISABLE_DROPDOWN'))
-{
+if (!defined('JS_JQUERY_DISABLE_DROPDOWN')) {
 	print "\n/* JS CODE TO ENABLE dropdown (hamburger, linkto, ...) */\n";
 	print '
               jQuery(document).ready(function () {
@@ -149,8 +164,7 @@ if (!defined('JS_JQUERY_DISABLE_DROPDOWN'))
 }
 
 // Wrapper to manage document_preview
-if ($conf->browser->layout != 'phone')
-{
+if ($conf->browser->layout != 'phone') {
 	print "\n/* JS CODE TO ENABLE document_preview */\n"; // Function document_preview is into header
 	print '
                 jQuery(document).ready(function () {

From 1ec763fc14f324ea1301fafefd00d3d72bf7b667 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 21:22:54 +0100
Subject: [PATCH 49/95] FIX When creating a new POS sell, the creation date
 must be modified.

---
 htdocs/takepos/index.php   |  7 ++++---
 htdocs/takepos/invoice.php | 13 ++++---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index d3fc6b7416a..4eeb9dcf9a7 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -448,7 +448,7 @@ function TakeposOrderNotes() {
 }
 
 function Refresh() {
-	console.log("Refresh");
+	console.log("Refresh by reloading place="+place);
 	$("#poslines").load("invoice.php?place="+place, function() {
 		//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
 	});
@@ -456,9 +456,10 @@ function Refresh() {
 
 function New() {
 	// If we go here,it means $conf->global->TAKEPOS_BAR_RESTAURANT is not defined
-	console.log("New with place = <?php echo $place; ?>, js place="+place);
-
 	invoiceid = $("#invoiceid").val();
+
+	console.log("New with place = <?php echo $place; ?>, js place="+place+", invoiceid="+invoiceid);
+
 	$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=getInvoice&id='+invoiceid, function(data) {
 		var r;
 
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 493202376a9..0bc6087409d 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -395,16 +395,9 @@ if ($action == "deleteline") {
     }
 }
 
+// Action to delete or discard an invoice
 if ($action == "delete") {
 	// $placeid is the invoice id (it differs from place) and is defined if the place is set and the ref of invoice is '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')', so the fetch at begining of page works.
-
-	/*$reg = array();
-	if (preg_match('/^(\d+)-(\d+)$/', $place, $reg)) {
-
-		$place = $reg[1];
-		var_dump($place);
-	}*/
-
 	if ($placeid > 0) {
         $result = $invoice->fetch($placeid);
 
@@ -422,7 +415,9 @@ if ($action == "delete") {
 				}
 			}
 
-			$sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]};
+			$sql = "UPDATE ".MAIN_DB_PREFIX."facture";
+			$sql .= " SET fk_soc=".$conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]}.", ";
+			$sql .= " datec = '".$db->idate(dol_now())."'";
 			$sql .= " WHERE ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
 			$resql1 = $db->query($sql);
 

From 94e859bf6ae2aadf27f8497ac16f4a0164ec1c7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 30 Dec 2020 21:41:44 +0100
Subject: [PATCH 50/95] doxygen

---
 .../class/api_subscriptions.class.php         |  9 +++--
 htdocs/adherents/class/subscription.class.php | 39 +++++++++++++++----
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/htdocs/adherents/class/api_subscriptions.class.php b/htdocs/adherents/class/api_subscriptions.class.php
index 370de13c3a2..04b9f750a88 100644
--- a/htdocs/adherents/class/api_subscriptions.class.php
+++ b/htdocs/adherents/class/api_subscriptions.class.php
@@ -87,7 +87,7 @@ class Subscriptions extends DolibarrApi
 	 */
 	public function index($sortfield = "dateadh", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
 	{
-		global $db, $conf;
+		global $conf;
 
 		$obj_ret = array();
 
@@ -183,7 +183,9 @@ class Subscriptions extends DolibarrApi
 		}
 
 		foreach ($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+				continue;
+			}
 			$subscription->$field = $value;
 		}
 
@@ -236,8 +238,9 @@ class Subscriptions extends DolibarrApi
 	{
 		$subscription = array();
 		foreach (Subscriptions::$FIELDS as $field) {
-			if (!isset($data[$field]))
+			if (!isset($data[$field])) {
 				throw new RestException(400, "$field field missing");
+			}
 			$subscription[$field] = $data[$field];
 		}
 		return $subscription;
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index b6349bf9dc2..dff127d6d2b 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -84,8 +84,15 @@ class Subscription extends CommonObject
 	 * @var int ID
 	 */
 	public $fk_type;
+
+	/**
+	 * @var int Member ID
+	 */
 	public $fk_adherent;
 
+	/**
+	 * @var double amount subscription
+	 */
 	public $amount;
 
 	/**
@@ -140,7 +147,9 @@ class Subscription extends CommonObject
 			$this->error = $langs->trans("ErrorBadValueForDate");
 			return -1;
 		}
-		if (empty($this->datec)) $this->datec = $now;
+		if (empty($this->datec)) {
+			$this->datec = $now;
+		}
 
 
 		$this->db->begin();
@@ -177,7 +186,9 @@ class Subscription extends CommonObject
 			$this->context = array('member' => $member);
 			// Call triggers
 			$result = $this->call_trigger('MEMBER_SUBSCRIPTION_CREATE', $user);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -278,7 +289,9 @@ class Subscription extends CommonObject
 				$this->context = array('member'=>$member);
 				// Call triggers
 				$result = $this->call_trigger('MEMBER_SUBSCRIPTION_MODIFY', $user);
-				if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
+				if ($result < 0) {
+					$error++;
+				} //Do also here what you must do to rollback action if trigger fail
 				// End call triggers
 			}
 		} else {
@@ -320,7 +333,9 @@ class Subscription extends CommonObject
 			if (!$notrigger) {
 				// Call triggers
 				$result = $this->call_trigger('MEMBER_SUBSCRIPTION_DELETE', $user);
-				if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail
+				if ($result < 0) {
+					$error++;
+				} // Do also here what you must do to rollback action if trigger fail
 				// End call triggers
 			}
 		}
@@ -407,16 +422,24 @@ class Subscription extends CommonObject
 		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';
+			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.'" class="classfortooltip" title="'.dol_escape_htmltag($label, 1).'">';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 
 		return $result;

From 6ef7d3db79b3eda90d89cedb980c6cc50e374750 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 21:43:04 +0100
Subject: [PATCH 51/95] FIX Dates of sales start in TakePOS

---
 htdocs/langs/en_US/cashdesk.lang | 1 +
 htdocs/takepos/index.php         | 2 +-
 htdocs/takepos/invoice.php       | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 8e529fe92f2..bb433583797 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -99,6 +99,7 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
+SaleStartedAt=Sale started at %s
 ControlCashOpening=Control cash desk at opening POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index ef6ca77722a..5e75749dc00 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -832,7 +832,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 			</div>
 			<div class="topnav-right">
 				<div class="login_block_other">
-				<input type="text" id="search" name="search" onkeyup="Search2(<?php echo $keyCodeForEnter; ?>);"  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-home"></span></a>
 				<?php if (empty($conf->dol_use_jmobile)) { ?>
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 55b576a040d..409ca6b2ce4 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -1019,13 +1019,13 @@ $( document ).ready(function() {
 	if ($resql) {
 		while ($obj = $db->fetch_object($resql)) {
 			echo '$("#customerandsales").append(\'';
-			echo '<a class="valignmiddle" onclick="place=\\\'';
+			echo '<a class="valignmiddle" title="'.dol_escape_js($langs->trans("SaleStartedAt", dol_print_date($db->jdate($obj->datec), '%H:%M'))).'" onclick="place=\\\'';
 			$num_sale = str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $obj->ref));
 			echo $num_sale;
 			if (str_replace("-", "", $num_sale) > $max_sale) $max_sale = str_replace("-", "", $num_sale);
 			echo '\\\';Refresh();">';
 			if ($placeid == $obj->rowid) echo "<b>";
-			echo date('H:i', strtotime($obj->datec));
+			echo dol_print_date($db->jdate($obj->datec), '%H:%M');
 			if ($placeid == $obj->rowid) echo "</b>";
 			echo '</a>\');';
 		}

From 79da04780248280be09cb0e5ed19d345db4efca1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 21:43:04 +0100
Subject: [PATCH 52/95] FIX Dates of sales start in TakePOS

Conflicts:
	htdocs/langs/en_US/cashdesk.lang
---
 htdocs/langs/en_US/cashdesk.lang | 5 +++--
 htdocs/takepos/index.php         | 2 +-
 htdocs/takepos/invoice.php       | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index ce5cdaf4ba6..a93571d4768 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 4eeb9dcf9a7..4bfeaa57b75 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -778,7 +778,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 			</div>
 			<div class="topnav-right">
 				<div class="login_block_other">
-				<input type="text" id="search" name="search" onkeyup="Search2(<?php echo $keyCodeForEnter; ?>);"  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-home"></span></a>
 				<?php if (empty($conf->dol_use_jmobile)) { ?>
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 0bc6087409d..1022308c308 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -763,13 +763,13 @@ $( document ).ready(function() {
 	if ($resql) {
 		while ($obj = $db->fetch_object($resql)) {
 			echo '$("#customerandsales").append(\'';
-			echo '<a class="valignmiddle" onclick="place=\\\'';
+			echo '<a class="valignmiddle" title="'.dol_escape_js($langs->trans("SaleStartedAt", dol_print_date($db->jdate($obj->datec), '%H:%M'))).'" onclick="place=\\\'';
 			$num_sale = str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $obj->ref));
 			echo $num_sale;
 			if (str_replace("-", "", $num_sale) > $max_sale) $max_sale = str_replace("-", "", $num_sale);
 			echo '\\\';Refresh();">';
 			if ($placeid == $obj->rowid) echo "<b>";
-			echo date('H:i', strtotime($obj->datec));
+			echo dol_print_date($db->jdate($obj->datec), '%H:%M');
 			if ($placeid == $obj->rowid) echo "</b>";
 			echo '</a>\');';
 		}

From 02d92d3538bae102bed4afb074e33da874b09c72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 30 Dec 2020 21:53:17 +0100
Subject: [PATCH 53/95] remove deprecated

---
 htdocs/admin/expensereport_rules.php | 117 +++++++++++++++------------
 1 file changed, 64 insertions(+), 53 deletions(-)

diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php
index 9b56ac5901b..050c2b9455c 100644
--- a/htdocs/admin/expensereport_rules.php
+++ b/htdocs/admin/expensereport_rules.php
@@ -20,7 +20,7 @@
 
 
 /**
- *      \file       htdocs/admin/expensereport_ik.php
+ *      \file       htdocs/admin/expensereport_rules.php
  *		\ingroup    expensereport
  *		\brief      Page to display expense tax ik
  */
@@ -34,7 +34,9 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_rule.class.ph
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "other", "trips", "errors", "dict"));
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 //Init error
 $error = false;
@@ -55,15 +57,15 @@ $amount = GETPOST('amount');
 $restrictive = GETPOST('restrictive');
 
 $object = new ExpenseReportRule($db);
-if (!empty($id))
-{
+if (!empty($id)) {
 	$result = $object->fetch($id);
-	if ($result < 0) dol_print_error('', $object->error, $object->errors);
+	if ($result < 0) {
+		dol_print_error('', $object->error, $object->errors);
+	}
 }
 
 // TODO do action
-if ($action == 'save')
-{
+if ($action == 'save') {
 	$error = 0;
 
 	// check parameters
@@ -92,8 +94,7 @@ if ($action == 'save')
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpenseReportLimitAmount")), null, 'errors');
 	}
 
-	if (empty($error))
-	{
+	if (empty($error)) {
 		$object->setValues($_POST);
 
 		if ($apply_to == 'U') {
@@ -116,18 +117,22 @@ if ($action == 'save')
 		$object->entity = $conf->entity;
 
 		$res = $object->create($user);
-		if ($res > 0) setEventMessages($langs->trans('ExpenseReportRuleSave'), null);
-		else dol_print_error($object->db);
+		if ($res > 0) {
+			setEventMessages($langs->trans('ExpenseReportRuleSave'), null);
+		} else {
+			dol_print_error($object->db);
+		}
 
 		header('Location: '.$_SERVER['PHP_SELF']);
 		exit;
 	}
-} elseif ($action == 'delete')
-{
+} elseif ($action == 'delete') {
 	// TODO add confirm
 	$res = $object->delete($user);
 
-	if ($res < 0) dol_print_error($object->db);
+	if ($res < 0) {
+		dol_print_error($object->db);
+	}
 
 	header('Location: '.$_SERVER['PHP_SELF']);
 	exit;
@@ -135,8 +140,17 @@ if ($action == 'save')
 
 $rules = ExpenseReportRule::getAllRule();
 
-$tab_apply = array('A' => $langs->trans('All'), 'G' => $langs->trans('Group'), 'U' => $langs->trans('User'));
-$tab_rules_type = array('EX_DAY' => $langs->trans('Day'), 'EX_MON' => $langs->trans('Month'), 'EX_YEA' => $langs->trans('Year'), 'EX_EXP' => $langs->trans('OnExpense'));
+$tab_apply = array(
+	'A' => $langs->trans('All'),
+	'G' => $langs->trans('Group'),
+	'U' => $langs->trans('User')
+);
+$tab_rules_type = array(
+	'EX_DAY' => $langs->trans('Day'),
+	'EX_MON' => $langs->trans('Month'),
+	'EX_YEA' => $langs->trans('Year'),
+	'EX_EXP' => $langs->trans('OnExpense')
+);
 
 
 /*
@@ -156,8 +170,7 @@ print dol_get_fiche_head($head, 'expenserules', $langs->trans("ExpenseReportsRul
 echo '<span class="opacitymedium">'.$langs->trans('ExpenseReportRulesDesc').'</span>';
 print '<br><br>';
 
-if ($action != 'edit')
-{
+if ($action != 'edit') {
 	echo '<form action="'.$_SERVER['PHP_SELF'].'" method="post">';
 	echo '<input type="hidden" name="token" value="'.newToken().'" />';
 	echo '<input type="hidden" name="action" value="save" />';
@@ -199,8 +212,7 @@ if ($action != 'edit')
 echo '<form action="'.$_SERVER['PHP_SELF'].'" method="post">';
 echo '<input type="hidden" name="token" value="'.newToken().'" />';
 
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	echo '<input type="hidden" name="id" value="'.$object->id.'" />';
 	echo '<input type="hidden" name="action" value="save" />';
 }
@@ -218,43 +230,47 @@ echo '<th>'.$langs->trans('ExpenseReportRestrictive').'</th>';
 echo '<th>&nbsp;</th>';
 echo '</tr>';
 
-foreach ($rules as $rule)
-{
+foreach ($rules as $rule) {
 	echo '<tr class="oddeven">';
 
 	echo '<td>';
-	if ($action == 'edit' && $object->id == $rule->id)
-	{
+	if ($action == 'edit' && $object->id == $rule->id) {
 		$selected = ($object->is_for_all > 0) ? 'A' : ($object->fk_usergroup > 0 ? 'G' : 'U');
 		echo '<div class="float">'.$form->selectarray('apply_to', $tab_apply, $selected, 0).'</div>';
 		echo '<div id="user" class="float">'.$form->select_dolusers($object->fk_user, 'fk_user').'</div>';
 		echo '<div id="group" class="float">'.$form->select_dolgroups($object->fk_usergroup, 'fk_usergroup').'</div>';
 	} else {
-		if ($rule->is_for_all > 0) echo $tab_apply['A'];
-		elseif ($rule->fk_usergroup > 0) echo $tab_apply['G'].' ('.$rule->getGroupLabel().')';
-		elseif ($rule->fk_user > 0) echo $tab_apply['U'].' ('.$rule->getUserName().')';
-	}
-	echo '</td>';
-
-
-	echo '<td>';
-	if ($action == 'edit' && $object->id == $rule->id)
-	{
-		echo $form->selectExpense($object->fk_c_type_fees, 'fk_c_type_fees', 0, 1, 1);
-	} else {
-		if ($rule->fk_c_type_fees == -1) echo $langs->trans('AllExpenseReport');
-		else {
-			$key = getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'code', $rule->fk_c_type_fees, false, 'id');
-			if ($key != $langs->trans($key)) echo $langs->trans($key);
-			else echo $langs->trans(getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'label', $rule->fk_c_type_fees, false, 'id')); // TODO check to return trans of 'code'
+		if ($rule->is_for_all > 0) {
+			echo $tab_apply['A'];
+		} elseif ($rule->fk_usergroup > 0) {
+			echo $tab_apply['G'].' ('.$rule->getGroupLabel().')';
+		} elseif ($rule->fk_user > 0) {
+			echo $tab_apply['U'].' ('.$rule->getUserName().')';
 		}
 	}
 	echo '</td>';
 
 
 	echo '<td>';
-	if ($action == 'edit' && $object->id == $rule->id)
-	{
+	if ($action == 'edit' && $object->id == $rule->id) {
+		echo $form->selectExpense($object->fk_c_type_fees, 'fk_c_type_fees', 0, 1, 1);
+	} else {
+		if ($rule->fk_c_type_fees == -1) {
+			echo $langs->trans('AllExpenseReport');
+		} else {
+			$key = getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'code', $rule->fk_c_type_fees, false, 'id');
+			if ($key != $langs->trans($key)) {
+				echo $langs->trans($key);
+			} else {
+				echo $langs->trans(getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'label', $rule->fk_c_type_fees, false, 'id')); // TODO check to return trans of 'code'
+			}
+		}
+	}
+	echo '</td>';
+
+
+	echo '<td>';
+	if ($action == 'edit' && $object->id == $rule->id) {
 		echo $form->selectarray('code_expense_rules_type', $tab_rules_type, $object->code_expense_rules_type, 0);
 	} else {
 		echo $tab_rules_type[$rule->code_expense_rules_type];
@@ -263,8 +279,7 @@ foreach ($rules as $rule)
 
 
 	echo '<td>';
-	if ($action == 'edit' && $object->id == $rule->id)
-	{
+	if ($action == 'edit' && $object->id == $rule->id) {
 		print $form->selectDate(strtotime(date('Y-m-d', $object->dates)), 'start', '', '', 0, '', 1, 0);
 	} else {
 		echo dol_print_date($rule->dates, 'day');
@@ -273,8 +288,7 @@ foreach ($rules as $rule)
 
 
 	echo '<td>';
-	if ($action == 'edit' && $object->id == $rule->id)
-	{
+	if ($action == 'edit' && $object->id == $rule->id) {
 		print $form->selectDate(strtotime(date('Y-m-d', $object->datee)), 'end', '', '', 0, '', 1, 0);
 	} else {
 		echo dol_print_date($rule->datee, 'day');
@@ -283,8 +297,7 @@ foreach ($rules as $rule)
 
 
 	echo '<td>';
-	if ($action == 'edit' && $object->id == $rule->id)
-	{
+	if ($action == 'edit' && $object->id == $rule->id) {
 		echo '<input type="text" value="'.price2num($object->amount).'" name="amount" class="amount" />'.$conf->currency;
 	} else {
 		echo price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency);
@@ -293,8 +306,7 @@ foreach ($rules as $rule)
 
 
 	echo '<td>';
-	if ($action == 'edit' && $object->id == $rule->id)
-	{
+	if ($action == 'edit' && $object->id == $rule->id) {
 		echo $form->selectyesno('restrictive', $object->restrictive, 1);
 	} else {
 		echo yn($rule->restrictive, 1, 1);
@@ -303,8 +315,7 @@ foreach ($rules as $rule)
 
 
 	echo '<td class="center">';
-	if ($object->id != $rule->id)
-	{
+	if ($object->id != $rule->id) {
 		echo '<a class="editfielda paddingright paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=edit&token='.newToken().'&id='.$rule->id.'">'.img_edit().'</a>&nbsp;';
 		echo '<a class="paddingright paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&id='.$rule->id.'">'.img_delete().'</a>';
 	} else {

From 40d19e6c36f0f15c897c1bd92b5d470d177c8292 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 22:01:26 +0100
Subject: [PATCH 54/95] Fix tooltip on timezone

---
 htdocs/admin/system/dolibarr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index a2dcc434723..725ee66656b 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -225,7 +225,7 @@ if (($thousand != ',' && $thousand != '.') || ($thousand != ' '))
 print '<tr class="oddeven"><td>&nbsp; => price(1234.56)</td><td>'.price(1234.56).'</td></tr>'."\n";
 // Timezone
 $txt = $langs->trans("OSTZ").' (variable system TZ): '.(!empty($_ENV["TZ"]) ? $_ENV["TZ"] : $langs->trans("NotDefined")).'<br>'."\n";
-$txt .= $langs->trans("PHPTZ").' (php.ini date.timezone): '.(ini_get("date.timezone") ?ini_get("date.timezone") : $langs->trans("NotDefined")).''."<br>\n"; // date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
+$txt .= $langs->trans("PHPTZ").' (date_default_timezone_get() / php.ini date.timezone): '.(getServerTimeZoneString()." / ".(ini_get("date.timezone") ? ini_get("date.timezone") : $langs->trans("NotDefined")))."<br>\n"; // date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
 $txt .= $langs->trans("Dolibarr constant MAIN_SERVER_TZ").': '.(empty($conf->global->MAIN_SERVER_TZ) ? $langs->trans("NotDefined") : $conf->global->MAIN_SERVER_TZ);
 print '<tr class="oddeven"><td>'.$langs->trans("CurrentTimeZone").'</td><td>'; // Timezone server PHP
 $a = getServerTimeZoneInt('now');

From 786e2519612532a07fc4a2c396617c526fa2d1d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 30 Dec 2020 22:13:43 +0100
Subject: [PATCH 55/95] remove deprecated

---
 htdocs/admin/expensereport.php | 180 +++++++++++++++------------------
 1 file changed, 82 insertions(+), 98 deletions(-)

diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index a93f5c3c608..389766a47ae 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -37,7 +37,9 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'errors', 'trips', 'other'));
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
@@ -52,51 +54,47 @@ $type = 'expensereport';
 
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
-if ($action == 'updateMask')
-{
+if ($action == 'updateMask') {
 	$maskconst = GETPOST('maskconst', 'alpha');
 	$maskvalue = GETPOST('maskvalue', 'alpha');
-	if ($maskconst) $res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
+	if ($maskconst) {
+		$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
+	}
 
-	if (!$res > 0) $error++;
+	if (!$res > 0) {
+		$error++;
+	}
 
- 	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'specimen') // For fiche inter
-{
+} elseif ($action == 'specimen') { // For fiche inter
 	$modele = GETPOST('module', 'alpha');
 
 	$inter = new ExpenseReport($db);
 	$inter->initAsSpecimen();
 	$inter->status = 0; // Force statut draft to show watermark
-	$inter->fk_statut = 0; // Force statut draft to show watermark
 
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir)
-	{
+	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/expensereport/doc/pdf_".$modele.".modules.php", 0);
-		if (file_exists($file))
-		{
+		if (file_exists($file)) {
 			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound)
-	{
+	if ($filefound) {
 		require_once $file;
 
 		$module = new $classname($db);
 
-		if ($module->write_file($inter, $langs) > 0)
-		{
+		if ($module->write_file($inter, $langs) > 0) {
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=expensereport&file=SPECIMEN.pdf");
 			return;
 		} else {
@@ -107,30 +105,22 @@ if ($action == 'updateMask')
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
-}
-
-// Activate a model
-elseif ($action == 'set')
-{
+} elseif ($action == 'set') {
+	// Activate a model
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-	if ($ret > 0 && empty($conf->global->EXPENSEREPORT_ADDON_PDF))
-	{
+	if ($ret > 0 && empty($conf->global->EXPENSEREPORT_ADDON_PDF)) {
 		dolibarr_set_const($db, 'EXPENSEREPORT_ADDON_PDF', $value, 'chaine', 0, '', $conf->entity);
 	}
-} elseif ($action == 'del')
-{
+} elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
-		if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$value") dolibarr_del_const($db, 'EXPENSEREPORT_ADDON_PDF', $conf->entity);
+	if ($ret > 0) {
+		if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$value") {
+			dolibarr_del_const($db, 'EXPENSEREPORT_ADDON_PDF', $conf->entity);
+		}
 	}
-}
-
-// Set default model
-elseif ($action == 'setdoc')
-{
-	if (dolibarr_set_const($db, "EXPENSEREPORT_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
-	{
+} elseif ($action == 'setdoc') {
+	// Set default model
+	if (dolibarr_set_const($db, "EXPENSEREPORT_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity)) {
 		// La constante qui a ete lue en avant du nouveau set
 		// on passe donc par une variable pour avoir un affichage coherent
 		$conf->global->EXPENSEREPORT_ADDON_PDF = $value;
@@ -138,18 +128,15 @@ elseif ($action == 'setdoc')
 
 	// On active le modele
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
+	if ($ret > 0) {
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-} elseif ($action == 'setmod')
-{
+} elseif ($action == 'setmod') {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "EXPENSEREPORT_ADDON", $value, 'chaine', 0, '', $conf->entity);
-} elseif ($action == 'setoptions')
-{
+} elseif ($action == 'setoptions') {
 	$db->begin();
 
 	$freetext = GETPOST('EXPENSEREPORT_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
@@ -158,10 +145,11 @@ elseif ($action == 'setdoc')
 	$draft = GETPOST('EXPENSEREPORT_DRAFT_WATERMARK', 'alpha');
 	$res2 = dolibarr_set_const($db, "EXPENSEREPORT_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
 
-	if (!$res1 > 0 || !$res2 > 0) $error++;
+	if (!$res1 > 0 || !$res2 > 0) {
+		$error++;
+	}
 
- 	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -206,19 +194,14 @@ print '</tr>'."\n";
 
 clearstatcache();
 
-foreach ($dirmodels as $reldir)
-{
+foreach ($dirmodels as $reldir) {
 	$dir = dol_buildpath($reldir."core/modules/expensereport/");
 
-	if (is_dir($dir))
-	{
+	if (is_dir($dir)) {
 		$handle = opendir($dir);
-		if (is_resource($handle))
-		{
-			while (($file = readdir($handle)) !== false)
-			{
-				if (substr($file, 0, 18) == 'mod_expensereport_' && substr($file, dol_strlen($file) - 3, 3) == 'php')
-				{
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false) {
+				if (substr($file, 0, 18) == 'mod_expensereport_' && substr($file, dol_strlen($file) - 3, 3) == 'php') {
 					$file = substr($file, 0, dol_strlen($file) - 4);
 
 					require_once $dir.$file.'.php';
@@ -226,11 +209,14 @@ foreach ($dirmodels as $reldir)
 					$module = new $file($db);
 
 					// Show modules according to features level
-					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+						continue;
+					}
+					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+						continue;
+					}
 
-					if ($module->isEnabled())
-					{
+					if ($module->isEnabled()) {
 						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -241,13 +227,15 @@ foreach ($dirmodels as $reldir)
 						if (preg_match('/^Error/', $tmp)) {
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans($tmp).'</div>';
-						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-						else print $tmp;
+						} elseif ($tmp == 'NotConfigured') {
+							print $langs->trans($tmp);
+						} else {
+							print $tmp;
+						}
 						print '</td>'."\n";
 
 						print '<td class="center">';
-						if ($conf->global->EXPENSEREPORT_ADDON == $file)
-						{
+						if ($conf->global->EXPENSEREPORT_ADDON == $file) {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
@@ -266,8 +254,9 @@ foreach ($dirmodels as $reldir)
 						if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
 							$htmltooltip .= ''.$langs->trans("NextValue").': ';
 							if ($nextval) {
-								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured') {
 									$nextval = $langs->trans($nextval);
+								}
 								$htmltooltip .= $nextval.'<br>';
 							} else {
 								$htmltooltip .= $langs->trans($module->error).'<br>';
@@ -302,12 +291,10 @@ $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
 $sql .= " WHERE type = '".$db->escape($type)."'";
 $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$i = 0;
 	$num_rows = $db->num_rows($resql);
-	while ($i < $num_rows)
-	{
+	while ($i < $num_rows) {
 		$array = $db->fetch_array($resql);
 		array_push($def, $array[0]);
 		$i++;
@@ -328,28 +315,21 @@ print "</tr>\n";
 
 clearstatcache();
 
-foreach ($dirmodels as $reldir)
-{
+foreach ($dirmodels as $reldir) {
 	$dir = dol_buildpath($reldir."core/modules/expensereport/doc");
 
-	if (is_dir($dir))
-	{
+	if (is_dir($dir)) {
 		$handle = opendir($dir);
-		if (is_resource($handle))
-		{
-			while (($file = readdir($handle)) !== false)
-			{
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false) {
 				$filelist[] = $file;
 			}
 			closedir($handle);
 			arsort($filelist);
 
-			foreach ($filelist as $file)
-			{
-				if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-				{
-					if (file_exists($dir.'/'.$file))
-					{
+			foreach ($filelist as $file) {
+				if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file)) {
+					if (file_exists($dir.'/'.$file)) {
 						$name = substr($file, 4, dol_strlen($file) - 16);
 						$classname = substr($file, 0, dol_strlen($file) - 12);
 
@@ -357,21 +337,26 @@ foreach ($dirmodels as $reldir)
 						$module = new $classname($db);
 
 						$modulequalified = 1;
-						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							$modulequalified = 0;
+						}
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							$modulequalified = 0;
+						}
 
-						if ($modulequalified)
-						{
+						if ($modulequalified) {
 							print '<tr class="oddeven"><td width="100">';
 							print (empty($module->name) ? $name : $module->name);
 							print "</td><td>\n";
-							if (method_exists($module, 'info')) print $module->info($langs);
-							else print $module->description;
+							if (method_exists($module, 'info')) {
+								print $module->info($langs);
+							} else {
+								print $module->description;
+							}
 							print '</td>';
 
 							// Active
-							if (in_array($name, $def))
-							{
+							if (in_array($name, $def)) {
 								print '<td class="center">'."\n";
 								print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
 								print img_picto($langs->trans("Enabled"), 'switch_on');
@@ -385,8 +370,7 @@ foreach ($dirmodels as $reldir)
 
 							// Default
 							print '<td class="center">';
-							if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$name")
-							{
+							if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$name") {
 								print img_picto($langs->trans("Default"), 'on');
 							} else {
 								print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
@@ -409,8 +393,7 @@ foreach ($dirmodels as $reldir)
 
 							// Preview
 							print '<td class="center">';
-							if ($module->type == 'pdf')
-							{
+							if ($module->type == 'pdf') {
 								print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 							} else {
 								print img_object($langs->trans("PreviewNotAvailable"), 'generic');
@@ -451,14 +434,15 @@ print "</tr>\n";
 $substitutionarray = pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__'] = $langs->trans("Translation");
 $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
-foreach ($substitutionarray as $key => $val)	$htmltext .= $key.'<br>';
+foreach ($substitutionarray as $key => $val) {
+	$htmltext .= $key.'<br>';
+}
 $htmltext .= '</i>';
 
 print '<tr class="oddeven"><td colspan="2">';
 print $form->textwithpicto($langs->trans("FreeLegalTextOnExpenseReports"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename = 'EXPENSEREPORT_FREE_TEXT';
-if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
-{
+if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 } else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

From f5641f8068d1a9f594d0e71926c61b437a32c0c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 30 Dec 2020 22:15:34 +0100
Subject: [PATCH 56/95] remove deprecated

---
 htdocs/admin/expensereport.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 389766a47ae..61688e18515 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -70,12 +70,12 @@ if ($action == 'updateMask') {
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'specimen') { // For fiche inter
+} elseif ($action == 'specimen') { // For fiche expensereport
 	$modele = GETPOST('module', 'alpha');
 
-	$inter = new ExpenseReport($db);
-	$inter->initAsSpecimen();
-	$inter->status = 0; // Force statut draft to show watermark
+	$expensespecimen = new ExpenseReport($db);
+	$expensespecimen->initAsSpecimen();
+	$expensespecimen->status = 0; // Force statut draft to show watermark
 
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
@@ -94,7 +94,7 @@ if ($action == 'updateMask') {
 
 		$module = new $classname($db);
 
-		if ($module->write_file($inter, $langs) > 0) {
+		if ($module->write_file($expensespecimen, $langs) > 0) {
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=expensereport&file=SPECIMEN.pdf");
 			return;
 		} else {
@@ -278,7 +278,7 @@ foreach ($dirmodels as $reldir) {
 print "</table><br>\n";
 
 /*
- *  Documents models for Interventions
+ *  Documents models for ExpenseReport
  */
 
 print load_fiche_titre($langs->trans("TemplatePDFExpenseReports"), '', '');

From 65edc377c3515cbea7a40d27e4d69d9e8773e39e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 22:53:21 +0100
Subject: [PATCH 57/95] FIX Visible date of payment

---
 htdocs/compta/facture/card.php                  | 10 +++++++++-
 htdocs/compta/paiement/class/paiement.class.php | 11 ++++++++++-
 htdocs/takepos/invoice.php                      |  6 +++---
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index aa07de4867e..0970aff1b45 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4848,7 +4848,15 @@ elseif ($id > 0 || !empty($ref))
 				print '<tr class="oddeven"><td>';
 				print $paymentstatic->getNomUrl(1);
 				print '</td>';
-				print '<td>'.dol_print_date($db->jdate($objp->dp), 'dayhour').'</td>';
+				print '<td>';
+				$dateofpayment = $db->jdate($objp->dp);
+				$tmparray = dol_getdate($dateofpayment);
+				if ($tmparray['seconds'] == 0 && $tmparray['minutes'] == 0 && ($tmparray['hours'] == 0 || $tmparray['hours'] == 12)) {	// We set hours to 0:00 or 12:00 because we don't know it
+					print dol_print_date($dateofpayment, 'day');
+				} else {	// Hours was set to real date of payment (special case for POS for example)
+					print dol_print_date($dateofpayment, 'dayhour', 'tzuser');
+				}
+				print '</td>';
 				$label = ($langs->trans("PaymentType".$objp->payment_code) != ("PaymentType".$objp->payment_code)) ? $langs->trans("PaymentType".$objp->payment_code) : $objp->payment_label;
 				print '<td>'.$label.' '.$objp->num_payment.'</td>';
 				if (!empty($conf->banque->enabled))
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 7a759dde543..4583f0376ae 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -1201,7 +1201,16 @@ class Paiement extends CommonObject
 		$result = '';
         $label = '<u>'.$langs->trans("ShowPayment").'</u><br>';
         $label .= '<strong>'.$langs->trans("Ref").':</strong> '.$this->ref;
-        if ($this->datepaye ? $this->datepaye : $this->date) $label .= '<br><strong>'.$langs->trans("Date").':</strong> '.dol_print_date($this->datepaye ? $this->datepaye : $this->date, 'dayhour');
+        $dateofpayment = ($this->datepaye ? $this->datepaye : $this->date);
+        if ($dateofpayment) {
+        	$label .= '<br><strong>'.$langs->trans("Date").':</strong> ';
+        	$tmparray = dol_getdate($dateofpayment);
+        	if ($tmparray['seconds'] == 0 && $tmparray['minutes'] == 0 && ($tmparray['hours'] == 0 || $tmparray['hours'] == 12)) {	// We set hours to 0:00 or 12:00 because we don't know it
+        		$label .= dol_print_date($dateofpayment, 'day');
+        	} else {	// Hours was set to real date of payment (special case for POS for example)
+        		$label .= dol_print_date($dateofpayment, 'dayhour', 'tzuser');
+        	}
+        }
         if ($mode == 'withlistofinvoices')
         {
             $arraybill = $this->getBillsArray();
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 1022308c308..0909f1b3cca 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -158,7 +158,7 @@ if ($action == 'valid' && $user->rights->facture->creer)
 	if ($invoice->total_ttc < 0) {
 		$invoice->type = $invoice::TYPE_CREDIT_NOTE;
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture WHERE ";
-		$sql .= "fk_soc = '".$invoice->socid."' ";
+		$sql .= "fk_soc = ".((int) $invoice->socid)." ";
 		$sql .= "AND type <> ".Facture::TYPE_CREDIT_NOTE." ";
 		$sql .= "AND fk_statut >= ".$invoice::STATUS_VALIDATED." ";
 		$sql .= "ORDER BY rowid DESC";
@@ -763,13 +763,13 @@ $( document ).ready(function() {
 	if ($resql) {
 		while ($obj = $db->fetch_object($resql)) {
 			echo '$("#customerandsales").append(\'';
-			echo '<a class="valignmiddle" title="'.dol_escape_js($langs->trans("SaleStartedAt", dol_print_date($db->jdate($obj->datec), '%H:%M'))).'" onclick="place=\\\'';
+			echo '<a class="valignmiddle" title="'.dol_escape_js($langs->trans("SaleStartedAt", dol_print_date($db->jdate($obj->datec), '%H:%M', 'tzuser'))).'" onclick="place=\\\'';
 			$num_sale = str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $obj->ref));
 			echo $num_sale;
 			if (str_replace("-", "", $num_sale) > $max_sale) $max_sale = str_replace("-", "", $num_sale);
 			echo '\\\';Refresh();">';
 			if ($placeid == $obj->rowid) echo "<b>";
-			echo dol_print_date($db->jdate($obj->datec), '%H:%M');
+			echo dol_print_date($db->jdate($obj->datec), '%H:%M', 'tzuser');
 			if ($placeid == $obj->rowid) echo "</b>";
 			echo '</a>\');';
 		}

From 1eb88333569da70e46f160ab68a9e80a2b1f2124 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 23:39:51 +0100
Subject: [PATCH 58/95] Fix total when no data

---
 .../accountancy/bookkeeping/listbyaccount.php | 68 ++++++++++---------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 0b063adb1ff..4847dfd2e9a 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -749,40 +749,42 @@ while ($i < min($num, $limit))
 	$i++;
 }
 
-// Show sub-total of last shown account
-if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
-    $colnumber = 3;
-    $colnumberend = 7;
-} else {
-    $colnumber = 4;
-    $colnumberend = 7;
+if ($num > 0) {
+	// Show sub-total of last shown account
+	if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
+	    $colnumber = 3;
+	    $colnumberend = 7;
+	} else {
+	    $colnumber = 4;
+	    $colnumberend = 7;
+	}
+	$colspan = $totalarray['nbfield'] - $colnumber;
+	$colspanend = $totalarray['nbfield'] - $colnumberend;
+	print '<tr class="liste_total">';
+	print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.$accountg.':</td>';
+	print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
+	print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
+	print '<td colspan="'.$colspanend.'"></td>';
+	print '</tr>';
+	// Show balance of last shown account
+	$balance = $sous_total_debit - $sous_total_credit;
+	print '<tr class="liste_total">';
+	print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
+	if ($balance > 0)
+	{
+		print '<td class="nowraponall right">';
+		print price($sous_total_debit - $sous_total_credit);
+		print '</td>';
+		print '<td></td>';
+	} else {
+		print '<td></td>';
+		print '<td class="nowraponall right">';
+		print price($sous_total_credit - $sous_total_debit);
+		print '</td>';
+	}
+	print '<td colspan="'.$colspanend.'"></td>';
+	print '</tr>';
 }
-$colspan = $totalarray['nbfield'] - $colnumber;
-$colspanend = $totalarray['nbfield'] - $colnumberend;
-print '<tr class="liste_total">';
-print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.$accountg.':</td>';
-print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
-print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
-print '<td colspan="'.$colspanend.'"></td>';
-print '</tr>';
-// Show balance of last shown account
-$balance = $sous_total_debit - $sous_total_credit;
-print '<tr class="liste_total">';
-print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
-if ($balance > 0)
-{
-	print '<td class="nowraponall right">';
-	print price($sous_total_debit - $sous_total_credit);
-	print '</td>';
-	print '<td></td>';
-} else {
-	print '<td></td>';
-	print '<td class="nowraponall right">';
-	print price($sous_total_credit - $sous_total_debit);
-	print '</td>';
-}
-print '<td colspan="'.$colspanend.'"></td>';
-print '</tr>';
 
 // Show total line
 include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';

From e17d4b8220e2e9e5f1aa27cc4421f9d9cad31706 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 23:51:55 +0100
Subject: [PATCH 59/95] Fix total when no data

---
 .../bookkeeping/listbysubaccount.php          | 68 ++++++++++---------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
index 2bdf5e11d09..abbf5df60e7 100644
--- a/htdocs/accountancy/bookkeeping/listbysubaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -761,40 +761,42 @@ while ($i < min($num, $limit))
 	$i++;
 }
 
-// Show sub-total of last shown account
-if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
-    $colnumber = 3;
-    $colnumberend = 7;
-} else {
-    $colnumber = 4;
-    $colnumberend = 7;
+if ($num > 0) {
+	// Show sub-total of last shown account
+	if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
+	    $colnumber = 3;
+	    $colnumberend = 7;
+	} else {
+	    $colnumber = 4;
+	    $colnumberend = 7;
+	}
+	$colspan = $totalarray['nbfield'] - $colnumber;
+	$colspanend = $totalarray['nbfield'] - $colnumberend;
+	print '<tr class="liste_total">';
+	print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.$accountg.':</td>';
+	print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
+	print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
+	print '<td colspan="'.$colspanend.'"></td>';
+	print '</tr>';
+	// Show balance of last shown account
+	$balance = $sous_total_debit - $sous_total_credit;
+	print '<tr class="liste_total">';
+	print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
+	if ($balance > 0)
+	{
+		print '<td class="nowraponall right">';
+		print price($sous_total_debit - $sous_total_credit);
+		print '</td>';
+		print '<td></td>';
+	} else {
+		print '<td></td>';
+		print '<td class="nowraponall right">';
+		print price($sous_total_credit - $sous_total_debit);
+		print '</td>';
+	}
+	print '<td colspan="'.$colspanend.'"></td>';
+	print '</tr>';
 }
-$colspan = $totalarray['nbfield'] - $colnumber;
-$colspanend = $totalarray['nbfield'] - $colnumberend;
-print '<tr class="liste_total">';
-print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.$accountg.':</td>';
-print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
-print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
-print '<td colspan="'.$colspanend.'"></td>';
-print '</tr>';
-// Show balance of last shown account
-$balance = $sous_total_debit - $sous_total_credit;
-print '<tr class="liste_total">';
-print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
-if ($balance > 0)
-{
-	print '<td class="nowraponall right">';
-	print price($sous_total_debit - $sous_total_credit);
-	print '</td>';
-	print '<td></td>';
-} else {
-	print '<td></td>';
-	print '<td class="nowraponall right">';
-	print price($sous_total_credit - $sous_total_debit);
-	print '</td>';
-}
-print '<td colspan="'.$colspanend.'"></td>';
-print '</tr>';
 
 // Show total line
 include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';

From 46160614b84861e3a62b2f17e4f21f8f84c2f35a Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 31 Dec 2020 03:30:18 +0100
Subject: [PATCH 60/95] Typo

---
 htdocs/adherents/card.php | 2 +-
 htdocs/admin/modules.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 418c5cc5674..94904d877e7 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1761,7 +1761,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			 if ($linktoelem) print ($somethingshown?'':'<br>').$linktoelem;
 			 */
 
-			// Shon online payment link
+			// Show online payment link
 			$useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
 
 			if ($useonlinepayment) {
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 4316130e739..472777ee898 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -1137,7 +1137,7 @@ if ($mode == 'deploy') {
 
 			print '<input class="flat minwidth400" type="file" name="fileinstall" id="fileinstall"> ';
 
-			print '<input type="submit" name="send" value="'.dol_escape_htmltag($langs->trans("Send")).'" class="button">';
+			print '<input type="submit" name="send" value="'.dol_escape_htmltag($langs->trans("Upload")).'" class="button">';
 
 			if (!empty($conf->global->MAIN_UPLOAD_DOC)) {
 				if ($user->admin) {

From e187e77acbc0697a5ca27fa8cc6875b083d6bacb Mon Sep 17 00:00:00 2001
From: jcp <jcprieto@virtual20.com>
Date: Thu, 31 Dec 2020 10:12:03 +0100
Subject: [PATCH 61/95] ICS and ICS_transfer hide if module not enabled

---
 htdocs/compta/bank/card.php | 38 ++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 469165b4b6e..da02a19129f 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -95,8 +95,8 @@ if ($action == 'add')
 	$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
 	$object->owner_address   = trim(GETPOST("owner_address", 'nohtml'));
 	
-	$object->ics             = trim(GETPOST("ics", 'alpha');
-	$object->ics_transfer    = trim(GETPOST("ics_transfer", 'alpha');
+	$object->ics             = trim(GETPOST("ics", 'alpha'));
+	$object->ics_transfer    = trim(GETPOST("ics_transfer", 'alpha'));
 
 	$account_number = GETPOST('account_number', 'alphanohtml');
 	if (empty($account_number) || $account_number == '-1')
@@ -199,8 +199,8 @@ if ($action == 'update')
 	$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
 	$object->owner_address   = trim(GETPOST("owner_address", 'nohtml'));
 	
-	$object->ics             = trim(GETPOST("ics", 'alpha');
-	$object->ics_transfer    = trim(GETPOST("ics_transfer", 'alpha');
+	$object->ics             = trim(GETPOST("ics", 'alpha'));
+	$object->ics_transfer    = trim(GETPOST("ics_transfer", 'alpha'));
 
 	$account_number = GETPOST('account_number', 'alpha');
 	if (empty($account_number) || $account_number == '-1')
@@ -737,13 +737,17 @@ if ($action == 'create')
 			}
 			print '</td></tr>';
 			
-			print '<tr><td>'.$langs->trans("ICS").'</td>';
-			print '<td>'.$object->ics.'</td>';
-			print '</tr>';
+			if($conf->prelevement->enabled){
+				print '<tr><td>'.$langs->trans("ICS").'</td>';
+				print '<td>'.$object->ics.'</td>';
+				print '</tr>';
+			}
 			
-			print '<tr><td>'.$langs->trans("ICSTransfer").'</td>';
-			print '<td>'.$object->ics_transfer.'</td>';
-			print '</tr>';
+			if($conf->paymentbybanktransfer->enabled){
+				print '<tr><td>'.$langs->trans("ICSTransfer").'</td>';
+				print '<td>'.$object->ics_transfer.'</td>';
+				print '</tr>';
+			}
 
 			print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
 			print nl2br($object->domiciliation);
@@ -1025,12 +1029,16 @@ if ($action == 'create')
 			print '<tr><td>'.$langs->trans($bickey).'</td>';
 			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="bic" value="'.$object->bic.'"></td></tr>';
 			
-			print '<tr><td>'.$langs->trans("ICS").'</td>';
-			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics" value="'.$object->ics.'"></td></tr>';
-			
-			print '<tr><td>'.$langs->trans("ICSTransfer").'</td>';
-			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics_transfer" value="'.$object->ics_transfer.'"></td></tr>';
+			if($conf->prelevement->enabled){
+				print '<tr><td>'.$langs->trans("ICS").'</td>';
+				print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics" value="'.$object->ics.'"></td></tr>';
+			}
 			
+			if($conf->paymentbybanktransfer->enabled){
+				print '<tr><td>'.$langs->trans("ICSTransfer").'</td>';
+				print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics_transfer" value="'.$object->ics_transfer.'"></td></tr>';
+			}
+				
 			print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
 			print '<textarea class="flat quatrevingtpercent" name="domiciliation" rows="'.ROWS_2.'">';
 			print $object->domiciliation;

From af82bf2fee5aa96e7d822d11c1b0292a8829c4b2 Mon Sep 17 00:00:00 2001
From: JC Prieto <jcprieto@virtual20.com>
Date: Thu, 31 Dec 2020 10:47:30 +0100
Subject: [PATCH 62/95] Update create.php

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

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 0d29c578a8e..9b80017186a 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -49,7 +49,7 @@ $type = GETPOST('type', 'aZ09');
 $action = GETPOST('action', 'aZ09');
 $mode = GETPOST('mode', 'alpha') ?GETPOST('mode', 'alpha') : 'real';
 $format = GETPOST('format', 'aZ09');
-$id_bankaccount = GETPOST ( 'id_bankaccount','int' );
+$id_bankaccount = GETPOST ('id_bankaccount','int');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1

From 327ec211c4e08fddb5df9a45e477275572689a58 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 31 Dec 2020 09:49:27 +0000
Subject: [PATCH 63/95] Fixing style errors.

---
 htdocs/admin/paymentbybanktransfer.php        |  4 ++--
 htdocs/admin/prelevement.php                  |  5 ++---
 htdocs/compta/bank/card.php                   | 22 +++++++++----------
 htdocs/compta/bank/class/account.class.php    |  8 +++----
 .../class/bonprelevement.class.php            |  2 +-
 htdocs/compta/prelevement/create.php          | 14 +++++-------
 htdocs/core/lib/prelevement.lib.php           |  4 ++--
 .../bank/doc/pdf_sepamandate.modules.php      |  2 +-
 8 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php
index 5449e927a4f..7bbf72e83af 100644
--- a/htdocs/admin/paymentbybanktransfer.php
+++ b/htdocs/admin/paymentbybanktransfer.php
@@ -71,10 +71,10 @@ if ($action == "set")
         if (! $res > 0) $error++;
         */
 	} else $error++;
-/* Moved to account
+	/* Moved to account
 	$res = dolibarr_set_const($db, "PAYMENTBYBANKTRANSFER_ICS", GETPOST("PAYMENTBYBANKTRANSFER_ICS"), 'chaine', 0, '', $conf->entity);
 	if (!$res > 0) $error++;
-*/
+	*/
 	if (GETPOST("PAYMENTBYBANKTRANSFER_USER") > 0)
 	{
 		$res = dolibarr_set_const($db, "PAYMENTBYBANKTRANSFER_USER", GETPOST("PAYMENTBYBANKTRANSFER_USER"), 'chaine', 0, '', $conf->entity);
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 601cefc1dd2..8c713385892 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -70,14 +70,13 @@ if ($action == "set")
         $res = dolibarr_set_const($db, "PRELEVEMENT_RAISON_SOCIALE", $account->proprio,'chaine',0,'',$conf->entity);
         if (! $res > 0) $error++;
         */
-
 	} else $error++;
 
-/* Moved to account
+	/* Moved to account
 
 	$res = dolibarr_set_const($db, "PRELEVEMENT_ICS", GETPOST("PRELEVEMENT_ICS"), 'chaine', 0, '', $conf->entity);
 	if (!$res > 0) $error++;
-*/
+	*/
 	if (GETPOST("PRELEVEMENT_USER") > 0)
 	{
 		$res = dolibarr_set_const($db, "PRELEVEMENT_USER", GETPOST("PRELEVEMENT_USER"), 'chaine', 0, '', $conf->entity);
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index da02a19129f..aa17ad3620e 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -94,7 +94,7 @@ if ($action == 'add')
 
 	$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
 	$object->owner_address   = trim(GETPOST("owner_address", 'nohtml'));
-	
+
 	$object->ics             = trim(GETPOST("ics", 'alpha'));
 	$object->ics_transfer    = trim(GETPOST("ics_transfer", 'alpha'));
 
@@ -198,7 +198,7 @@ if ($action == 'update')
 
 	$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
 	$object->owner_address   = trim(GETPOST("owner_address", 'nohtml'));
-	
+
 	$object->ics             = trim(GETPOST("ics", 'alpha'));
 	$object->ics_transfer    = trim(GETPOST("ics_transfer", 'alpha'));
 
@@ -736,14 +736,14 @@ if ($action == 'create')
 				}
 			}
 			print '</td></tr>';
-			
-			if($conf->prelevement->enabled){
+
+			if ($conf->prelevement->enabled){
 				print '<tr><td>'.$langs->trans("ICS").'</td>';
 				print '<td>'.$object->ics.'</td>';
 				print '</tr>';
 			}
-			
-			if($conf->paymentbybanktransfer->enabled){
+
+			if ($conf->paymentbybanktransfer->enabled){
 				print '<tr><td>'.$langs->trans("ICSTransfer").'</td>';
 				print '<td>'.$object->ics_transfer.'</td>';
 				print '</tr>';
@@ -1028,17 +1028,17 @@ if ($action == 'create')
 
 			print '<tr><td>'.$langs->trans($bickey).'</td>';
 			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="bic" value="'.$object->bic.'"></td></tr>';
-			
-			if($conf->prelevement->enabled){
+
+			if ($conf->prelevement->enabled){
 				print '<tr><td>'.$langs->trans("ICS").'</td>';
 				print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics" value="'.$object->ics.'"></td></tr>';
 			}
-			
-			if($conf->paymentbybanktransfer->enabled){
+
+			if ($conf->paymentbybanktransfer->enabled){
 				print '<tr><td>'.$langs->trans("ICSTransfer").'</td>';
 				print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics_transfer" value="'.$object->ics_transfer.'"></td></tr>';
 			}
-				
+
 			print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
 			print '<textarea class="flat quatrevingtpercent" name="domiciliation" rows="'.ROWS_2.'">';
 			print $object->domiciliation;
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index ea6491c7636..bb7daa81a35 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -214,19 +214,19 @@ class Account extends CommonObject
 	 * @var int
 	 */
 	public $date_solde;
-	
+
 	/**
 	 * Creditor Identifier CI. Some banks use different ICS for direct debit and bank tranfer
 	 * @var string
 	 */
 	public $ics;
-	
+
 	/**
 	 * Creditor Identifier for Bank Transfer.
 	 * @var string
 	 */
 	public $ics_transfer;
-	
+
 
 
 	/**
@@ -1003,7 +1003,7 @@ class Account extends CommonObject
 
 				$this->date_creation  = $this->db->jdate($obj->date_creation);
 				$this->date_update    = $this->db->jdate($obj->date_update);
-				
+
 				$this->ics           = $obj->ics;
 				$this->ics_transfer  = $obj->ics_transfer;
 
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 2fff6336985..877e055972e 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1155,7 +1155,7 @@ class BonPrelevement extends CommonObject
 						$this->emetteur_iban               = $account->iban;
 						$this->emetteur_bic                = $account->bic;
 
-						$this->emetteur_ics                = ($type == 'bank-transfer' ? $account->ics_transfer : $account->ics); 
+						$this->emetteur_ics                = ($type == 'bank-transfer' ? $account->ics_transfer : $account->ics);
 
 						$this->raison_sociale              = $account->proprio;
 					}
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 9b80017186a..26b91a1e100 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -49,7 +49,7 @@ $type = GETPOST('type', 'aZ09');
 $action = GETPOST('action', 'aZ09');
 $mode = GETPOST('mode', 'alpha') ?GETPOST('mode', 'alpha') : 'real';
 $format = GETPOST('format', 'aZ09');
-$id_bankaccount = GETPOST ('id_bankaccount','int');
+$id_bankaccount = GETPOST('id_bankaccount', 'int');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
@@ -79,12 +79,11 @@ if (empty($reshook))
 	if ($action == 'create')
 	{
 		$default_account=($type == 'bank-transfer' ? 'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT' : 'PRELEVEMENT_ID_BANKACCOUNT');
-		
-		if($id_bankaccount != $conf->global->{$default_account}){
+
+		if ($id_bankaccount != $conf->global->{$default_account}){
 			$res = dolibarr_set_const($db, $default_account, $id_bankaccount, 'chaine', 0, '', $conf->entity);	//Set as default
-			
 		}
-		
+
 		require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 		$bank = new Account($db);
 		$bank->fetch($conf->global->{$default_account});
@@ -93,7 +92,7 @@ if (empty($reshook))
 			header("Location: ".DOL_URL_ROOT.'/compta/prelevement/create.php');
 			exit;
 		}
-			
+
 
 		$delayindays = 0;
 		if ($type != 'bank-transfer') {
@@ -207,12 +206,11 @@ print '<form action="'.$_SERVER['PHP_SELF'].'?action=create" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="type" value="'.$type.'">';
 if ($nb) {
-
     if ($pricetowithdraw) {
     	print $langs->trans('BankToReceiveWithdraw').': ';
     	$form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT, 'id_bankaccount', 0, "courant=1");
     	print ' - ';
-    	
+
         print $langs->trans('ExecutionDate').' ';
         $datere = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
         print $form->selectDate($datere, 're');
diff --git a/htdocs/core/lib/prelevement.lib.php b/htdocs/core/lib/prelevement.lib.php
index ac3c7b8b0fd..75bf914b964 100644
--- a/htdocs/core/lib/prelevement.lib.php
+++ b/htdocs/core/lib/prelevement.lib.php
@@ -82,14 +82,14 @@ function prelevement_prepare_head(BonPrelevement $object)
  *
  *	@return    	int		-1 if ko 0 if ok
  */
-function prelevement_check_config($type='direct-debit')
+function prelevement_check_config($type = 'direct-debit')
 {
 	global $conf, $db;
 	if ($type == 'bank-transfer'){
 		if (empty($conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT)) return -1;
 		//if (empty($conf->global->PRELEVEMENT_ICS)) return -1;
 		if (empty($conf->global->PAYMENTBYBANKTRANSFER_USER)) return -1;
-	}else{
+	}else {
 		if (empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1;
 		//if (empty($conf->global->PRELEVEMENT_ICS)) return -1;
 		if (empty($conf->global->PRELEVEMENT_USER)) return -1;
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index 17f1252925a..2b8987958f4 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -229,7 +229,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$posY += 2;
 				$pdf->SetXY($this->marge_gauche, $posY);
 				$ics = '';
-				if (!empty($conf->global->PRELEVEMENT_ICS)) $ics = $conf->global->PRELEVEMENT_ICS;	
+				if (!empty($conf->global->PRELEVEMENT_ICS)) $ics = $conf->global->PRELEVEMENT_ICS;
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("CreditorIdentifier").' ('.$outputlangs->transnoentitiesnoconv("ICS").') : '.$ics, 0, 'L');
 
 				$posY = $pdf->GetY();

From 9e8c6eb0a107da911083bdce8f25b68da4e5fc0b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Dec 2020 15:05:17 +0100
Subject: [PATCH 64/95] FIX #15849

---
 htdocs/core/tpl/objectline_create.tpl.php | 4 ++--
 htdocs/product/fournisseurs.php           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index f028c00d704..1c526f225aa 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -386,10 +386,10 @@ if ($nolinesbefore) {
 			<td class="nobottom margininfos linecolmargin right">
 				<!-- For predef product -->
 				<?php if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { ?>
-					<select id="fournprice_predef" name="fournprice_predef" class="flat minwidth75imp" style="display: none;"></select>
+					<select id="fournprice_predef" name="fournprice_predef" class="flat minwidth75imp maxwidth150" style="display: none;"></select>
 				<?php } ?>
 				<!-- For free product -->
-				<input type="text" id="buying_price" name="buying_price" class="flat maxwidth75 right" value="<?php echo (GETPOSTISSET("buying_price") ? GETPOST("buying_price", 'alpha', 2) : ''); ?>">
+				<input type="text" id="buying_price" name="buying_price" class="flat maxwidth75 maxwidth150 right" value="<?php echo (GETPOSTISSET("buying_price") ? GETPOST("buying_price", 'alpha', 2) : ''); ?>">
 			</td>
 			<?php
 			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index cf5e4fa5b53..2aadd4b3813 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -490,9 +490,9 @@ if ($id > 0 || $ref)
 				if ($rowid)
 				{
 					print '<input type="hidden" name="ref_fourn_old" value="'.$object->ref_supplier.'">';
-					print '<input class="flat" name="ref_fourn" size="12" value="'.$object->ref_supplier.'">';
+					print '<input class="flat width150" maxlength="30" name="ref_fourn" value="'.$object->ref_supplier.'">';
 				} else {
-					print '<input class="flat" name="ref_fourn" size="12" value="'.(GETPOST("ref_fourn") ?GETPOST("ref_fourn") : '').'">';
+					print '<input class="flat width150" maxlength="30" name="ref_fourn" value="'.(GETPOST("ref_fourn") ? GETPOST("ref_fourn") : '').'">';
 				}
 				print '</td>';
 				print '</tr>';

From c5b419ecb5200c74d8cf24585ca49235f90b17bb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Dec 2020 15:45:59 +0100
Subject: [PATCH 65/95] Removed useless file

---
 build.xml | 102 ------------------------------------------------------
 1 file changed, 102 deletions(-)
 delete mode 100644 build.xml

diff --git a/build.xml b/build.xml
deleted file mode 100644
index c6995ce95f3..00000000000
--- a/build.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Script build for hudson CI -->
-<project name="dolibarr" default="hudson" basedir=".">
-<!-- Exclude/ignore paths -->
- <property name="ignorepaths" value="${basedir}/htdocs/conf,${basedir}/htdocs/core/filemanagerdol,${basedir}/htdocs/includes" />
- <property name="ignoreregexp" value="**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*" />
- 
- <target name="clean">
-  <!-- Clean up -->
-  <delete dir="${basedir}/hudson"/>
-  <delete dir="${basedir}/generatedJUnitFiles"/>
-
-  <!-- Create build directories -->
-  <mkdir dir="${basedir}/hudson/doxygen"/>
-  <mkdir dir="${basedir}/hudson/logs"/>
-  <mkdir dir="${basedir}/hudson/coverage"/>
- </target>
-
- <!-- Run phpmd, phpcpd, phpcs, doxygen and phploc in parallel -->
- <target name="parallelTasks">
-  <parallel>
-   <!-- <antcall target="phpmd"/> -->
-   <antcall target="phpcpd"/>
-   <!-- <antcall target="phpcs"/> -->
-   <antcall target="doxygen"/>
-   <antcall target="phploc"/>
-  </parallel>
- </target>
-
- <!-- Generate pmd.xml -->
-<!--
-<target name="phpmd">
-  <exec executable="phpmd">
-   <arg line="htdocs xml codesize,unusedcode
-              -\-reportfile '${basedir}/hudson/logs/pmd.xml'
-              -\-ignore=${ignorepaths}
-              " />
-  </exec>
- </target>
--->
-
- <!-- Generate pmd-cpd.xml -->
- <target name="phpcpd">
-  <exec executable="phpcpd">
-   <arg line="	--log-pmd '${basedir}/hudson/logs/pmd-cpd.xml'
-   				--exclude '${basedir}/htdocs/conf'
-   				--exclude '${basedir}/htdocs/core/filemanagerdol'
-   				--exclude '${basedir}/htdocs/includes'
-   				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*'
-   				--min-tokens 70
-   				--min-lines 20 
-   				htdocs
-   				" />
-  </exec>
- </target>
- 
- <!-- Generate phploc.csv -->
- <target name="phploc">
-  <exec executable="phploc">
-   <arg line="	--log-csv '${basedir}/hudson/logs/phploc.csv'
-   				--exclude '${basedir}/htdocs/conf'
-   				--exclude '${basedir}/htdocs/core/filemanagerdol'
-   				--exclude '${basedir}/htdocs/includes'
-   				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*'
-   				htdocs
-   				" />
-  </exec>
- </target>
-   
- <!-- Generate checkstyle.xml -->
- <target name="phpcs">
-  <exec executable="phpcs" dir="${basedir}">
-    <arg line=" --standard=${basedir}/dev/codesniffer/jenkins_ruleset.xml
-    			--report=checkstyle
-    			--report-file=${basedir}/hudson/logs/checkstyle.xml
-                --ignore=${ignorepaths},${ignoreregexp}
-                htdocs
-                "/>
-  </exec>
- </target>
- 
- <!-- Run unit tests and generate junit.xml and clover.xml -->
- <target name="phpunit">
-  <exec executable="phpunit" dir="${basedir}" failonerror="true">
-   <arg line="	--configuration ${basedir}/test/phpunit/phpunittest.xml
-				--log-junit ${basedir}/hudson/logs/junit.xml
-				--coverage-clover ${basedir}/hudson/coverage/clover.xml
-  				--coverage-html ${basedir}/hudson/coverage/
-  				test/phpunit/AllTests.php
-  				"/>
-  </exec>
- </target>
-
- <!-- Generate Doxygen documentation -->
- <target name="doxygen" description="Dolibarr documentation" >
-  <exec executable="doxygen" dir="${basedir}" failonerror="false">
-   <arg value="${basedir}/build/doxygen/jenkins_doxygen.doxyfile"/>
-  </exec>
- </target>
-
- <target name="hudson" depends="clean,phpunit,phpcs,parallelTasks"/>
-</project>
\ No newline at end of file

From 37437901601df5e4ba2d08ba883b3ea8be6c0747 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Dec 2020 15:49:25 +0100
Subject: [PATCH 66/95] Fix warning

---
 htdocs/webservices/server_order.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index 7f2f2ebd43f..8c278768990 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -364,6 +364,7 @@ function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
 	$objectresp = array();
 	$errorcode = ''; $errorlabel = '';
 	$error = 0;
+	$socid = 0;
 
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
@@ -387,7 +388,7 @@ function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
 			if ($result > 0)
 			{
 				// Security for external user
-				if ($socid && (empty($order->socid) || $socid != $order->socid))
+				if ($socid && $socid != $order->socid)
 				{
 					$error++;
 					$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';

From d834f6023dcce665043983e61cf0694d270da258 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Dec 2020 16:06:54 +0100
Subject: [PATCH 67/95] Fix rounding

---
 htdocs/core/class/html.form.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 492a4899376..4ed39694720 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2652,14 +2652,14 @@ class Form
 		if (!empty($conf->stock->enabled) && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)))
 		{
 			if (!empty($user->rights->stock->lire)) {
-				$opt .= ' - '.$langs->trans("Stock").':'.$objp->stock;
+				$opt .= ' - '.$langs->trans("Stock").': '.price(price2num($objp->stock, 'MS'));
 
 				if ($objp->stock > 0) {
 					$outval .= ' - <span class="product_line_stock_ok">';
 				} elseif ($objp->stock <= 0) {
 					$outval .= ' - <span class="product_line_stock_too_low">';
 				}
-				$outval .= $langs->transnoentities("Stock").':'.$objp->stock;
+				$outval .= $langs->transnoentities("Stock").': '.price(price2num($objp->stock, 'MS'));
 				$outval .= '</span>';
 				if (empty($novirtualstock) && !empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO))  // Warning, this option may slow down combo list generation
 				{
@@ -2989,14 +2989,14 @@ class Form
 					$novirtualstock = ($showstockinlist == 2);
 
 					if (!empty($user->rights->stock->lire)) {
-						$outvallabel .= ' - '.$langs->trans("Stock").':'.$objp->stock;
+						$outvallabel .= ' - '.$langs->trans("Stock").': '.price(price2num($objp->stock, 'MS'));
 
 						if ($objp->stock > 0) {
 							$optlabel .= ' - <span class="product_line_stock_ok">';
 						} elseif ($objp->stock <= 0) {
 							$optlabel .= ' - <span class="product_line_stock_too_low">';
 						}
-						$optlabel .= $langs->transnoentities("Stock").':'.$objp->stock;
+						$optlabel .= $langs->transnoentities("Stock").':'.price(price2num($objp->stock, 'MS'));
 						$optlabel .= '</span>';
 						if (empty($novirtualstock) && !empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO))  // Warning, this option may slow down combo list generation
 						{

From d2345ea96c977077d757951545c41ba7aafd63c1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Dec 2020 16:55:29 +0100
Subject: [PATCH 68/95] Fix warning

---
 htdocs/webservices/server_thirdparty.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index 12b2d3315c8..cd930f47ad3 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -468,12 +468,12 @@ function createThirdParty($authentication, $thirdparty)
 
 		$newobject->capital = $thirdparty['capital'];
 
-		$newobject->barcode = $thirdparty['barcode'];
-		$newobject->tva_assuj = $thirdparty['vat_used'];
-		$newobject->tva_intra = $thirdparty['vat_number'];
+		$newobject->barcode = empty($thirdparty['barcode']) ? '' : $thirdparty['barcode'];
+		$newobject->tva_assuj = empty($thirdparty['vat_used']) ? 0 : $thirdparty['vat_used'];
+		$newobject->tva_intra = empty($thirdparty['vat_number']) ? '' : $thirdparty['vat_number'];
 
-		$newobject->canvas = $thirdparty['canvas'];
-		$newobject->particulier = $thirdparty['individual'];
+		$newobject->canvas = empty($thirdparty['canvas']) ? '' : $thirdparty['canvas'];
+		$newobject->particulier = empty($thirdparty['individual']) ? 0 : $thirdparty['individual'];
 
 		$elementtype = 'societe';
 

From 48e9c28420144ff02ddf63eda702fe3714c7d942 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Jan 2021 20:56:34 +0100
Subject: [PATCH 69/95] Fix warning

---
 htdocs/webservices/server_thirdparty.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index 12b2d3315c8..1b501cf4327 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -486,7 +486,9 @@ function createThirdParty($authentication, $thirdparty)
 			foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 			{
 				$key = 'options_'.$key;
-				$newobject->array_options[$key] = $thirdparty[$key];
+				if (isset($thirdparty[$key])) {
+					$newobject->array_options[$key] = $thirdparty[$key];
+				}
 			}
 		}
 

From 7c74a713055437e76e21ae7c62a9c3cecd3e42f6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Jan 2021 21:03:44 +0100
Subject: [PATCH 70/95] Fix regression

---
 htdocs/compta/bank/class/account.class.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 1299c9f1fee..99fc7c77076 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -686,14 +686,14 @@ class Account extends CommonObject
 		$sql .= ", '".$this->db->escape($this->proprio)."'";
 		$sql .= ", '".$this->db->escape($this->owner_address)."'";
 		$sql .= ", '".$this->db->escape($this->currency_code)."'";
-		$sql .= ", ".$this->rappro;
+		$sql .= ", ".((int) $this->rappro);
 		$sql .= ", ".price2num($this->min_allowed);
 		$sql .= ", ".price2num($this->min_desired);
 		$sql .= ", '".$this->db->escape($this->comment)."'";
 		$sql .= ", ".($this->state_id > 0 ? $this->state_id : "null");
-		$sql .= ", ".$this->country_id;
-		$sql .= ", ".$this->db->escape($this->ics);
-		$sql .= ", ".$this->db->escape($this->ics_transfer);
+		$sql .= ", ".($this->country_id > 0 ? $this->country_id : 0);
+		$sql .= ", '".$this->db->escape($this->ics)."'";
+		$sql .= ", '".$this->db->escape($this->ics_transfer)."'";
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -822,8 +822,8 @@ class Account extends CommonObject
 
 		$sql .= ",state_id = ".($this->state_id > 0 ? $this->state_id : "null");
 		$sql .= ",fk_pays = ".$this->country_id;
-		$sql .= ",ics='".$this->db->escape($this->ics)."'";
-		$sql .= ",ics_transfer='".$this->db->escape($this->ics_transfer)."'";
+		$sql .= ",ics = '".$this->db->escape($this->ics)."'";
+		$sql .= ",ics_transfer = '".$this->db->escape($this->ics_transfer)."'";
 
 		$sql .= " WHERE rowid = ".$this->id;
 

From 715d3499ff5fca125d65f433b3a2d830cedb031f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Jan 2021 21:06:47 +0100
Subject: [PATCH 71/95] Clean code

---
 htdocs/compta/bank/class/account.class.php | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 99fc7c77076..f4a4f0f0480 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -612,8 +612,6 @@ class Account extends CommonObject
 		// Clean parameters
 		if (!$this->min_allowed) $this->min_allowed = 0;
 		if (!$this->min_desired) $this->min_desired = 0;
-		$this->state_id = ($this->state_id ? $this->state_id : $this->state_id);
-		$this->country_id = ($this->country_id ? $this->country_id : $this->country_id);
 
 		// Check parameters
 		if (empty($this->country_id))
@@ -691,7 +689,7 @@ class Account extends CommonObject
 		$sql .= ", ".price2num($this->min_desired);
 		$sql .= ", '".$this->db->escape($this->comment)."'";
 		$sql .= ", ".($this->state_id > 0 ? $this->state_id : "null");
-		$sql .= ", ".($this->country_id > 0 ? $this->country_id : 0);
+		$sql .= ", ".($this->country_id > 0 ? $this->country_id : "null");
 		$sql .= ", '".$this->db->escape($this->ics)."'";
 		$sql .= ", '".$this->db->escape($this->ics_transfer)."'";
 		$sql .= ")";
@@ -773,10 +771,6 @@ class Account extends CommonObject
 
 		$this->db->begin();
 
-		// Clean parameters
-		$this->state_id = ($this->state_id ? $this->state_id : $this->state_id);
-		$this->country_id = ($this->country_id ? $this->country_id : $this->country_id);
-
 		// Check parameters
 		if (empty($this->country_id))
 		{
@@ -821,7 +815,7 @@ class Account extends CommonObject
 		$sql .= ",comment     = '".$this->db->escape($this->comment)."'";
 
 		$sql .= ",state_id = ".($this->state_id > 0 ? $this->state_id : "null");
-		$sql .= ",fk_pays = ".$this->country_id;
+		$sql .= ",fk_pays = ".($this->country_id > 0 ? $this->country_id : "null");
 		$sql .= ",ics = '".$this->db->escape($this->ics)."'";
 		$sql .= ",ics_transfer = '".$this->db->escape($this->ics_transfer)."'";
 
@@ -874,11 +868,7 @@ class Account extends CommonObject
 		// phpcs:enable
 		global $conf, $langs;
 
-		// Clean parameters
-		$this->state_id = ($this->state_id ? $this->state_id : $this->state_id);
-		$this->country_id = ($this->country_id ? $this->country_id : $this->country_id);
-
-		// Chargement librairie pour acces fonction controle RIB
+		// Load library to get BAN control function
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 
 		dol_syslog(get_class($this)."::update_bban $this->code_banque,$this->code_guichet,$this->number,$this->cle_rib,$this->iban");
@@ -902,7 +892,7 @@ class Account extends CommonObject
 		$sql .= ",proprio = '".$this->db->escape($this->proprio)."'";
 		$sql .= ",owner_address = '".$this->db->escape($this->owner_address)."'";
 		$sql .= ",state_id = ".($this->state_id > 0 ? $this->state_id : "null");
-		$sql .= ",fk_pays = ".$this->country_id;
+		$sql .= ",fk_pays = ".($this->country_id > 0 ? $this->country_id : "null");
 		$sql .= " WHERE rowid = ".$this->id;
 		$sql .= " AND entity = ".$conf->entity;
 

From ede38dec3052509c49fddd00da282429319c77d4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Jan 2021 20:56:34 +0100
Subject: [PATCH 72/95] Fix warning

---
 htdocs/webservices/server_thirdparty.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index cd930f47ad3..4bed0e1be3b 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -486,7 +486,9 @@ function createThirdParty($authentication, $thirdparty)
 			foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 			{
 				$key = 'options_'.$key;
-				$newobject->array_options[$key] = $thirdparty[$key];
+				if (isset($thirdparty[$key])) {
+					$newobject->array_options[$key] = $thirdparty[$key];
+				}
 			}
 		}
 

From 37e9d139827b1167db475938b4de53dab57a7b86 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Jan 2021 21:25:37 +0100
Subject: [PATCH 73/95] Fix warning

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

diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index 4bed0e1be3b..7c97159d0bb 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -510,7 +510,7 @@ function createThirdParty($authentication, $thirdparty)
 			$db->commit();
 
 			// Patch to add capability to associate (one) sale representative
-			if ($thirdparty['commid'] && $thirdparty['commid'] > 0)
+			if (!empty($thirdparty['commid']) && $thirdparty['commid'] > 0)
 				$newobject->add_commercial($fuser, $thirdparty["commid"]);
 
 			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);

From a8cd62c44e87c8c2c007f50400eaa5394ee9f837 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Jan 2021 22:00:00 +0100
Subject: [PATCH 74/95] Add AUDIT_ENABLE_PREFIX_SESSION

---
 htdocs/admin/tools/listevents.php | 10 +++++++++-
 htdocs/langs/en_US/other.lang     |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 00c4bdc36dd..78a3f8948d4 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -92,7 +92,15 @@ $date_endday = $tmp['mday'];
 $date_endmonth = $tmp['mon'];
 $date_endyear = $tmp['year'];
 
-$arrayfields = array();
+// Add prefix session
+$arrayfields = array(
+	'e.prefix_session' => array(
+		'label'=>'UserAgent',
+		'checked'=>(empty($conf->global->AUDIT_ENABLE_PREFIX_SESSION) ? 0 : 1),
+		'enabled'=>(empty($conf->global->AUDIT_ENABLE_PREFIX_SESSION) ? 0 : 1),
+		'position'=>110
+	)
+);
 
 
 /*
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 011352f1dcd..0a7b3723ab1 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -259,7 +259,8 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
- 
+PrefixSession=Prefix for session ID
+
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats

From f328bdc3f998f7b6122cd506dec180de4d9fa03d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Jan 2021 22:05:12 +0100
Subject: [PATCH 75/95] Fix var name

---
 htdocs/admin/tools/listevents.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 00c4bdc36dd..57fc2d07011 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -211,7 +211,7 @@ if ($result)
 	if ($search_user) $param .= '&search_user='.urlencode($search_user);
 	if ($search_desc) $param .= '&search_desc='.urlencode($search_desc);
 	if ($search_ua)   $param .= '&search_ua='.urlencode($search_ua);
-	if ($search_prefix_sessiona)   $param .= '&search_prefix_session='.urlencode($search_prefix_session);
+	if ($search_prefix_session)   $param .= '&search_prefix_session='.urlencode($search_prefix_session);
 	if ($date_startmonth) $param .= "&date_startmonth=".urlencode($date_startmonth);
 	if ($date_startday)   $param .= "&date_startday=".urlencode($date_startday);
 	if ($date_startyear)  $param .= "&date_startyear=".urlencode($date_startyear);

From 0c95540ff0dc15ad0b8366ba3a9ec9ef350df0e3 Mon Sep 17 00:00:00 2001
From: Aisuko <17001223+AisukoWasTaken@users.noreply.github.com>
Date: Fri, 1 Jan 2021 22:53:01 +0100
Subject: [PATCH 76/95] Fix wrong cast for pos_change

The variable pos_change was cast in "int" where it should be cast in "float". It results in rounded value making the receipt showing wrong cash exchange.
---
 htdocs/compta/paiement/class/paiement.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 28635a2df60..6b7f1612836 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -294,7 +294,7 @@ class Paiement extends CommonObject
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement (entity, ref, ref_ext, datec, datep, amount, multicurrency_amount, fk_paiement, num_paiement, note, ext_payment_id, ext_payment_site, fk_user_creat, pos_change)";
 		$sql .= " VALUES (".$conf->entity.", '".$this->db->escape($this->ref)."', '".$this->db->escape($this->ref_ext)."', '".$this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', ".$total.", ".$mtotal.", ".$this->paiementid.", ";
-		$sql .= "'".$this->db->escape($num_payment)."', '".$this->db->escape($note)."', ".($this->ext_payment_id ? "'".$this->db->escape($this->ext_payment_id)."'" : "null").", ".($this->ext_payment_site ? "'".$this->db->escape($this->ext_payment_site)."'" : "null").", ".$user->id.", ".((int) $this->pos_change).")";
+		$sql .= "'".$this->db->escape($num_payment)."', '".$this->db->escape($note)."', ".($this->ext_payment_id ? "'".$this->db->escape($this->ext_payment_id)."'" : "null").", ".($this->ext_payment_site ? "'".$this->db->escape($this->ext_payment_site)."'" : "null").", ".$user->id.", ".((float) $this->pos_change).")";
 
 		$resql = $this->db->query($sql);
 		if ($resql)

From 3cb71ef53e6cbf775fbf920d314be8db8c4d65d8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Jan 2021 22:55:22 +0100
Subject: [PATCH 77/95] Code comment

---
 htdocs/install/mysql/migration/repair.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 033db4620d1..6d662e64893 100644
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -475,7 +475,7 @@ UPDATE llx_chargesociales SET date_creation = tms WHERE date_creation IS NULL;
 -- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
 -- VMYSQL4.1 update llx_inventory set date_cre = null where DATE(STR_TO_DATE(date_cre, '%Y-%m-%d')) IS NULL;
 
--- Note that you can manually set the default value of a date to CURRENT_TIMESTAMP with:
+-- Note that you can manually set the default value of a date or datetime to CURRENT_TIMESTAMP with:
 --ALTER TABLE llx_table modify column columnname datetime DEFAULT CURRENT_TIMESTAMP;
 
 

From 8ad9c3dbe9f556d771651281d22f429b6cabb4ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 2 Jan 2021 09:07:16 +0100
Subject: [PATCH 78/95] fix migration for icstransfert

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 3 ---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 6c94c4299d3..26ec6377cc3 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -387,9 +387,6 @@ ALTER TABLE llx_bank ADD COLUMN origin_id integer;
 ALTER TABLE llx_bank ADD COLUMN origin_type varchar(64) NULL;
 ALTER TABLE llx_bank ADD COLUMN import_key varchar(14);
 
-ALTER TABLE llx_bank_account ADD COLUMN ics varchar(32) NULL;
-ALTER TABLE llx_bank_account ADD COLUMN ics_transfer varchar(32) NULL;
-
 ALTER TABLE llx_menu MODIFY COLUMN enabled text;
 
 CREATE TABLE llx_ecm_files_extrafields
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 104670ce160..780568ba41b 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -39,3 +39,5 @@ UPDATE llx_adherent SET ref = rowid WHERE ref = '' or ref IS NULL;
 ALTER TABLE llx_adherent MODIFY COLUMN ref varchar(30) NOT NULL;
 ALTER TABLE llx_adherent ADD UNIQUE INDEX uk_adherent_ref (ref, entity);
 
+ALTER TABLE llx_bank_account ADD COLUMN ics varchar(32) NULL;
+ALTER TABLE llx_bank_account ADD COLUMN ics_transfer varchar(32) NULL;

From 4643e412821040d1cd31fe267dbc3f09190e9cce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 2 Jan 2021 09:35:57 +0100
Subject: [PATCH 79/95] remove unused code

---
 htdocs/core/actions_sendmails.inc.php | 262 +++++++++++---------------
 1 file changed, 105 insertions(+), 157 deletions(-)

diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 0be919de0dd..929d35d9730 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -33,8 +33,7 @@
 /*
  * Add file in email form
  */
-if (GETPOST('addfile', 'alpha'))
-{
+if (GETPOST('addfile', 'alpha')) {
 	$trackid = GETPOST('trackid', 'aZ09');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -50,8 +49,7 @@ if (GETPOST('addfile', 'alpha'))
 /*
  * Remove file in email form
  */
-if (!empty($_POST['removedfile']) && empty($_POST['removAll']))
-{
+if (!empty($_POST['removedfile']) && empty($_POST['removAll'])) {
 	$trackid = GETPOST('trackid', 'aZ09');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -69,24 +67,28 @@ if (!empty($_POST['removedfile']) && empty($_POST['removAll']))
 /*
  * Remove all files in email form
  */
-if (GETPOST('removAll', 'alpha'))
-{
+if (GETPOST('removAll', 'alpha')) {
 	$trackid = GETPOST('trackid', 'aZ09');
 
 	$listofpaths = array();
 	$listofnames = array();
 	$listofmimes = array();
 	$keytoavoidconflict = empty($trackid) ? '' : '-'.$trackid;
-	if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
-	if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
-	if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+	if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+		$listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
+	}
+	if (!empty($_SESSION["listofnames".$keytoavoidconflict])) {
+		$listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
+	}
+	if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+		$listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+	}
 
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	$formmail = new FormMail($db);
 	$formmail->trackid = $trackid;
 
-	foreach ($listofpaths as $key => $value)
-	{
+	foreach ($listofpaths as $key => $value) {
 		$pathtodelete = $value;
 		$filetodelete = $listofnames[$key];
 		$result = dol_delete_file($pathtodelete, 1); // Delete uploded Files
@@ -101,50 +103,56 @@ if (GETPOST('removAll', 'alpha'))
 /*
  * Send mail
  */
-if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST['removAll'] && !$_POST['removedfile'] && !$_POST['cancel'] && !$_POST['modelselected'])
-{
-	if (empty($trackid)) $trackid = GETPOST('trackid', 'aZ09');
+if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST['removAll'] && !$_POST['removedfile'] && !$_POST['cancel'] && !$_POST['modelselected']) {
+	if (empty($trackid)) {
+		$trackid = GETPOST('trackid', 'aZ09');
+	}
 
 	$subject = ''; $actionmsg = ''; $actionmsg2 = '';
 
 	$langs->load('mails');
 
-	if (is_object($object))
-	{
+	if (is_object($object)) {
 		$result = $object->fetch($id);
 
 		$sendtosocid = 0; // Id of related thirdparty
-		if (method_exists($object, "fetch_thirdparty") && !in_array($object->element, array('member', 'user', 'expensereport', 'societe', 'contact')))
-		{
+		if (method_exists($object, "fetch_thirdparty") && !in_array($object->element, array('member', 'user', 'expensereport', 'societe', 'contact'))) {
 			$resultthirdparty = $object->fetch_thirdparty();
 			$thirdparty = $object->thirdparty;
-			if (is_object($thirdparty)) $sendtosocid = $thirdparty->id;
-		} elseif ($object->element == 'member' || $object->element == 'user')
-		{
+			if (is_object($thirdparty)) {
+				$sendtosocid = $thirdparty->id;
+			}
+		} elseif ($object->element == 'member' || $object->element == 'user') {
 			$thirdparty = $object;
-			if ($object->socid > 0) $sendtosocid = $object->socid;
-		} elseif ($object->element == 'expensereport')
-		{
+			if ($object->socid > 0) {
+				$sendtosocid = $object->socid;
+			}
+		} elseif ($object->element == 'expensereport') {
 			$tmpuser = new User($db);
 			$tmpuser->fetch($object->fk_user_author);
 			$thirdparty = $tmpuser;
-			if ($object->socid > 0) $sendtosocid = $object->socid;
-		} elseif ($object->element == 'societe')
-		{
+			if ($object->socid > 0) {
+				$sendtosocid = $object->socid;
+			}
+		} elseif ($object->element == 'societe') {
 			$thirdparty = $object;
-			if (is_object($thirdparty) && $thirdparty->id > 0) $sendtosocid = $thirdparty->id;
-		} elseif ($object->element == 'contact')
-		{
+			if (is_object($thirdparty) && $thirdparty->id > 0) {
+				$sendtosocid = $thirdparty->id;
+			}
+		} elseif ($object->element == 'contact') {
 			$contact = $object;
 			if ($contact->id > 0) {
 				$contact->fetch_thirdparty();
 				$thirdparty = $contact->thirdparty;
-				if (is_object($thirdparty) && $thirdparty->id > 0) $sendtosocid = $thirdparty->id;
+				if (is_object($thirdparty) && $thirdparty->id > 0) {
+					$sendtosocid = $thirdparty->id;
+				}
 			}
-		} else dol_print_error('', "Use actions_sendmails.in.php for an element/object '".$object->element."' that is not supported");
+		} else {
+			dol_print_error('', "Use actions_sendmails.in.php for an element/object '".$object->element."' that is not supported");
+		}
 
-		if (is_object($hookmanager))
-		{
+		if (is_object($hookmanager)) {
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('initSendToSocid', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		}
@@ -152,8 +160,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 		$thirdparty = $mysoc;
 	}
 
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$sendto = '';
 		$sendtocc = '';
 		$sendtobcc = '';
@@ -163,48 +170,40 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 
 		// Define $sendto
 		$receiver = $_POST['receiver'];
-		if (!is_array($receiver))
-		{
-			if ($receiver == '-1') $receiver = array();
-			else $receiver = array($receiver);
+		if (!is_array($receiver)) {
+			if ($receiver == '-1') {
+				$receiver = array();
+			} else {
+				$receiver = array($receiver);
+			}
 		}
 
 		$tmparray = array();
-		if (trim($_POST['sendto']))
-		{
+		if (trim($_POST['sendto'])) {
 			// Recipients are provided into free text
 			$tmparray[] = trim($_POST['sendto']);
 		}
 
-		if (count($receiver) > 0)
-		{
+		if (count($receiver) > 0) {
 			// Recipient was provided from combo list
-			foreach ($receiver as $key=>$val)
-			{
-				if ($val == 'thirdparty') // Key selected means current third party ('thirdparty' may be used for current member or current user too)
-				{
+			foreach ($receiver as $key => $val) {
+				if ($val == 'thirdparty') { // Key selected means current third party ('thirdparty' may be used for current member or current user too)
 					$tmparray[] = dol_string_nospecial($thirdparty->getFullName($langs), ' ', array(",")).' <'.$thirdparty->email.'>';
-				}
-				elseif ($val == 'contact') // Key selected means current contact
-				{
+				} elseif ($val == 'contact') { // Key selected means current contact
 					$tmparray[] = dol_string_nospecial($contact->getFullName($langs), ' ', array(",")).' <'.$contact->email.'>';
 					$sendtoid[] = $contact->id;
-				} elseif ($val)	// $val is the Id of a contact
-				{
+				} elseif ($val) {	// $val is the Id of a contact
 					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 					$sendtoid[] = ((int) $val);
 				}
 			}
 		}
 
-		if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
-		{
+		if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
 			$receiveruser = $_POST['receiveruser'];
-			if (is_array($receiveruser) && count($receiveruser) > 0)
-			{
+			if (is_array($receiveruser) && count($receiveruser) > 0) {
 				$fuserdest = new User($db);
-				foreach ($receiveruser as $key=>$val)
-				{
+				foreach ($receiveruser as $key => $val) {
 					$tmparray[] = $fuserdest->user_get_property($val, 'email');
 					$sendtouserid[] = $val;
 				}
@@ -215,32 +214,27 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 
 		// Define $sendtocc
 		$receivercc = $_POST['receivercc'];
-		if (!is_array($receivercc))
-		{
-			if ($receivercc == '-1') $receivercc = array();
-			else $receivercc = array($receivercc);
+		if (!is_array($receivercc)) {
+			if ($receivercc == '-1') {
+				$receivercc = array();
+			} else {
+				$receivercc = array($receivercc);
+			}
 		}
 		$tmparray = array();
-		if (trim($_POST['sendtocc']))
-		{
+		if (trim($_POST['sendtocc'])) {
 			$tmparray[] = trim($_POST['sendtocc']);
 		}
-		if (count($receivercc) > 0)
-		{
-			foreach ($receivercc as $key=>$val)
-			{
-				// Recipient was provided from combo list
-				if ($val == 'thirdparty')	// Key selected means currentthird party (may be usd for current member or current user too)
-				{
+		if (count($receivercc) > 0) {
+			foreach ($receivercc as $key => $val) {
+				if ($val == 'thirdparty') {	// Key selected means currentthird party (may be usd for current member or current user too)
+					// Recipient was provided from combo list
 					$tmparray[] = dol_string_nospecial($thirdparty->name, ' ', array(",")).' <'.$thirdparty->email.'>';
-				}
-				// Recipient was provided from combo list
-				elseif ($val == 'contact')	// Key selected means current contact
-				{
+				} elseif ($val == 'contact') {	// Key selected means current contact
+					// Recipient was provided from combo list
 					$tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
 					//$sendtoid[] = $contact->id;  TODO Add also id of contact in CC ?
-				} elseif ($val)				// $val is the Id of a contact
-				{
+				} elseif ($val) {				// $val is the Id of a contact
 					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 					//$sendtoid[] = ((int) $val);  TODO Add also id of contact in CC ?
 				}
@@ -249,11 +243,9 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 		if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
 			$receiverccuser = $_POST['receiverccuser'];
 
-			if (is_array($receiverccuser) && count($receiverccuser) > 0)
-			{
+			if (is_array($receiverccuser) && count($receiverccuser) > 0) {
 				$fuserdest = new User($db);
-				foreach ($receiverccuser as $key=>$val)
-				{
+				foreach ($receiverccuser as $key => $val) {
 					$tmparray[] = $fuserdest->user_get_property($val, 'email');
 					$sendtoccuserid[] = $val;
 				}
@@ -261,8 +253,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 		}
 		$sendtocc = implode(',', $tmparray);
 
-		if (dol_strlen($sendto))
-		{
+		if (dol_strlen($sendto)) {
 			// Define $urlwithroot
 			$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
 			$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
@@ -291,8 +282,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				$sql .= ' WHERE rowid = '.(int) $reg[1];
 				$resql = $db->query($sql);
 				$obj = $db->fetch_object($resql);
-				if ($obj)
-				{
+				if ($obj) {
 					$from = dol_string_nospecial($obj->label, ' ', array(",")).' <'.$obj->email.'>';
 				}
 			} else {
@@ -312,21 +302,20 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			$sendtobcc = GETPOST('sendtoccc');
 			// Autocomplete the $sendtobcc
 			// $autocopy can be MAIN_MAIL_AUTOCOPY_PROPOSAL_TO, MAIN_MAIL_AUTOCOPY_ORDER_TO, MAIN_MAIL_AUTOCOPY_INVOICE_TO, MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO...
-			if (!empty($autocopy))
-			{
+			if (!empty($autocopy)) {
 				$sendtobcc .= (empty($conf->global->$autocopy) ? '' : (($sendtobcc ? ", " : "").$conf->global->$autocopy));
 			}
 
 			$deliveryreceipt = $_POST['deliveryreceipt'];
 
-			if ($action == 'send' || $action == 'relance')
-			{
+			if ($action == 'send' || $action == 'relance') {
 				$actionmsg2 = $langs->transnoentities('MailSentBy').' '.CMailFile::getValidAddress($from, 4, 0, 1).' '.$langs->transnoentities('at').' '.CMailFile::getValidAddress($sendto, 4, 0, 1);
-				if ($message)
-				{
+				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));
+					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);
@@ -343,50 +332,6 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			$filename = $attachedfiles['names'];
 			$mimetype = $attachedfiles['mimes'];
 
-			// Feature to push mail sent into Sent folder
-			/* This code must be now included into the hook mail, method sendMailAfter
-			if (! empty($conf->dolimail->enabled))
-			{
-				$mailfromid = explode("#", $_POST['frommail'],3);	// $_POST['frommail'] = 'aaa#Sent# <aaa@aaa.com>'	// TODO Use a better way to define Sent dir.
-				if (count($mailfromid)==0) $from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>';
-				else
-				{
-					$mbid = $mailfromid[1];
-
-					// IMAP Postbox
-					$mailboxconfig = new IMAP($db);
-					$mailboxconfig->fetch($mbid);
-					if ($mailboxconfig->mailbox_imap_host) $ref=$mailboxconfig->get_ref();
-
-					$mailboxconfig->folder_id=$mailboxconfig->mailbox_imap_outbox;
-					$mailboxconfig->userfolder_fetch();
-
-					if ($mailboxconfig->mailbox_save_sent_mails == 1)
-					{
-
-						$folder=str_replace($ref, '', $mailboxconfig->folder_cache_key);
-						if (!$folder) $folder = "Sent";	// Default Sent folder
-
-						$mailboxconfig->mbox = imap_open($mailboxconfig->get_connector_url().$folder, $mailboxconfig->mailbox_imap_login, $mailboxconfig->mailbox_imap_password);
-						if (false === $mailboxconfig->mbox)
-						{
-							$info = false;
-							$err = $langs->trans('Error3_Imap_Connection_Error');
-							setEventMessages($err,$mailboxconfig->element, null, 'errors');
-						}
-						else
-						{
-							$mailboxconfig->mailboxid=$_POST['frommail'];
-							$mailboxconfig->foldername=$folder;
-							$from = $mailfromid[0] . $mailfromid[2];
-							$imap=1;
-						}
-
-					}
-				}
-			}
-			*/
-
 			// Make substitution in email content
 			$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
 			$substitutionarray['__EMAIL__'] = $sendto;
@@ -398,38 +343,38 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			$subject = make_substitutions($subject, $substitutionarray);
 			$message = make_substitutions($message, $substitutionarray);
 
-			if (method_exists($object, 'makeSubstitution'))
-			{
+			if (method_exists($object, 'makeSubstitution')) {
 				$subject = $object->makeSubstitution($subject);
 				$message = $object->makeSubstitution($message);
 			}
 
 			// Send mail (substitutionarray must be done just before this)
-			if (empty($sendcontext)) $sendcontext = 'standard';
+			if (empty($sendcontext)) {
+				$sendcontext = 'standard';
+			}
 			$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1, '', '', $trackid, '', $sendcontext);
 
-			if ($mailfile->error)
-			{
+			if ($mailfile->error) {
 				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
 				$action = 'presend';
 			} else {
 				$result = $mailfile->sendfile();
-				if ($result)
-				{
+				if ($result) {
 					// Initialisation of datas of object to call trigger
-					if (is_object($object))
-					{
-						if (empty($actiontypecode)) $actiontypecode = 'AC_OTH_AUTO'; // Event insert into agenda automatically
+					if (is_object($object)) {
+						if (empty($actiontypecode)) {
+							$actiontypecode = 'AC_OTH_AUTO'; // Event insert into agenda automatically
+						}
 
 						$object->socid = $sendtosocid; // To link to a company
 						$object->sendtoid = $sendtoid; // To link to contact-addresses. This is an array.
 						$object->actiontypecode = $actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
 						$object->actionmsg = $actionmsg; // Long text (@todo Replace this with $message, we already have details of email in dedicated properties)
-						$object->actionmsg2		= $actionmsg2; // Short text ($langs->transnoentities('MailSentBy')...);
+						$object->actionmsg2 = $actionmsg2; // Short text ($langs->transnoentities('MailSentBy')...);
 
 						$object->trackid = $trackid;
-						$object->fk_element		= $object->id;
-						$object->elementtype	= $object->element;
+						$object->fk_element = $object->id;
+						$object->elementtype = $object->element;
 						if (is_array($attachedfiles) && count($attachedfiles) > 0) {
 							$object->attachedfiles = $attachedfiles;
 						}
@@ -447,11 +392,12 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 						$object->email_msgid = $mailfile->msgid;
 
 						// Call of triggers (you should have set $triggersendname to execute trigger. $trigger_name is deprecated)
-						if (!empty($triggersendname) || !empty($trigger_name))
-						{
+						if (!empty($triggersendname) || !empty($trigger_name)) {
 							// Call trigger
 							$result = $object->call_trigger(empty($triggersendname) ? $trigger_name : $triggersendname, $user);
-							if ($result < 0) $error++;
+							if ($result < 0) {
+								$error++;
+							}
 							// End call triggers
 
 							if ($error) {
@@ -466,10 +412,12 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 					$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($from, 2), $mailfile->getValidAddress($sendto, 2));
 					setEventMessages($mesg, null, 'mesgs');
 
-  					$moreparam = '';
-	  				if (isset($paramname2) || isset($paramval2)) $moreparam .= '&'.($paramname2 ? $paramname2 : 'mid').'='.$paramval2;
-		  			header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname ? $paramname : 'id').'='.(is_object($object) ? $object->id : '').$moreparam);
-			  		exit;
+					$moreparam = '';
+					if (isset($paramname2) || isset($paramval2)) {
+						$moreparam .= '&'.($paramname2 ? $paramname2 : 'mid').'='.$paramval2;
+					}
+					header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname ? $paramname : 'id').'='.(is_object($object) ? $object->id : '').$moreparam);
+					exit;
 				} else {
 					$langs->load("other");
 					$mesg = '<div class="error">';

From 5e692fa9db771f334afb13b6265f32a150fc0eb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 2 Jan 2021 09:47:29 +0100
Subject: [PATCH 80/95] doxygen

---
 htdocs/core/class/html.formmail.class.php | 66 ++++++++++++++++-------
 1 file changed, 48 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index a4f936cfca0..fceaedffb98 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -120,8 +120,16 @@ class FormMail extends Form
 	public $withtocc;
 	public $withtoccc;
 	public $withtopic;
-	public $withfile; // 0=No attaches files, 1=Show attached files, 2=Can add new attached files
-	public $withmaindocfile; // 1=Add a checkbox "Attach also main document" for mass actions (checked by default), -1=Add checkbox (not checked by default)
+
+	/**
+	 * @var int 0=No attaches files, 1=Show attached files, 2=Can add new attached files
+	 */
+	public $withfile;
+
+	/**
+	 * @var int 1=Add a checkbox "Attach also main document" for mass actions (checked by default), -1=Add checkbox (not checked by default)
+	 */
+	public $withmaindocfile;
 	public $withbody;
 
 	public $withfromreadonly;
@@ -195,7 +203,9 @@ class FormMail extends Form
 		// Set tmp user directory
 		$vardir = $conf->user->dir_output."/".$user->id;
 		$upload_dir = $vardir.'/temp/'; // TODO Add $keytoavoidconflict in upload_dir path
-		if (is_dir($upload_dir)) dol_delete_dir_recursive($upload_dir);
+		if (is_dir($upload_dir)) {
+			dol_delete_dir_recursive($upload_dir);
+		}
 
 		$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
 		unset($_SESSION["listofpaths".$keytoavoidconflict]);
@@ -219,15 +229,24 @@ class FormMail extends Form
 		$listofnames = array();
 		$listofmimes = array();
 
-		if (empty($file)) $file = basename($path);
-		if (empty($type)) $type = dol_mimetype($file);
+		if (empty($file)) {
+			$file = basename($path);
+		}
+		if (empty($type)) {
+			$type = dol_mimetype($file);
+		}
 
 		$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
-		if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
-		if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
-		if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
-		if (!in_array($file, $listofnames))
-		{
+		if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+			$listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
+		}
+		if (!empty($_SESSION["listofnames".$keytoavoidconflict])) {
+			$listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
+		}
+		if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+			$listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+		}
+		if (!in_array($file, $listofnames)) {
 			$listofpaths[] = $path;
 			$listofnames[] = $file;
 			$listofmimes[] = $type;
@@ -252,11 +271,16 @@ class FormMail extends Form
 		$listofmimes = array();
 
 		$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
-		if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
-		if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
-		if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
-		if ($keytodelete >= 0)
-		{
+		if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+			$listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
+		}
+		if (!empty($_SESSION["listofnames".$keytoavoidconflict])) {
+			$listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
+		}
+		if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+			$listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+		}
+		if ($keytodelete >= 0) {
 			unset($listofpaths[$keytodelete]);
 			unset($listofnames[$keytodelete]);
 			unset($listofmimes[$keytodelete]);
@@ -281,9 +305,15 @@ class FormMail extends Form
 		$listofmimes = array();
 
 		$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
-		if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
-		if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
-		if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+		if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+			$listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
+		}
+		if (!empty($_SESSION["listofnames".$keytoavoidconflict])) {
+			$listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
+		}
+		if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+			$listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+		}
 		return array('paths'=>$listofpaths, 'names'=>$listofnames, 'mimes'=>$listofmimes);
 	}
 

From 2894dac22142ad4249dc18866e0bb9bd0fbd4d0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 2 Jan 2021 10:17:11 +0100
Subject: [PATCH 81/95] clean code

---
 htdocs/core/class/html.form.class.php | 57 ++++++++++++---------------
 htdocs/langs/en_US/mails.lang         |  5 ++-
 2 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7be97293938..240c94860a5 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6707,24 +6707,20 @@ class Form
 		}
 
 		// Add code for jquery to use multiselect
-		if (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))
-		{
+		if (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')) {
 			$out .= "\n".'<!-- JS CODE TO ENABLE select for id '.$htmlname.' -->
 						<script>'."\n";
-			if ($addjscombo == 1)
-			{
+			if ($addjscombo == 1) {
 				$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
 				$out .= 'function formatResult(record) {'."\n";
-				if ($elemtype == 'category')
-				{
+				if ($elemtype == 'category') {
 					$out .= 'return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png"> \'+record.text+\'</span>\';';
 				} else {
 					$out .= 'return record.text;';
 				}
 				$out .= '};'."\n";
 				$out .= 'function formatSelection(record) {'."\n";
-				if ($elemtype == 'category')
-				{
+				if ($elemtype == 'category') {
 					$out .= 'return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png"> \'+record.text+\'</span>\';';
 				} else {
 					$out .= 'return record.text;';
@@ -6741,8 +6737,7 @@ class Form
 							 	templateSelection: formatSelection		/* For 4.0 */
 							});
 						});'."\n";
-			} elseif ($addjscombo == 2 && !defined('DISABLE_MULTISELECT'))
-			{
+			} elseif ($addjscombo == 2 && !defined('DISABLE_MULTISELECT')) {
 				// Add other js lib
 				// TODO external lib multiselect/jquery.multi-select.js must have been loaded to use this multiselect plugin
 				// ...
@@ -6763,20 +6758,18 @@ class Form
 
 		// Try also magic suggest
 		$out .= '<select id="'.$htmlname.'" class="multiselect'.($morecss ? ' '.$morecss : '').'" multiple name="'.$htmlname.'[]"'.($moreattrib ? ' '.$moreattrib : '').($width ? ' style="width: '.(preg_match('/%/', $width) ? $width : $width.'px').'"' : '').'>'."\n";
-		if (is_array($array) && !empty($array))
-		{
-			if ($value_as_key) $array = array_combine($array, $array);
+		if (is_array($array) && !empty($array)) {
+			if ($value_as_key) {
+				$array = array_combine($array, $array);
+			}
 
-			if (!empty($array))
-			{
-				foreach ($array as $key => $value)
-				{
+			if (!empty($array)) {
+				foreach ($array as $key => $value) {
 					$newval = ($translate ? $langs->trans($value) : $value);
 					$newval = ($key_in_label ? $key.' - '.$newval : $newval);
 
 					$out .= '<option value="'.$key.'"';
-					if (is_array($selected) && !empty($selected) && in_array((string) $key, $selected) && ((string) $key != ''))
-					{
+					if (is_array($selected) && !empty($selected) && in_array((string) $key, $selected) && ((string) $key != '')) {
 						$out .= ' selected';
 					}
 					$out .= ' data-html="'.dol_escape_htmltag($newval).'"';
@@ -6805,36 +6798,36 @@ class Form
 	{
 		global $conf, $langs, $user, $extrafields;
 
-		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) return '';
+		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			return '';
+		}
 
 		$tmpvar = "MAIN_SELECTEDFIELDS_".$varpage; // To get list of saved seleteced properties
-		if (!empty($user->conf->$tmpvar))
-		{
+		if (!empty($user->conf->$tmpvar)) {
 			$tmparray = explode(',', $user->conf->$tmpvar);
-			foreach ($array as $key => $val)
-			{
+			foreach ($array as $key => $val) {
 				//var_dump($key);
 				//var_dump($tmparray);
-				if (in_array($key, $tmparray)) $array[$key]['checked'] = 1;
-				else $array[$key]['checked'] = 0;
+				if (in_array($key, $tmparray)) {
+					$array[$key]['checked'] = 1;
+				} else {
+					$array[$key]['checked'] = 0;
+				}
 			}
 		}
 
 		$lis = '';
 		$listcheckedstring = '';
 
-		foreach ($array as $key => $val)
-		{
+		foreach ($array as $key => $val) {
 			/* var_dump($val);
             var_dump(array_key_exists('enabled', $val));
             var_dump(!$val['enabled']);*/
-			if (array_key_exists('enabled', $val) && isset($val['enabled']) && !$val['enabled'])
-			{
+			if (array_key_exists('enabled', $val) && isset($val['enabled']) && !$val['enabled']) {
 				unset($array[$key]); // We don't want this field
 				continue;
 			}
-			if ($val['label'])
-			{
+			if ($val['label']) {
 				if (!empty($val['langfile']) && is_object($langs)) {
 					$langs->load($val['langfile']);
 				}
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index a7cfde68ae7..230c9a6b3bf 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -92,7 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
-EmailCollectorFilterDesc=All filters must match to have an email being collected 
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
@@ -174,4 +174,5 @@ Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
-RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
\ No newline at end of file
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from
+email %s

From b71e837dddcf42c5f2090e64b64bfd86047322c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 2 Jan 2021 10:18:58 +0100
Subject: [PATCH 82/95] clean code

---
 htdocs/core/class/html.form.class.php | 3 +--
 htdocs/langs/en_US/mails.lang         | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 240c94860a5..20721b8ea05 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6668,8 +6668,7 @@ class Form
 			});
 			</script>';
 
-		if ($acceptdelayedhtml)
-		{
+		if ($acceptdelayedhtml) {
 			$delayedhtmlcontent .= $outdelayed;
 		} else {
 			$out .= $outdelayed;
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 230c9a6b3bf..7fd93be7b71 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -174,5 +174,4 @@ Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
-RecordCreatedByEmailCollector=Record created by the Email Collector %s from
-email %s
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s

From eb3b0ad6729abf46f078489fe3acee2049351e82 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Jan 2021 13:24:06 +0100
Subject: [PATCH 83/95] Fix warning

---
 htdocs/webservices/server_thirdparty.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index 7c97159d0bb..a4f7e21221d 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -329,8 +329,9 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 						'supplier_code' => $thirdparty->code_fournisseur,
 						'customer_code_accountancy' => $thirdparty->code_compta,
 						'supplier_code_accountancy' => $thirdparty->code_compta_fournisseur,
-						'fk_user_author' => $thirdparty->fk_user_author,
+						'user_creation' => $thirdparty->fk_user_creat,
 						'date_creation' => dol_print_date($thirdparty->date_creation, 'dayhourrfc'),
+						'user_modification' => $thirdparty->fk_user_modif,
 						'date_modification' => dol_print_date($thirdparty->date_modification, 'dayhourrfc'),
 						'address' => $thirdparty->address,
 						'zip' => $thirdparty->zip,

From 791a509c6c0c7dd9e1aa6d9b9a7be5d9fac01401 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Jan 2021 13:26:50 +0100
Subject: [PATCH 84/95] Fix warning

---
 htdocs/webservices/server_thirdparty.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index a4f7e21221d..6d44fe41ff6 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -370,7 +370,9 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 				{
 					foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 					{
-						$thirdparty_result_fields = array_merge($thirdparty_result_fields, array('options_'.$key => $thirdparty->array_options['options_'.$key]));
+						if (isset($thirdparty->array_options['options_'.$key])) {
+							$thirdparty_result_fields = array_merge($thirdparty_result_fields, array('options_'.$key => $thirdparty->array_options['options_'.$key]));
+						}
 					}
 				}
 
@@ -623,7 +625,9 @@ function updateThirdParty($authentication, $thirdparty)
 				foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 				{
 					$key = 'options_'.$key;
-					$object->array_options[$key] = $thirdparty[$key];
+					if (isset($thirdparty[$key])) {
+						$object->array_options[$key] = $thirdparty[$key];
+					}
 				}
 			}
 
@@ -728,7 +732,9 @@ function getListOfThirdParties($authentication, $filterthirdparty)
 				{
 					foreach ($extrafields->attributes[$elementtype]['label'] as $key => $label)
 					{
-						$extrafieldsOptions['options_'.$key] = $obj->{$key};
+						if (isset($obj->{$key})) {
+							$extrafieldsOptions['options_'.$key] = $obj->{$key};
+						}
 					}
 				}
 

From 2727fd70b7167025154922ae1b1094d802c34951 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 2 Jan 2021 14:00:24 +0100
Subject: [PATCH 85/95] FIX: Accountancy - Debug experimental function to
 validate movements

---
 htdocs/accountancy/closure/index.php    |  88 ++++++++++++-
 htdocs/accountancy/closure/validate.php | 156 ------------------------
 htdocs/core/menus/standard/eldy.lib.php |   4 -
 htdocs/langs/en_US/accountancy.lang     |   4 +-
 4 files changed, 89 insertions(+), 163 deletions(-)
 delete mode 100644 htdocs/accountancy/closure/validate.php

diff --git a/htdocs/accountancy/closure/index.php b/htdocs/accountancy/closure/index.php
index ed8fc8ecc7e..a8531ca0887 100644
--- a/htdocs/accountancy/closure/index.php
+++ b/htdocs/accountancy/closure/index.php
@@ -25,11 +25,16 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "bills", "other", "main", "accountancy"));
 
+$socid = GETPOST('socid', 'int');
+
+$action = GETPOST('action', 'aZ09');
+
 // Security check
 if (empty($conf->accounting->enabled)) {
 	accessforbidden();
@@ -39,6 +44,7 @@ if ($user->socid > 0)
 if (!$user->rights->accounting->fiscalyear->write)
 	accessforbidden();
 
+$object = new BookKeeping($db);
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
@@ -60,14 +66,91 @@ $year_current = $year_start;
 /*
  * Actions
  */
+if ($action == 'validate_movements_confirm' && $user->rights->accounting->fiscalyear->write) {
+	$result = $object->fetchAll();
 
+	if ($result < 0)
+	{
+		setEventMessages($object->error, $object->errors, 'errors');
+	} else {
+		// Specify as export : update field date_validated on selected month/year
+		$error = 0;
+		$db->begin();
+
+		$date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
+		$date_end = dol_mktime(23, 59, 59, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
+
+		if (is_array($object->lines))
+		{
+			foreach ($object->lines as $movement)
+			{
+				$now = dol_now();
+
+				$sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
+				$sql .= " SET date_validated = '".$db->idate($now)."'";
+				$sql .= " WHERE rowid = ".$movement->id;
+				$sql .= " AND doc_date >= '" . dol_print_date($date_start, 'dayrfc') . "'";
+                $sql .= " AND doc_date <= '" . dol_print_date($date_end, 'dayrfc') . "'";
+
+				dol_syslog("/accountancy/closure/index.php :: Function validate_movement_confirm Specify movements as validated sql=".$sql, LOG_DEBUG);
+				$result = $db->query($sql);
+				if (!$result)
+				{
+					$error++;
+					break;
+				}
+			}
+		}
+
+		if (!$error)
+		{
+			$db->commit();
+			setEventMessages($langs->trans("AllMovementsWereRecordedAsValidated"), null, 'mesgs');
+		} else {
+			$error++;
+			$db->rollback();
+			setEventMessages($langs->trans("NotAllMovementsCouldBeRecordedAsValidated"), null, 'errors');
+		}
+		header("Location: ".$_SERVER['PHP_SELF']."?year=".$year_start);
+		exit;
+	}
+}
 
 /*
  * View
  */
 
+$form = new Form($db);
+$formaccounting = new FormAccounting($db);
+
 llxHeader('', $langs->trans("Closure"));
 
+if ($action == 'validate_movements') {
+	$form_question = array();
+
+	$month = isset($conf->global->SOCIETE_FISCAL_MONTH_START) ? intval($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
+	$date_start = new DateTime(sprintf('%04d-%02d-%02d', $year_start, $month, 1));
+	$date_end = new DateTime(sprintf('%04d-%02d-%02d', $year_start, $month, 1));
+	$date_end->add(new DateInterval('P1Y'));
+	$date_end->sub(new DateInterval('P1D'));
+
+	$form_question['date_start'] = array(
+		'name' => 'date_start',
+		'type' => 'date',
+		'label' => $langs->trans('DateStart'),
+		'value' => $date_start->format('Y-m-d')
+	);
+	$form_question['date_end'] = array(
+		'name' => 'date_end',
+		'type' => 'date',
+		'label' => $langs->trans('DateEnd'),
+		'value' => $date_end->format('Y-m-d')
+	);
+
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?year='.$year_start, $langs->trans('ValidateMovements'), $langs->trans('DescValidateMovements', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'validate_movements_confirm', $form_question, '', 1, 300);
+	print $formconfirm;
+}
+
 $textprevyear = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_current - 1).'">'.img_previous().'</a>';
 $textnextyear = '&nbsp;<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_current + 1).'">'.img_next().'</a>';
 
@@ -80,9 +163,9 @@ print '<br>';
 
 $y = $year_current;
 
-$buttonbind = '<a class="butAction" href="./validate.php">'.$langs->trans("ValidateMovements").'</a>';
+$buttonvalidate = '<a class="butAction" name="button_validate_movements" href="'.$_SERVER["PHP_SELF"].'?action=validate_movements&year='.$year_start.'">'.$langs->trans("ValidateMovements").'</a>';
 
-print_barre_liste($langs->trans("OverviewOfMovementsNotValidated"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
+print_barre_liste($langs->trans("OverviewOfMovementsNotValidated"), '', '', '', '', '', '', -1, '', '', 0, $buttonvalidate, '', 0, 1, 1);
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
@@ -104,6 +187,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
 $sql .= " WHERE b.doc_date >= '".$db->idate($search_date_start)."'";
 $sql .= " AND b.doc_date <= '".$db->idate($search_date_end)."'";
 $sql .= " AND b.entity IN (".getEntity('bookkeeping', 0).")"; // We don't share object for accountancy
+$sql .= " AND date_validated IS NULL";
 
 dol_syslog('htdocs/accountancy/closure/index.php sql='.$sql, LOG_DEBUG);
 $resql = $db->query($sql);
diff --git a/htdocs/accountancy/closure/validate.php b/htdocs/accountancy/closure/validate.php
deleted file mode 100644
index 1013ad1b6ce..00000000000
--- a/htdocs/accountancy/closure/validate.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/* Copyright (C) 2019       Open-DSI    	    <support@open-dsi.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * \file 	    htdocs/accountancy/closure/validate.php
- * \ingroup     Accountancy
- * \brief 	    Validate entries page
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array("compta", "bills", "other", "main", "accountancy"));
-
-// Security check
-if (empty($conf->accounting->enabled)) {
-	accessforbidden();
-}
-if ($user->socid > 0)
-	accessforbidden();
-	if (!$user->rights->accounting->fiscalyear->write)
-	accessforbidden();
-
-
-$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
-if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else {
-	$year_start = dol_print_date(dol_now(), '%Y');
-	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
-}
-$year_end = $year_start + 1;
-$month_end = $month_start - 1;
-if ($month_end < 1)
-{
-	$month_end = 12;
-	$year_end--;
-}
-$search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);
-$search_date_end = dol_get_last_day($year_end, $month_end);
-$year_current = $year_start;
-
-/*
- * Actions
- */
-
-if ($action == 'validate')
-{
-	$now = dol_now();
-
-	// Update database
-	$db->begin();
-	$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
-	$sql .= " SET b.date_validated = '".$db->idate($now)."'";
-	$sql .= ' WHERE b.date_validated IS NULL';
-
-	dol_syslog("htdocs/accountancy/closure/validate.php validate", LOG_DEBUG);
-	$resql = $db->query($sql);
-	if (!$resql1) {
-		$error++;
-		$db->rollback();
-		setEventMessages($db->lasterror(), null, 'errors');
-	} else {
-		$db->commit();
-	}
-	// End clean database
-}
-
-
-/*
- * View
- */
-
-llxHeader('', $langs->trans("ValidateMovements"));
-
-$textprevyear = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_current - 1).'">'.img_previous().'</a>';
-$textnextyear = '&nbsp;<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_current + 1).'">'.img_next().'</a>';
-
-
-print load_fiche_titre($langs->trans("ValidateMovements")." ".$textprevyear." ".$langs->trans("Year")." ".$year_start." ".$textnextyear, '', 'title_accountancy');
-
-print $langs->trans("DescValidateMovements").'<br>';
-print '<br>';
-
-
-$y = $year_current;
-
-print_barre_liste($langs->trans("SelectMonthAndValidate"), '', '', '', '', '', '', -1, '', '', 0, '', 'class="right"', 0, 1, 1);
-
-print '<div class="div-table-responsive-no-min">';
-print '<table class="noborder centpercent">';
-print '<tr class="oddeven">';
-for ($i = 1; $i <= 12; $i++) {
-	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
-	print '<td class="center">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
-}
-print '<td><b>'.$langs->trans("Total").'</b></td></tr>';
-
-print '<tr class="oddeven">';
-$sql = "SELECT COUNT(b.rowid) as detail,";
-for ($i = 1; $i <= 12; $i++) {
-	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
-	$sql .= "  SUM(".$db->ifsql('MONTH(b.doc_date)='.$j, '1', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
-}
-$sql .= " COUNT(b.rowid) as total";
-$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
-$sql .= " WHERE b.doc_date >= '".$db->idate($search_date_start)."'";
-$sql .= " AND b.doc_date <= '".$db->idate($search_date_end)."'";
-$sql .= " AND b.entity IN (".getEntity('bookkeeping', 0).")"; // We don't share object for accountancy
-
-dol_syslog('htdocs/accountancy/closure/index.php sql='.$sql, LOG_DEBUG);
-$resql = $db->query($sql);
-if ($resql) {
-	$num = $db->num_rows($resql);
-
-	while ($row = $db->fetch_row($resql)) {
-		for ($i = 1; $i <= 12; $i++) {
-			print '<td class="nowrap center">'.$row[$i].'<br><br>';
-			print '<input id="cb'.$row[$i].'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$row[$i].'"'.($selected ? ' checked="checked"' : '').'>';
-			print '</td>';
-		}
-		print '<td class="valigntop"><b>'.$row[13].'</b></td>';
-	}
-
-	$db->free($resql);
-} else {
-	print $db->lasterror(); // Show last sql error
-}
-print '</tr>';
-print "</table>\n";
-
-print '<br><div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?month='.$year_current.'&action=validate"">'.$langs->trans("ValidateMovements").'</a></div>';
-print '</div>';
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 85b63a6f4e3..46950bdc50c 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1334,10 +1334,6 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				// Closure
 				if (!empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2) {
 					$newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_closure", $langs->trans("MenuAccountancyClosure"), 1, $user->rights->accounting->fiscalyear->write, '', $mainmenu, 'closure');
-
-					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_closure/', $leftmenu)) {
-						$newmenu->add("/accountancy/closure/validate.php?leftmenu=accountancy_closure", $langs->trans("MenuAccountancyValidationMovements"), 2, $user->rights->accounting->fiscalyear->write);
-					}
 				}
 
 				// Reports
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index c7ce4ac6b0b..bda6502aeed 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -274,11 +274,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done

From a8d15fafd22707600afb54339ca1b6aef03914ad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Jan 2021 14:17:54 +0100
Subject: [PATCH 86/95] Fix missing span

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

diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index caf2192a9a3..ed3578522d4 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -293,7 +293,7 @@ if (empty($mysoc->country_code))
 	    print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
 	    print " x ".$langs->trans("Quantity").": ".$qty;
 	    print " - ".$langs->trans("VAT").": ".$vat.'%';
-	    print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
+	    print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").":</span> ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
 
 	    $s = 10 / 3; $qty = 2; $vat = 10;
 	    $tmparray = calcul_price_total($qty, price2num($s, 'MU'), 0, $vat, -1, -1, 0, 'HT', 0, 0, $mysoc, $localtax_array);

From 601d4618d4c7bd50ab2e287df8f8ba1a3161cb76 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Jan 2021 14:52:37 +0100
Subject: [PATCH 87/95] Missing vat rates

---
 htdocs/install/mysql/data/llx_c_tva.sql | 27 ++++++++++++++++---------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 793b29ab640..7156812fb01 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -35,6 +35,16 @@
 
 delete from llx_c_tva;
 
+-- ALGERIA (id country=13)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 131, 13,     '0','0','TVA 0%',   1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 132, 13,  '9','0','TVA 9%',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 133, 13,     '19','0','TVA 19%',   1);
+
+-- ANGOLA (id country=35)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 351,  35,   '0','0','VAT Rate 0', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 352,  35,   '7','0','VAT reduced rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 353,  35,  '14','0','VAT standard rate',1);
+
 -- ARGENTINA (id country=23)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (231, 23,   '0','0','IVA Rate 0', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (232, 23,'10.5','0','IVA reduced rate',1);
@@ -202,6 +212,13 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 1
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 173,  17,  '19','0','Algemeen BTW tarief',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 174,  17,  '21','0','Algemeen BTW tarief (vanaf 1 oktober 2012)',0);
 
+-- NEW CALEDONIA (id country=165)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1651, 165,   '0','0','VAT Rate 0', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1652, 165,   '3','0','VAT standard 3', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1653, 165,   '6','0','VAT standard 6', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1654, 165,  '11','0','VAT standard rate', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1655, 165,  '22','0','VAT standard high', 1);
+
 -- NEW ZEALAND (id country=166)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1661, 166,   '0','0','VAT Rate 0', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1662, 166,  '15','0','VAT standard rate', 1);
@@ -361,16 +378,6 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (23
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2322,232,    '12','0','VAT 12%',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2323,232,     '8','0','VAT 8%',1);
 
--- ALGERIA(id country=13)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 131, 13,     '0','0','TVA 0%',   1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 132, 13,  '9','0','TVA 9%',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 133, 13,     '19','0','TVA 19%',   1);
-
--- ANGOLA (id country=35)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 351,  35,   '0','0','VAT Rate 0', 1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 352,  35,   '7','0','VAT reduced rate',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 353,  35,  '14','0','VAT standard rate',1);
-
 -- Example of code to insert a vat rate 0 for each country
 --delete from llx_c_tva where rowid = 1181;		-- to delete a record that does not follow rules for rowid (fk_pays+'1')
 --insert into llx_c_tva(rowid, fk_pays, taux, recuperableonly, note, active) SELECT CONCAT(c.rowid, '1'), c.rowid, 0, 0, 'No VAT', 1 from llx_c_country as c where c.rowid not in (select fk_pays from llx_c_tva);

From d46eb08083a5239a0e9196d968e3b2b4bb556363 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Jan 2021 15:36:19 +0100
Subject: [PATCH 88/95] More log and use id to refresh/reload an invoice.

---
 htdocs/takepos/index.php   |  5 +++--
 htdocs/takepos/invoice.php | 17 +++++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 4bfeaa57b75..51b6334a2c9 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -155,6 +155,7 @@ var pageactions=0;
 var place="<?php echo $place; ?>";
 var editaction="qty";
 var editnumber="";
+var invoiceid=0;
 
 /*
 var app = this;
@@ -448,8 +449,8 @@ function TakeposOrderNotes() {
 }
 
 function Refresh() {
-	console.log("Refresh by reloading place="+place);
-	$("#poslines").load("invoice.php?place="+place, function() {
+	console.log("Refresh by reloading place="+place+" invoiceid="+invoiceid);
+	$("#poslines").load("invoice.php?place="+place+"&invoiceid="+invoiceid, function() {
 		//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
 	});
 }
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 0909f1b3cca..f31bb90bfcd 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -742,7 +742,7 @@ function DolibarrTakeposPrinting(id) {
 
 
 $( document ).ready(function() {
-	console.log("Set customer info and sales in header");
+	console.log("Set customer info and sales in header placeid=<?php echo $placeid; ?> status=<?php echo $invoice->statut; ?>");
 
     <?php
     $s = $langs->trans("Customer");
@@ -757,7 +757,14 @@ $( document ).ready(function() {
 
 	<?php
 	$sql = "SELECT rowid, datec, ref FROM ".MAIN_DB_PREFIX."facture";
-	$sql .= " WHERE ref LIKE '(PROV-POS".$_SESSION["takeposterminal"]."-0%'";
+	if (empty($conf->global->TAKEPOS_CAN_EDIT_IF_ALREADY_VALIDATED)) {
+		// By default, only invoices with a ref not already defined can in list of open invoice we can edit.
+		$sql .= " WHERE ref LIKE '(PROV-POS".$_SESSION["takeposterminal"]."-0%'";
+	} else {
+		// If TAKEPOS_CAN_EDIT_IF_ALREADY_VALIDATED set, we show also draft invoice that already has a reference defined
+		$sql .= " WHERE pos_source = ".$_SESSION["takeposterminal"];
+		$sql .= " AND module_source = 'takepos'";
+	}
 	$sql .= $db->order('datec', 'ASC');
 	$resql = $db->query($sql);
 	if ($resql) {
@@ -767,7 +774,9 @@ $( document ).ready(function() {
 			$num_sale = str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $obj->ref));
 			echo $num_sale;
 			if (str_replace("-", "", $num_sale) > $max_sale) $max_sale = str_replace("-", "", $num_sale);
-			echo '\\\';Refresh();">';
+			echo '\\\'; invoiceid=\\\'';
+			echo $obj->rowid;
+			echo '\\\'; Refresh();">';
 			if ($placeid == $obj->rowid) echo "<b>";
 			echo dol_print_date($db->jdate($obj->datec), '%H:%M', 'tzuser');
 			if ($placeid == $obj->rowid) echo "</b>";
@@ -775,7 +784,7 @@ $( document ).ready(function() {
 		}
 		echo '$("#customerandsales").append(\'<a onclick="place=\\\'0-';
 		echo $max_sale + 1;
-		echo '\\\';Refresh();"><span class="fa fa-plus-square" title="'.dol_escape_htmltag($langs->trans("StartAParallelSale")).'"></a>\');';
+		echo '\\\'; invoiceid=0; Refresh();"><span class="fa fa-plus-square" title="'.dol_escape_htmltag($langs->trans("StartAParallelSale")).'"></a>\');';
 	} else {
 		dol_print_error($db);
 	}

From 02ae06f24abdd2e7c45f704568c61e3778ef03a8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Jan 2021 15:52:12 +0100
Subject: [PATCH 89/95] Fix warning

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

diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index 6d44fe41ff6..d7ded82cc3f 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -329,9 +329,9 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 						'supplier_code' => $thirdparty->code_fournisseur,
 						'customer_code_accountancy' => $thirdparty->code_compta,
 						'supplier_code_accountancy' => $thirdparty->code_compta_fournisseur,
-						'user_creation' => $thirdparty->fk_user_creat,
+						'user_creation' => $thirdparty->user_creation,
 						'date_creation' => dol_print_date($thirdparty->date_creation, 'dayhourrfc'),
-						'user_modification' => $thirdparty->fk_user_modif,
+						'user_modification' => $thirdparty->user_modification,
 						'date_modification' => dol_print_date($thirdparty->date_modification, 'dayhourrfc'),
 						'address' => $thirdparty->address,
 						'zip' => $thirdparty->zip,

From 2d22c1d5d167622b46f97765cfd7b31dd5bfdc80 Mon Sep 17 00:00:00 2001
From: Aisuko <17001223+AisukoWasTaken@users.noreply.github.com>
Date: Fri, 1 Jan 2021 22:53:01 +0100
Subject: [PATCH 90/95] Fix wrong cast for pos_change

The variable pos_change was cast in "int" where it should be cast in "float". It results in rounded value making the receipt showing wrong cash exchange.
---
 htdocs/compta/paiement/class/paiement.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 28635a2df60..6b7f1612836 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -294,7 +294,7 @@ class Paiement extends CommonObject
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement (entity, ref, ref_ext, datec, datep, amount, multicurrency_amount, fk_paiement, num_paiement, note, ext_payment_id, ext_payment_site, fk_user_creat, pos_change)";
 		$sql .= " VALUES (".$conf->entity.", '".$this->db->escape($this->ref)."', '".$this->db->escape($this->ref_ext)."', '".$this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', ".$total.", ".$mtotal.", ".$this->paiementid.", ";
-		$sql .= "'".$this->db->escape($num_payment)."', '".$this->db->escape($note)."', ".($this->ext_payment_id ? "'".$this->db->escape($this->ext_payment_id)."'" : "null").", ".($this->ext_payment_site ? "'".$this->db->escape($this->ext_payment_site)."'" : "null").", ".$user->id.", ".((int) $this->pos_change).")";
+		$sql .= "'".$this->db->escape($num_payment)."', '".$this->db->escape($note)."', ".($this->ext_payment_id ? "'".$this->db->escape($this->ext_payment_id)."'" : "null").", ".($this->ext_payment_site ? "'".$this->db->escape($this->ext_payment_site)."'" : "null").", ".$user->id.", ".((float) $this->pos_change).")";
 
 		$resql = $this->db->query($sql);
 		if ($resql)

From ce0abd17fe543c12606f585ca9085925072deb5a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Jan 2021 16:18:16 +0100
Subject: [PATCH 91/95] Debug v13

---
 htdocs/commande/card.php           |  6 +++---
 htdocs/compta/facture/card-rec.php |  8 ++++----
 htdocs/contrat/card.php            |  8 ++++----
 htdocs/core/lib/functions.lib.php  | 18 +++++++++++++-----
 htdocs/fourn/commande/card.php     | 10 +++++-----
 htdocs/fourn/facture/card.php      | 10 +++++-----
 htdocs/supplier_proposal/card.php  | 10 +++++-----
 7 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 213819b0915..2ea5c37bf39 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -631,9 +631,9 @@ if (empty($reshook))
 
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');
-		$price_ht = GETPOST('price_ht');
-		$price_ht_devise = GETPOST('multicurrency_price_ht');
+		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
+		$price_ht = price2num(GETPOST('price_ht'), 'MU');
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CR');
 		$prod_entry_mode = GETPOST('prod_entry_mode');
 		if ($prod_entry_mode == 'free')
 		{
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index b978de677a9..097585dbea0 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -437,9 +437,9 @@ if (empty($reshook))
 
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');
-		$price_ht = GETPOST('price_ht');
-		$price_ht_devise = GETPOST('multicurrency_price_ht');
+		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
+		$price_ht = price2num(GETPOST('price_ht'), 'MU');
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CR');
 		$prod_entry_mode = GETPOST('prod_entry_mode', 'alpha');
 		if ($prod_entry_mode == 'free')
 		{
@@ -450,7 +450,7 @@ if (empty($reshook))
 			$tva_tx = '';
 		}
 
-		$qty = GETPOST('qty'.$predef);
+		$qty = price2num(GETPOST('qty'.$predef), 'alpha');
 		$remise_percent = GETPOST('remise_percent'.$predef);
 
 		// Extrafields
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 2e692dc25c4..d07b8dcc60e 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -383,9 +383,9 @@ if (empty($reshook))
 	{
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');
-		$price_ht = price2num(GETPOST('price_ht'));
-		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'));
+		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
+		$price_ht = price2num(GETPOST('price_ht'), 'MU');
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht', 'CR');
 		if (GETPOST('prod_entry_mode', 'alpha') == 'free')
 		{
 			$idprod = 0;
@@ -395,7 +395,7 @@ if (empty($reshook))
 			$tva_tx = '';
 		}
 
-		$qty = price2num(GETPOST('qty'.$predef));
+		$qty = price2num(GETPOST('qty'.$predef), 'alpha');
 		$remise_percent = ((GETPOST('remise_percent'.$predef) != '') ? GETPOST('remise_percent'.$predef) : 0);
 
 		if ($qty == '')
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a156f35292e..8c1765620ec 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4810,7 +4810,7 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
  * 											'MU'=Round to Max unit price (MAIN_MAX_DECIMALS_UNIT)
  *											'MT'=Round to Max for totals with Tax (MAIN_MAX_DECIMALS_TOT)
  *											'MS'=Round to Max for stock quantity (MAIN_MAX_DECIMALS_STOCK)
- *      		                            'CR'=Currency rate
+ *      		                            'CR'=Foreign currency accurancy
  *											Numeric = Nb of digits for rounding
  * 	@param	int				$option			Put 1 if you know that content is already universal format number (so no correction on decimal will be done)
  * 											Put 2 if you know that number is a user input (so we know we don't have to fix decimal separator).
@@ -4871,10 +4871,18 @@ function price2num($amount, $rounding = '', $option = 0)
 	if ($rounding)
 	{
 		$nbofdectoround = '';
-		if ($rounding == 'MU')     $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_UNIT;
-		elseif ($rounding == 'MT') $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_TOT;
-		elseif ($rounding == 'MS') $nbofdectoround = empty($conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : $conf->global->MAIN_MAX_DECIMALS_STOCK;
-		elseif ($rounding == 'CR') $nbofdectoround = 8;
+		if ($rounding == 'MU') {
+			$nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_UNIT;
+		}
+		elseif ($rounding == 'MT') {
+			$nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_TOT;
+		}
+		elseif ($rounding == 'MS') {
+			$nbofdectoround = empty($conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : $conf->global->MAIN_MAX_DECIMALS_STOCK;
+		}
+		elseif ($rounding == 'CR') {
+			$nbofdectoround = max($conf->global->MAIN_MAX_DECIMALS_TOT, 8);
+		}
 		elseif (is_numeric($rounding))  $nbofdectoround = $rounding;
 		//print "RR".$amount.' - '.$nbofdectoround.'<br>';
 		if (dol_strlen($nbofdectoround)) $amount = round(is_string($amount) ? (float) $amount : $amount, $nbofdectoround); // $nbofdectoround can be 0.
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 987b80aa3ea..710657e1c16 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -356,24 +356,24 @@ if (empty($reshook))
 
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');
+		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 		$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
 		$prod_entry_mode = GETPOST('prod_entry_mode');
 		if ($prod_entry_mode == 'free')
 		{
 			$idprod = 0;
-			$price_ht = GETPOST('price_ht');
+			$price_ht = price2num(GETPOST('price_ht'), 'MU');
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 		} else {
 			$idprod = GETPOST('idprod', 'int');
-			$price_ht = GETPOST('price_ht');
+			$price_ht = price2num(GETPOST('price_ht'), 'MU');
 			$tva_tx = '';
 		}
 
-		$qty = GETPOST('qty'.$predef);
+		$qty = price2num(GETPOST('qty'.$predef), 'alpha');
 		$remise_percent = GETPOST('remise_percent'.$predef);
-		$price_ht_devise = GETPOST('multicurrency_price_ht');
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CR');
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index c615817e36f..998ef884766 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1175,7 +1175,7 @@ if (empty($reshook))
 
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');
+		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 		$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
 
@@ -1183,17 +1183,17 @@ if (empty($reshook))
 		if ($prod_entry_mode == 'free')
 		{
 			$idprod = 0;
-			$price_ht = GETPOST('price_ht');
+			$price_ht = price2num(GETPOST('price_ht'), 'MU');
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 		} else {
 			$idprod = GETPOST('idprod', 'int');
-			$price_ht = GETPOST('price_ht');
+			$price_ht = price2num(GETPOST('price_ht'), 'MU');
 			$tva_tx = '';
 		}
 
-		$qty = GETPOST('qty'.$predef);
+		$qty = price2num(GETPOST('qty'.$predef), 'alpha');
 		$remise_percent = GETPOST('remise_percent'.$predef);
-		$price_ht_devise = GETPOST('multicurrency_price_ht');
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CR');
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index ae40784aa68..a571a207bc5 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -540,24 +540,24 @@ if (empty($reshook))
 
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');
+		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 		$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
 		$ref_supplier = GETPOST('fourn_ref', 'alpha');
 		$prod_entry_mode = GETPOST('prod_entry_mode');
 		if ($prod_entry_mode == 'free')	{
 			$idprod = 0;
-			$price_ht = GETPOST('price_ht');
+			$price_ht = price2num(GETPOST('price_ht'), 'MU');
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 		} else {
 			$idprod = GETPOST('idprod', 'int');
-			$price_ht = GETPOST('price_ht');
+			$price_ht = price2num(GETPOST('price_ht'), 'MU');
 			$tva_tx = '';
 		}
 
-		$qty = GETPOST('qty'.$predef);
+		$qty = price2num(GETPOST('qty'.$predef), 'alpha');
 		$remise_percent = GETPOST('remise_percent'.$predef);
-		$price_ht_devise = GETPOST('multicurrency_price_ht');
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CR');
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);

From fd4dab495f010fc170c94ab3e6d5a47be7e7f605 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Jan 2021 16:51:34 +0100
Subject: [PATCH 92/95] FIX Bad cleaning of VAT rate when numbers are into code

---
 htdocs/comm/propal/class/propal.class.php             |  5 ++++-
 htdocs/commande/class/commande.class.php              |  4 +++-
 htdocs/compta/facture/class/facture-rec.class.php     | 11 ++++++++---
 htdocs/compta/facture/class/facture.class.php         |  4 +++-
 htdocs/contrat/class/contrat.class.php                |  1 -
 htdocs/fichinter/class/fichinterrec.class.php         |  4 +++-
 htdocs/fourn/class/fournisseur.commande.class.php     |  4 +++-
 .../class/supplier_proposal.class.php                 | 11 ++++++++---
 8 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 144374ab47c..9d6b6c201c5 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -602,6 +602,7 @@ class Propal extends CommonObject
 
 			// Clean vat code
 			$vat_src_code = '';
+			$reg = array();
 			if (preg_match('/\((.*)\)/', $txtva, $reg))
 			{
 				$vat_src_code = $reg[1];
@@ -779,7 +780,9 @@ class Propal extends CommonObject
 		$qty = price2num($qty);
 		$pu = price2num($pu);
 		$pu_ht_devise = price2num($pu_ht_devise);
-		$txtva = price2num($txtva);
+		if (!preg_match('/\((.*)\)/', $txtva)) {
+			$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+		}
 		$txlocaltax1 = price2num($txlocaltax1);
 		$txlocaltax2 = price2num($txlocaltax2);
 		$pa_ht = price2num($pa_ht);
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 5402d31ba7d..49f8005980f 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3120,7 +3120,9 @@ class Commande extends CommonOrder
 			$pu = price2num($pu);
 			$pa_ht = price2num($pa_ht);
 			$pu_ht_devise = price2num($pu_ht_devise);
-			$txtva = price2num($txtva);
+			if (!preg_match('/\((.*)\)/', $txtva)) {
+				$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+			}
 			$txlocaltax1 = price2num($txlocaltax1);
 			$txlocaltax2 = price2num($txlocaltax2);
 
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index c5bd8a987ac..85ecb3f969d 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -849,7 +849,9 @@ class FactureRec extends CommonInvoice
 			$qty = price2num($qty);
 			$pu_ht = price2num($pu_ht);
 			$pu_ttc = price2num($pu_ttc);
-			$txtva = price2num($txtva);
+			if (!preg_match('/\((.*)\)/', $txtva)) {
+				$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+			}
 			$txlocaltax1 = price2num($txlocaltax1);
 			$txlocaltax2 = price2num($txlocaltax2);
 			if (empty($txtva)) $txtva = 0;
@@ -1031,8 +1033,10 @@ class FactureRec extends CommonInvoice
 	        $pu_ht          = price2num($pu_ht);
 	        $pu_ttc         = price2num($pu_ttc);
 	        $pu_ht_devise = price2num($pu_ht_devise);
-	        $txtva = price2num($txtva);
-		    $txlocaltax1	= price2num($txlocaltax1);
+	        if (!preg_match('/\((.*)\)/', $txtva)) {
+	        	$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+	        }
+	        $txlocaltax1	= price2num($txlocaltax1);
 		    $txlocaltax2	= price2num($txlocaltax2);
 		    if (empty($txlocaltax1)) $txlocaltax1 = 0;
 		    if (empty($txlocaltax2)) $txlocaltax2 = 0;
@@ -1059,6 +1063,7 @@ class FactureRec extends CommonInvoice
 
 	        // Clean vat code
 	        $vat_src_code = '';
+	        $reg = array();
 	        if (preg_match('/\((.*)\)/', $txtva, $reg))
 	        {
 	        	$vat_src_code = $reg[1];
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 4bfc36a3e78..392817b0368 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3311,7 +3311,9 @@ class Facture extends CommonInvoice
 			$pu 			= price2num($pu);
         	$pu_ht_devise = price2num($pu_ht_devise);
 			$pa_ht			= price2num($pa_ht);
-			$txtva			= price2num($txtva);
+			if (!preg_match('/\((.*)\)/', $txtva)) {
+				$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+			}
 			$txlocaltax1	= price2num($txlocaltax1);
 			$txlocaltax2	= price2num($txlocaltax2);
 
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index e38c24565dd..13f0ba644d0 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1502,7 +1502,6 @@ class Contrat extends CommonObject
 				$vat_src_code = $reg[1];
 				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 			}
-
 			$txtva = price2num($txtva);
 			$txlocaltax1 = price2num($txlocaltax1);
 			$txlocaltax2 = price2num($txlocaltax2);
diff --git a/htdocs/fichinter/class/fichinterrec.class.php b/htdocs/fichinter/class/fichinterrec.class.php
index 5b3dfb3a2fc..2d678514182 100644
--- a/htdocs/fichinter/class/fichinterrec.class.php
+++ b/htdocs/fichinter/class/fichinterrec.class.php
@@ -473,7 +473,9 @@ class FichinterRec extends Fichinter
             if (!$info_bits) $info_bits = 0;
             $pu_ht = price2num($pu_ht);
             $pu_ttc = price2num($pu_ttc);
-            $txtva = price2num($txtva);
+            if (!preg_match('/\((.*)\)/', $txtva)) {
+            	$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+            }
 
             if ($price_base_type == 'HT') {
                 $pu = $pu_ht;
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index af283d8cdf0..123b1eb0046 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2633,7 +2633,9 @@ class CommandeFournisseur extends CommonOrder
             if (!$qty) $qty = 1;
             $pu = price2num($pu);
         	$pu_ht_devise = price2num($pu_ht_devise);
-        	$txtva = price2num($txtva);
+        	if (!preg_match('/\((.*)\)/', $txtva)) {
+        		$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+        	}
         	$txlocaltax1 = price2num($txlocaltax1);
         	$txlocaltax2 = price2num($txlocaltax2);
 
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 33c80f9b6b1..9822c171cd8 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -423,10 +423,13 @@ class SupplierProposal extends CommonObject
         $qty = price2num($qty);
         $pu_ht = price2num($pu_ht);
         $pu_ttc = price2num($pu_ttc);
-        $txtva = price2num($txtva);
+        if (!preg_match('/\((.*)\)/', $txtva)) {
+        	$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+        }
         $txlocaltax1 = price2num($txlocaltax1);
         $txlocaltax2 = price2num($txlocaltax2);
-            $pa_ht = price2num($pa_ht);
+
+        $pa_ht = price2num($pa_ht);
         if ($price_base_type == 'HT')
         {
             $pu = $pu_ht;
@@ -682,7 +685,9 @@ class SupplierProposal extends CommonObject
         $remise_percent = price2num($remise_percent);
         $qty = price2num($qty);
         $pu = price2num($pu);
-        $txtva = price2num($txtva);
+        if (!preg_match('/\((.*)\)/', $txtva)) {
+        	$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+        }
         $txlocaltax1 = price2num($txlocaltax1);
         $txlocaltax2 = price2num($txlocaltax2);
         $pa_ht = price2num($pa_ht);

From 982f8eb95d2be6300cbcdc2400a8bdf016a76335 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Jan 2021 17:03:26 +0100
Subject: [PATCH 93/95] Fix syntax error

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

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index d07b8dcc60e..9b1a3b34808 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -385,7 +385,7 @@ if (empty($reshook))
 		$predef = '';
 		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$price_ht = price2num(GETPOST('price_ht'), 'MU');
-		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht', 'CR');
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht', 'CR'));
 		if (GETPOST('prod_entry_mode', 'alpha') == 'free')
 		{
 			$idprod = 0;

From 2d1121031a886398a31594684785ed8040bc8558 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Jan 2021 17:04:08 +0100
Subject: [PATCH 94/95] var not defined

---
 htdocs/contrat/card.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 9b1a3b34808..64f8fd92477 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -89,6 +89,7 @@ $extralabelslines = $extrafields->fetch_name_optionals_label($object->table_elem
 $permissionnote = $user->rights->contrat->creer; // Used by the include of actions_setnotes.inc.php
 $permissiondellink = $user->rights->contrat->creer; // Used by the include of actions_dellink.inc.php
 
+$error = 0;
 
 
 /*

From 821ef72d482c4669d2d3c3e286551cb9d8a9063b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Jan 2021 17:43:02 +0100
Subject: [PATCH 95/95] Fix warnings

---
 .../email_expire_services_to_customers.php    | 24 +++++++++-----
 ...ail_expire_services_to_representatives.php | 23 ++++++++-----
 .../email_unpaid_invoices_to_customers.php    | 32 ++++++++++++-------
 ...ail_unpaid_invoices_to_representatives.php | 11 ++++---
 4 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/scripts/contracts/email_expire_services_to_customers.php b/scripts/contracts/email_expire_services_to_customers.php
index 5c98dc2913b..596a5794d70 100755
--- a/scripts/contracts/email_expire_services_to_customers.php
+++ b/scripts/contracts/email_expire_services_to_customers.php
@@ -74,8 +74,9 @@ $duration_value2 = isset($argv[4]) ? $argv[4] : 'none';
 $error = 0;
 print $script_file." launched with mode ".$mode." default lang=".$langs->defaultlang.(is_numeric($duration_value) ? " delay=".$duration_value : "").(is_numeric($duration_value2) ? " after=".$duration_value2 : "")."\n";
 
-if ($mode != 'confirm')
+if ($mode != 'confirm') {
 	$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
+}
 
 $sql = "SELECT c.ref, cd.date_fin_validite, cd.total_ttc, cd.description as description, p.label as plabel,";
 $sql .= " s.rowid as sid, s.nom as name, s.email, s.default_lang";
@@ -115,6 +116,7 @@ if ($resql) {
 	print "We found ".$num." couples (services to expire-".$targettype.") qualified\n";
 	dol_syslog("We found ".$num." couples (services to expire-".$targettype.") qualified");
 	$message = '';
+	$oldtarget = '';
 
 	if ($num) {
 		while ($i < $num) {
@@ -124,12 +126,17 @@ if ($resql) {
 
 			// Check if this record is a break after previous one
 			$startbreak = false;
-			if ($newemail != $oldemail || $oldemail == 'none')
+			if ($newemail != $oldemail || $oldemail == 'none') {
 				$startbreak = true;
-			if ($obj->sid && $obj->sid != $oldsid)
-				$startbreak = true;
-			if ($obj->cid && $obj->cid != $oldcid)
+			}
+			if ($obj->sid && $obj->sid != $oldsid) {
 				$startbreak = true;
+			}
+			if ($targettype == 'contacts') {
+				if ($obj->cid && $obj->cid != $oldcid) {
+					$startbreak = true;
+				}
+			}
 
 			if ($startbreak) {
 				// Break onto sales representative (new email or cid)
@@ -145,13 +152,14 @@ if ($resql) {
 				}
 				$oldemail = $newemail;
 				$oldsid = $obj->sid;
-				$oldcid = $obj->cid;
+				if ($targettype == 'contacts') {
+					$oldcid = $obj->cid;
+				}
 				$oldlang = $obj->lang;
 				$oldtarget = (empty($obj->cfirstname) && empty($obj->clastname)) ? $obj->name : ($obj->clastname." ".$obj->cfirstname);
 				$message = '';
 				$total = 0;
 				$foundtoprocess = 0;
-				$target = (empty($obj->cfirstname) && empty($obj->clastname)) ? $obj->name : ($obj->clastname." ".$obj->cfirstname);
 				// if (empty($newemail)) print "Warning: Customer ".$target." has no email. Notice disabled.\n";
 			}
 
@@ -167,7 +175,7 @@ if ($resql) {
 				dol_syslog("email_expire_services_to_customers.php: ".$newemail." ".$message);
 				$foundtoprocess++;
 			}
-			print "Service to expire ".$obj->ref.", label ".dol_concatdesc($obj->plabel, $obj->description).", due date ".dol_print_date($db->jdate($obj->date_fin_validite), 'day').", customer id ".$obj->sid." ".$obj->name.", ".($obj->cid ? "contact id ".$obj->cid." ".$obj->clastname." ".$obj->cfirstname.", " : "")."email ".$newemail.", lang ".$outputlangs->defaultlang.": ";
+			print "Service to expire ".$obj->ref.", label ".dol_concatdesc($obj->plabel, $obj->description).", due date ".dol_print_date($db->jdate($obj->date_fin_validite), 'day').", customer id ".$obj->sid." ".$obj->name.", ".(isset($obj->cid) ? "contact id ".$obj->cid." ".$obj->clastname." ".$obj->cfirstname.", " : "")."email ".$newemail.", lang ".$outputlangs->defaultlang.": ";
 			if (dol_strlen($newemail))
 				print "qualified.";
 			else print "disqualified (no email).";
diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php
index eec151376ee..2c8429b6256 100755
--- a/scripts/contracts/email_expire_services_to_representatives.php
+++ b/scripts/contracts/email_expire_services_to_representatives.php
@@ -70,8 +70,9 @@ $duration_value = isset($argv[2]) ? $argv[2] : 'none';
 
 print $script_file." launched with mode ".$mode." default lang=".$langs->defaultlang.(is_numeric($duration_value) ? " delay=".$duration_value : "")."\n";
 
-if ($mode != 'confirm')
+if ($mode != 'confirm') {
 	$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
+}
 
 $sql = "SELECT DISTINCT c.ref, c.fk_soc, cd.date_fin_validite, cd.total_ttc, cd.description as description, p.label as plabel, s.rowid, s.nom as name, s.email, s.default_lang,";
 $sql .= " u.rowid as uid, u.lastname, u.firstname, u.email, u.lang";
@@ -192,25 +193,31 @@ function envoi_mail($mode, $oldemail, $message, $total, $userlang, $oldsalerepre
 	$newlangs->load("contracts");
 
 	if ($duration_value) {
-		if ($duration_value > 0)
+		if ($duration_value > 0) {
 			$title = $newlangs->transnoentities("ListOfServicesToExpireWithDuration", $duration_value);
-		else $title = $newlangs->transnoentities("ListOfServicesToExpireWithDurationNeg", $duration_value);
-	} else $title = $newlangs->transnoentities("ListOfServicesToExpire");
+		} else {
+			$title = $newlangs->transnoentities("ListOfServicesToExpireWithDurationNeg", $duration_value);
+		}
+	} else {
+		$title = $newlangs->transnoentities("ListOfServicesToExpire");
+	}
 
 	$subject = (empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_SUBJECT) ? $title : $conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_SUBJECT);
 	$sendto = $oldemail;
-	$from = $conf->global->MAIN_MAIL_EMAIL_FROM;
-	$errorsto = $conf->global->MAIN_MAIL_ERRORS_TO;
+	$from = empty($conf->global->MAIN_MAIL_EMAIL_FROM) ? '' : $conf->global->MAIN_MAIL_EMAIL_FROM;
+	$errorsto = empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '' : $conf->global->MAIN_MAIL_ERRORS_TO;
 	$msgishtml = - 1;
 
 	print "- Send email for ".$oldsalerepresentative." (".$oldemail."), total: ".$total."\n";
 	dol_syslog("email_expire_services_to_representatives.php: send mail to ".$oldemail);
 
 	$usehtml = 0;
-	if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER))
+	if (!empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER) && dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER)) {
 		$usehtml += 1;
-	if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER))
+	}
+	if (!empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER) && dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER)) {
 		$usehtml += 1;
+	}
 
 	$allmessage = '';
 	if (!empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER)) {
diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php
index 9b59fcab6f7..a569a34d0fa 100755
--- a/scripts/invoices/email_unpaid_invoices_to_customers.php
+++ b/scripts/invoices/email_unpaid_invoices_to_customers.php
@@ -74,8 +74,9 @@ $duration_value2 = isset($argv[4]) ? $argv[4] : 'none';
 $error = 0;
 print $script_file." launched with mode ".$mode." default lang=".$langs->defaultlang.(is_numeric($duration_value) ? " delay=".$duration_value : "").(is_numeric($duration_value2) ? " after=".$duration_value2 : "")."\n";
 
-if ($mode != 'confirm')
+if ($mode != 'confirm') {
 	$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
+}
 
 $sql = "SELECT f.ref, f.total_ttc, f.date_lim_reglement as due_date,";
 $sql .= " s.rowid as sid, s.nom as name, s.email, s.default_lang";
@@ -113,6 +114,7 @@ if ($resql) {
 	print "We found ".$num." couples (unpayed validated invoices-".$targettype.") qualified\n";
 	dol_syslog("We found ".$num." couples (unpayed validated invoices-".$targettype.") qualified");
 	$message = '';
+	$oldtarget = '';
 
 	if ($num) {
 		while ($i < $num) {
@@ -122,12 +124,17 @@ if ($resql) {
 
 			// Check if this record is a break after previous one
 			$startbreak = false;
-			if ($newemail != $oldemail || $oldemail == 'none')
+			if ($newemail != $oldemail || $oldemail == 'none') {
 				$startbreak = true;
-			if ($obj->sid && $obj->sid != $oldsid)
-				$startbreak = true;
-			if ($obj->cid && $obj->cid != $oldcid)
+			}
+			if ($obj->sid && $obj->sid != $oldsid) {
 				$startbreak = true;
+			}
+			if ($targettype == 'contacts') {
+				if ($obj->cid && $obj->cid != $oldcid) {
+					$startbreak = true;
+				}
+			}
 
 			if ($startbreak) {
 				// Break onto sales representative (new email or cid)
@@ -143,13 +150,14 @@ if ($resql) {
 				}
 				$oldemail = $newemail;
 				$oldsid = $obj->sid;
-				$oldcid = $obj->cid;
+				if ($targettype == 'contacts') {
+					$oldcid = $obj->cid;
+				}
 				$oldlang = $obj->lang;
 				$oldtarget = (empty($obj->cfirstname) && empty($obj->clastname)) ? $obj->name : ($obj->clastname." ".$obj->cfirstname);
 				$message = '';
 				$total = 0;
 				$foundtoprocess = 0;
-				$target = (empty($obj->cfirstname) && empty($obj->clastname)) ? $obj->name : ($obj->clastname." ".$obj->cfirstname);
 				// if (empty($newemail)) print "Warning: Customer ".$target." has no email. Notice disabled.\n";
 			}
 
@@ -165,7 +173,7 @@ if ($resql) {
 				dol_syslog("email_unpaid_invoices_to_customers.php: ".$newemail." ".$message);
 				$foundtoprocess++;
 			}
-			print "Unpaid invoice ".$obj->ref.", price ".price2num($obj->total_ttc).", due date ".dol_print_date($db->jdate($obj->due_date), 'day').", customer id ".$obj->sid." ".$obj->name.", ".($obj->cid ? "contact id ".$obj->cid." ".$obj->clastname." ".$obj->cfirstname.", " : "")."email ".$newemail.", lang ".$outputlangs->defaultlang.": ";
+			print "Unpaid invoice ".$obj->ref.", price ".price2num($obj->total_ttc).", due date ".dol_print_date($db->jdate($obj->due_date), 'day').", customer id ".$obj->sid." ".$obj->name.", ".(isset($obj->cid) ? "contact id ".$obj->cid." ".$obj->clastname." ".$obj->cfirstname.", " : "")."email ".$newemail.", lang ".$outputlangs->defaultlang.": ";
 			if (dol_strlen($newemail))
 				print "qualified.";
 			else print "disqualified (no email).";
@@ -229,17 +237,17 @@ function envoi_mail($mode, $oldemail, $message, $total, $userlang, $oldtarget)
 
 	$subject = (empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_SUBJECT) ? $newlangs->trans("ListOfYourUnpaidInvoices") : $conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_SUBJECT);
 	$sendto = $oldemail;
-	$from = $conf->global->MAIN_MAIL_EMAIL_FROM;
-	$errorsto = $conf->global->MAIN_MAIL_ERRORS_TO;
+	$from = empty($conf->global->MAIN_MAIL_EMAIL_FROM) ? '' : $conf->global->MAIN_MAIL_EMAIL_FROM;
+	$errorsto = empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '' : $conf->global->MAIN_MAIL_ERRORS_TO;
 	$msgishtml = - 1;
 
 	print "- Send email to '".$oldtarget."' (".$oldemail."), total: ".$total."\n";
 	dol_syslog("email_unpaid_invoices_to_customers.php: send mail to ".$oldemail);
 
 	$usehtml = 0;
-	if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER))
+	if (!empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER) && dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER))
 		$usehtml += 1;
-	if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER))
+	if (!empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER) && dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER))
 		$usehtml += 1;
 
 	$allmessage = '';
diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php
index d401894363d..d5c71c70565 100755
--- a/scripts/invoices/email_unpaid_invoices_to_representatives.php
+++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php
@@ -70,8 +70,9 @@ $duration_value = isset($argv[2]) ? $argv[2] : 'none';
 
 print $script_file." launched with mode ".$mode." default lang=".$langs->defaultlang.(is_numeric($duration_value) ? " delay=".$duration_value : "")."\n";
 
-if ($mode != 'confirm')
+if ($mode != 'confirm') {
 	$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
+}
 
 $sql = "SELECT f.ref, f.total_ttc, f.date_lim_reglement as due_date, s.nom as name, s.email, s.default_lang,";
 $sql .= " u.rowid as uid, u.lastname, u.firstname, u.email, u.lang";
@@ -196,17 +197,17 @@ function envoi_mail($mode, $oldemail, $message, $total, $userlang, $oldsalerepre
 
 	$subject = (empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_SUBJECT) ? $newlangs->trans("ListOfYourUnpaidInvoices") : $conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_SUBJECT);
 	$sendto = $oldemail;
-	$from = $conf->global->MAIN_MAIL_EMAIL_FROM;
-	$errorsto = $conf->global->MAIN_MAIL_ERRORS_TO;
+	$from = empty($conf->global->MAIN_MAIL_EMAIL_FROM) ? '' : $conf->global->MAIN_MAIL_EMAIL_FROM;
+	$errorsto = empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '' : $conf->global->MAIN_MAIL_ERRORS_TO;
 	$msgishtml = - 1;
 
 	print "- Send email for ".$oldsalerepresentative." (".$oldemail."), total: ".$total."\n";
 	dol_syslog("email_unpaid_invoices_to_representatives.php: send mail to ".$oldemail);
 
 	$usehtml = 0;
-	if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER))
+	if (!empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER) && dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER))
 		$usehtml += 1;
-	if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER))
+	if (!empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER) && dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER))
 		$usehtml += 1;
 
 	$allmessage = '';