From 9bc2a561bcf79ba2e247206f5c6411a403742d12 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 14 Dec 2021 10:52:16 +0100
Subject: [PATCH 01/82] ok

---
 htdocs/admin/ihm.php                 |  8 ++++
 htdocs/core/lib/usergroups.lib.php   | 65 ++++++++++++++++++++++++----
 htdocs/langs/en_US/admin.lang        |  1 +
 htdocs/theme/eldy/btn.inc.php        |  7 ---
 htdocs/theme/eldy/global.inc.php     |  4 +-
 htdocs/theme/eldy/style.css.php      |  6 ++-
 htdocs/theme/eldy/theme_vars.inc.php |  2 +
 htdocs/theme/md/btn.inc.php          |  5 ---
 htdocs/theme/md/style.css.php        |  9 +++-
 htdocs/theme/md/theme_vars.inc.php   |  2 +
 10 files changed, 83 insertions(+), 26 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 697f8fa2130..ea675ed9001 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2016		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2021       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2021       Anthony Berton          <bertonanthony@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
@@ -199,6 +200,13 @@ if ($action == 'update') {
 		} else {
 			dolibarr_set_const($db, "THEME_ELDY_USE_CHECKED", $val, 'chaine', 0, '', $conf->entity);
 		}
+
+		$val=(implode(',', (colorStringToArray(GETPOST('THEME_ELDY_BTNACTION'), array()))));
+		if ($val == '') {
+			dolibarr_del_const($db, 'THEME_ELDY_BTNACTION', $conf->entity);
+		} else {
+			dolibarr_set_const($db, 'THEME_ELDY_BTNACTION', $val, 'chaine', 0, '', $conf->entity);
+		}
 	}
 
 	if ($mode == 'dashboard') {
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index accbd84ba8c..9ee6afa182e 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2010-2017	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2015	    Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Ferran Marcet       <fmarcet@2byte.es>
+ * Copyright (C) 2021       Anthony Berton          <bertonanthony@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
@@ -859,15 +860,15 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// Use Checked
 	if ($foruserprofile) {
 		/* Must first change option to choose color of highlight instead of yes or no.
-		 print '<tr class="oddeven">';
-		 print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
-		 print '<td><input name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';
-		 print '<td class="nowrap left" width="20%"><input name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
-		 print '<td><input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled="disabled"').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
-		 print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
-		 print '</td>';
-		 print '</tr>';
-		 */
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
+		print '<td><input name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';
+		print '<td class="nowrap left" width="20%"><input name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
+		print '<td><input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled="disabled"').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
+		print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+		print '</td>';
+		print '</tr>';
+		*/
 	} else {
 		$default = (empty($colorbacklinepairchecked) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepairchecked)));
 
@@ -905,6 +906,52 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '</tr>';
 	}
 
+	// Btn action
+	if ($foruserprofile) {
+		/*
+		 print '<tr class="oddeven">';
+		 print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
+		 print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_BTNACTION:$langs->trans("Default")).'</td>';
+		 print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_BTNACTION" id="check_THEME_ELDY_BTNACTION" type="checkbox" '.(! empty($object->conf->THEME_ELDY_BTNACTION)?" checked":"");
+		 print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
+		 print '> '.$langs->trans("UsePersonalValue").'</td>';
+		 print '<td>';
+		 if ($edit)
+		 {
+		 print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BTNACTION,array()),''),'THEME_ELDY_BTNACTION','',1).' ';
+		 }
+		 else
+		 {
+		 $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BTNACTION,array()),'');
+		 if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+		 else print '';
+		 }
+			if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+			print '</td>';*/
+	} else {
+		$default = (empty($butactionbg) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($butactionbg)));
+
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("BtnActionColor").'</td>';
+		print '<td colspan="'.($colspan - 1).'">';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_BTNACTION) ? $conf->global->THEME_ELDY_BTNACTION : ''), array()), ''), 'THEME_ELDY_BTNACTION', '', 1, '', '', 'colorbtnaction').' ';
+		} else {
+			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BTNACTION, array()), '');
+			if ($color) {
+				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			} else {
+				//print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';
+				//print '<span style="color: #000078">'.$langs->trans("Default").'</span>';
+				print $langs->trans("Default");
+			}
+		}
+		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong><span style="color: #'.$default.'">'.$default.'</span></strong> ';
+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</td>';
+		print '</tr>';
+	}
+
 	// Use MAIN_OPTIMIZEFORTEXTBROWSER
 	if ($foruserprofile && !empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 		//$default=yn($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 0d626c3b323..70f454aded4 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1920,6 +1920,7 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
 HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+BtnActionColor=Color of the action button
 TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index af8f26b9a24..9c570a79a5f 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -9,13 +9,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 			--btncolorbg: #fbfbfb;
 			--btncolorborderhover: none;
 			--btncolorborder: #FFF;
-			/* --butactionbg:rgba(150, 110, 162, 0.95); */
-			--butactionbg:rgb(118, 145, 225);
-			--butactionbg:rgba(150, 110, 162, 0.95);
 			--butactiondeletebg: rgb(234,228,225);
-			/* tertiary color */
-			/* --butactionbg:rgb(218, 235, 225); */
-			/* --butactionbg:rgb(228, 218, 235); */
 }
 
 <?php
@@ -31,7 +25,6 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
             --btncolorbg: rgb(26,27,27);
             --btncolorborderhover: #ffffff;
             --btncolorborder: #2b2c2e;
-            --butactionbg: rgb(173,140,79);
             --butactiondeletebg: rgb(252,84,91);
 
       }\n";
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index da23e60498c..ec40936601a 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -211,7 +211,7 @@ input, select {
 	margin-top: 1px;
 }
 #mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
-	background: var(--butactionbg);
+	background: rgb(<?php echo $butactionbg ?>);
 	color: #FFF !important;
 	border-radius: 3px;
 	border-collapse: collapse;
@@ -358,7 +358,7 @@ a.butStatus {
 	padding-right: 5px;
 	background-color: transparent;
 	color: var(--colortext) !important;
-	border: 2px solid var( --butactionbg) !important;
+	border: 2px solid rgb(<?php echo $butactionbg ?>) !important;
 	margin: 0 0.45em !important;
 }
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index de089ecba54..edeab565f9d 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2012		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2021       Anthony Berton          <bertonanthony@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
@@ -150,7 +151,9 @@ if (!isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) {
 if (!isset($conf->global->THEME_ELDY_TEXTLINK)) {
 	$conf->global->THEME_ELDY_TEXTLINK = $colortextlink;
 }
-
+if (!isset($conf->global->THEME_ELDY_BTNACTION)) {
+	$conf->global->THEME_ELDY_BTNACTION = $butactionbg;
+}
 // Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) {
 	$conf->global->THEME_ELDY_BACKTABCARD1 = '255,255,255'; // card
@@ -178,6 +181,7 @@ $colortexttitle      = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (emp
 $colortexttitlelink  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $conf->global->THEME_ELDY_TEXTTITLELINK) : (empty($user->conf->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $user->conf->THEME_ELDY_TEXTTITLELINK);
 $colortext           = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
 $colortextlink       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTLINK) ? $colortextlink : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK);
+$butactionbg       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BTNACTION) ? $butactionbg : $conf->global->THEME_ELDY_BTNACTION) : (empty($user->conf->THEME_ELDY_BTNACTION) ? $butactionbg : $user->conf->THEME_ELDY_BTNACTION);
 $fontsize            = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE1) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1);
 $fontsizesmaller     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE2) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE2) : (empty($user->conf->THEME_ELDY_FONT_SIZE2) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE2);
 
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 00d5456cab5..41d162e6cbc 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2012		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2021       Anthony Berton          <bertonanthony@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
@@ -73,6 +74,7 @@ $fontsizesmaller = '0.75em';
 $topMenuFontSize = '1.1em';
 $toolTipBgColor = 'rgba(255, 255, 255, 0.96)';
 $toolTipFontColor = '#333';
+$butactionbg = '150, 110, 162, 0.95';
 
 // text color
 $textSuccess   = '#28a745';
diff --git a/htdocs/theme/md/btn.inc.php b/htdocs/theme/md/btn.inc.php
index 0269bba74f2..5ef2dbe9e8d 100644
--- a/htdocs/theme/md/btn.inc.php
+++ b/htdocs/theme/md/btn.inc.php
@@ -10,10 +10,6 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 			--btncolorborderhover: none;
 			--btncolorborder: #FFF;
 			--butactiondeletebg: rgb(234,228,225);
-			/* tertiary color */
-			/* --butactionbg:rgb(218, 235, 225); */
-			/* --butactionbg:rgb(228, 218, 235); */
-			--butactionbg:rgb(118, 145, 225);
 }
 
 <?php
@@ -29,7 +25,6 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
             --btncolorbg: rgb(26,27,27);
             --btncolorborderhover: #ffffff;
             --btncolorborder: #2b2c2e;
-            --butactionbg:rgb(173,140,79);
             --butactiondeletebg: rgb(252,84,91);
 
       }\n";
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 8873149a9be..9c3b2bb0202 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2012		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2015		Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2021       Anthony Berton          <bertonanthony@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
@@ -148,6 +149,9 @@ if (!isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) {
 if (!isset($conf->global->THEME_ELDY_TEXTLINK)) {
 	$conf->global->THEME_ELDY_TEXTLINK = $colortextlink;
 }
+if (!isset($conf->global->THEME_ELDY_BTNACTION)) {
+	$conf->global->THEME_ELDY_BTNACTION = $butactionbg;
+}
 
 // Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) {
@@ -177,6 +181,7 @@ $colortexttitle      = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (emp
 $colortexttitlelink  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $conf->global->THEME_ELDY_TEXTTITLELINK) : (empty($user->conf->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $user->conf->THEME_ELDY_TEXTTITLELINK);
 $colortext           = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
 $colortextlink       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTLINK) ? $colortext : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK);
+$butactionbg       	 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BTNACTION) ? $butactionbg : $conf->global->THEME_ELDY_BTNACTION) : (empty($user->conf->THEME_ELDY_BTNACTION) ? $butactionbg : $user->conf->THEME_ELDY_BTNACTION);
 $fontsize            = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE1) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1);
 $fontsizesmaller     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE2) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE2) : (empty($user->conf->THEME_ELDY_FONT_SIZE2) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE2);
 
@@ -439,7 +444,7 @@ input, select {
 	margin-top:1px;
 }
 #mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
-	background: var(--butactionbg);
+	background: rgb(<?php echo $butactionbg ?>);
 	color: #FFF !important;
 	border-radius: 3px;
 	border-collapse: collapse;
@@ -564,7 +569,7 @@ a.butStatus {
 	padding-right: 5px;
 	background-color: transparent;
 	color: var(--colortext) !important;
-	border: 2px solid var( --butactionbg);
+	border: 2px solid rgb(<?php echo $butactionbg ?>);
 	margin: 0 0.45em !important;
 }
 
diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index 216a5043111..d8441964f65 100644
--- a/htdocs/theme/md/theme_vars.inc.php
+++ b/htdocs/theme/md/theme_vars.inc.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021       Anthony Berton          <bertonanthony@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
@@ -68,6 +69,7 @@ $fontsizesmaller = '11';
 $topMenuFontSize = '1.1em';
 $toolTipBgColor = 'rgba(255, 255, 255, 0.96)';
 $toolTipFontColor = '#333';
+$butactionbg = '150, 110, 162, 0.95';
 
 // text color
 $textSuccess   = '#28a745';

From 9a6f78fc15791235c36763e0426b67e7f02c0045 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 14 Dec 2021 11:45:31 +0100
Subject: [PATCH 02/82] erreur btn action

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

diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index 9c570a79a5f..cf2f1ead60e 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -64,7 +64,7 @@ span.butAction, span.butActionDelete {
 	font-size: 0.9em;
 }
 .butAction {
-	background: var(--butactionbg);
+	background: rgb(<?php echo $butactionbg ?>);
 	color: #FFF !important;
 	/* background: rgb(230, 232, 239); */
 }

From 6024e779766a71665149b6e179833047ca724d95 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Thu, 16 Dec 2021 19:43:42 +0100
Subject: [PATCH 03/82] --butactionbg

---
 htdocs/theme/eldy/global.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index ec40936601a..da23e60498c 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -211,7 +211,7 @@ input, select {
 	margin-top: 1px;
 }
 #mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
-	background: rgb(<?php echo $butactionbg ?>);
+	background: var(--butactionbg);
 	color: #FFF !important;
 	border-radius: 3px;
 	border-collapse: collapse;
@@ -358,7 +358,7 @@ a.butStatus {
 	padding-right: 5px;
 	background-color: transparent;
 	color: var(--colortext) !important;
-	border: 2px solid rgb(<?php echo $butactionbg ?>) !important;
+	border: 2px solid var( --butactionbg) !important;
 	margin: 0 0.45em !important;
 }
 

From 6bbbd99be901d51599eded1ac27e3c8be8bb951a Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Tue, 26 Oct 2021 17:23:51 +0200
Subject: [PATCH 04/82] use any available fontawesome icon in picto

---
 htdocs/core/lib/functions.lib.php | 47 +++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index bf36a72bfa2..5d48edabe03 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1650,7 +1650,11 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 		$limittitle = 30;
 		$out .= '<a class="tabTitle">';
 		if ($picto) {
-			$out .= img_picto($title, ($pictoisfullpath ? '' : 'object_').$picto, '', $pictoisfullpath, 0, 0, '', 'imgTabTitle').' ';
+			$noprefix = $pictoisfullpath;
+			if (strpos($picto, 'fontawesome_') !== false) {
+				$noprefix = 1;
+			}
+			$out .= img_picto($title, ($noprefix ? '' : 'object_').$picto, '', $pictoisfullpath, 0, 0, '', 'imgTabTitle').' ';
 		}
 		$out .= '<span class="tabTitleText">'.dol_escape_htmltag(dol_trunc($title, $limittitle)).'</span>';
 		$out .= '</a>';
@@ -2004,10 +2008,14 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 					$width = 14;
 					$cssclass = 'photorefcenter';
 					$picto = $object->picto;
+					$prefix = 'object_';
 					if ($object->element == 'project' && !$object->public) {
 						$picto = 'project'; // instead of projectpub
 					}
-					$nophoto = img_picto('No photo', 'object_'.$picto);
+					if (strpos($picto, 'fontawesome_') !== false) {
+						$prefix = '';
+					}
+					$nophoto = img_picto('No photo', $prefix.$picto);
 				}
 				$morehtmlleft .= '<!-- No photo to show -->';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
@@ -3592,6 +3600,7 @@ function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF
  *                                  				Example: picto.png                  if picto.png is stored into htdocs/theme/mytheme/img
  *                                  				Example: picto.png@mymodule         if picto.png is stored into htdocs/mymodule/img
  *                                  				Example: /mydir/mysubdir/picto.png  if picto.png is stored into htdocs/mydir/mysubdir (pictoisfullpath must be set to 1)
+ *                                                  Example: fontawesome_envelope-open-text_fas_red if you want to use fontaweseome icons: fontawesome_<icon-name>_style_color_size
  *	@param		string		$moreatt				Add more attribute on img tag (For example 'class="pictofixedwidth"')
  *	@param		boolean|int	$pictoisfullpath		If true or 1, image path is a full path
  *	@param		int			$srconly				Return only content of the src attribute of img.
@@ -3623,6 +3632,40 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		}
 	} else {
 		$pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto);
+
+		if (strpos($pictowithouttext, 'fontawesome_') !== false) {
+			$pictowithouttext = explode('_', $pictowithouttext);
+			$marginleftonlyshort = 0;
+
+			$fakey      = 'fa-'.$pictowithouttext[1];
+			$fa         = $pictowithouttext[2] ? $pictowithouttext[2] : 'fa';
+			$facolor    = $pictowithouttext[3] ? $pictowithouttext[3] : '';
+			$fasize     = $pictowithouttext[4] ? $pictowithouttext[4] : '';
+
+			// This snippet only needed since function img_edit accepts only one additional parameter: no separate one for css only.
+			// class/style need to be extracted to avoid duplicate class/style validation errors when $moreatt is added to the end of the attributes.
+			$morestyle = '';
+			$reg = array();
+			if (preg_match('/class="([^"]+)"/', $moreatt, $reg)) {
+				$morecss .= ($morecss ? ' ' : '').$reg[1];
+				$moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt);
+			}
+			if (preg_match('/style="([^"]+)"/', $moreatt, $reg)) {
+				$morestyle = $reg[1];
+				$moreatt = str_replace('style="'.$reg[1].'"', '', $moreatt);
+			}
+			$moreatt = trim($moreatt);
+
+			$enabledisablehtml = '<span class="'.$fa.' '.$fakey.($marginleftonlyshort ? ($marginleftonlyshort == 1 ? ' marginleftonlyshort' : ' marginleftonly') : '');
+			$enabledisablehtml .= ($morecss ? ' '.$morecss : '').'" style="'.($fasize ? ('font-size: '.$fasize.';') : '').($facolor ? (' color: '.$facolor.';') : '').($morestyle ? ' '.$morestyle : '').'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt : '').'>';
+			/*if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				$enabledisablehtml .= $titlealt;
+			}*/
+			$enabledisablehtml .= '</span>';
+
+			return $enabledisablehtml;
+		}
+
 		$pictowithouttext = str_replace('object_', '', $pictowithouttext);
 		if (empty($srconly) && in_array($pictowithouttext, array(
 				'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',

From a3e4ea5699312e36241d186171fa80e1c0bc950c Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Mon, 20 Dec 2021 10:29:10 +0100
Subject: [PATCH 05/82] WIP migrate situation invoice to new setup POO

---
 htdocs/admin/facture_situation.php | 126 +++++++++++++++++++++++++----
 1 file changed, 110 insertions(+), 16 deletions(-)

diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php
index ffe1680c80f..5aba9e62074 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/facture_situation.php
@@ -28,24 +28,114 @@
  */
 
 require '../main.inc.php';
+
+// Libraries
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'errors', 'other', 'bills'));
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('situationinvoicesetup', 'globalsetup'));
+
+// Access control
 if (!$user->admin) {
 	accessforbidden();
 }
 
 $action = GETPOST('action', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'invoice';
 
+$form = new Form($db);
+$formSetup = new FormSetup($db);
+
+
+// Setup conf MYMODULE_MYPARAM4 : exemple of quick define write style
+$formSetup->newItem('INVOICE_USE_SITUATION')
+	->setAsYesNo()
+	->nameText = $langs->trans('UseSituationInvoices');
+
+$item = $formSetup->newItem('INVOICE_USE_SITUATION_CREDIT_NOTE')
+	->setAsYesNo()
+	->nameText = $langs->trans('UseSituationInvoicesCreditNote');
+
+//$item = $formSetup->newItem('INVOICE_USE_RETAINED_WARRANTY')
+//	->setAsYesNo()
+//	->nameText = $langs->trans('Retainedwarranty');
+
+
+$item = $formSetup->newItem('INVOICE_USE_RETAINED_WARRANTY');
+$item->nameText = $langs->trans('AllowedInvoiceForRetainedWarranty');
+
+$arrayAvailableType = array(
+	Facture::TYPE_SITUATION => $langs->trans("InvoiceSituation"),
+	Facture::TYPE_STANDARD.'+'.Facture::TYPE_SITUATION => $langs->trans("InvoiceSituation").' + '.$langs->trans("InvoiceStandard"),
+);
+
+if ($action == 'edit') {
+	$item->fieldInputOverride = $form->selectarray('INVOICE_USE_RETAINED_WARRANTY', $arrayAvailableType, $conf->global->INVOICE_USE_RETAINED_WARRANTY, 1);
+} else {
+	$item->fieldOutputOverride= isset($arrayAvailableType[$conf->global->INVOICE_USE_RETAINED_WARRANTY])?$arrayAvailableType[$conf->global->INVOICE_USE_RETAINED_WARRANTY]:'';
+}
+
+//$item = $formSetup->newItem('INVOICE_RETAINED_WARRANTY_LIMITED_TO_SITUATION')->setAsYesNo();
+//$item->nameText = $langs->trans('RetainedwarrantyOnlyForSituation');
+
+$formSetup->newItem('INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION')
+	->setAsYesNo()
+	->nameText = $langs->trans('RetainedwarrantyOnlyForSituationFinal');
+
+
+// TODO : TODO : TODO
+$item = $formSetup->newItem('INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION');
+
+$metas = array(
+	'type' => 'number',
+	'step' => '0.01',
+	'min' => 0,
+	'max' => 100
+);
+_printInputFormPart('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT', $langs->trans('RetainedwarrantyDefaultPercent'), '', $metas);
+
+
+/*
+// Hôte
+$item = $formSetup->newItem('NO_PARAM_JUST_TEXT');
+$item->fieldOverride = (empty($_SERVER['HTTPS']) ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'];
+$item->cssClass = 'minwidth500';
+
+// Setup conf MYMODULE_MYPARAM1 as a simple string input
+$item = $formSetup->newItem('MYMODULE_MYPARAM1');
+
+// Setup conf MYMODULE_MYPARAM1 as a simple textarea input but we replace the text of field title
+$item = $formSetup->newItem('MYMODULE_MYPARAM2');
+$item->nameText = $item->getNameText().' more html text ';
+
+// Setup conf MYMODULE_MYPARAM3
+$item = $formSetup->newItem('MYMODULE_MYPARAM3');
+$item->setAsThirdpartyType();
+
+// Setup conf MYMODULE_MYPARAM4 : exemple of quick define write style
+$formSetup->newItem('MYMODULE_MYPARAM4')->setAsYesNo();
+
+// Setup conf MYMODULE_MYPARAM5
+$formSetup->newItem('MYMODULE_MYPARAM5')->setAsEmailTemplate('thirdparty');
+
+// Setup conf MYMODULE_MYPARAM6
+$formSetup->newItem('MYMODULE_MYPARAM6')->setAsSecureKey()->enabled = 0; // disabled
+
+// Setup conf MYMODULE_MYPARAM7
+$formSetup->newItem('MYMODULE_MYPARAM7')->setAsProduct();
+*/
+
 
 /*
  * Actions
@@ -67,7 +157,6 @@ llxHeader(
 	'EN:Invoice_Configuration|FR:Configuration_module_facture|ES:ConfiguracionFactura'
 );
 
-$form = new Form($db);
 
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
@@ -84,6 +173,25 @@ print '<span class="opacitymedium">'.$langs->trans("InvoiceFirstSituationDesc").
  *  Numbering module
  */
 
+if ($action == 'edit') {
+	print $formSetup->generateOutput(true);
+} else {
+	print $formSetup->generateOutput();
+}
+
+if (count($formSetup->items) > 0) {
+	print '<div class="tabsAction">';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
+	print '</div>';
+} else {
+	print '<br>'.$langs->trans("NothingToSetup");
+}
+
+
+print '<hr/>';
+
+
+
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
@@ -97,23 +205,9 @@ print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
-_printOnOff('INVOICE_USE_SITUATION', $langs->trans('UseSituationInvoices'));
-_printOnOff('INVOICE_USE_SITUATION_CREDIT_NOTE', $langs->trans('UseSituationInvoicesCreditNote'));
-//_printOnOff('INVOICE_USE_RETAINED_WARRANTY', $langs->trans('Retainedwarranty'));
 
-$confkey = 'INVOICE_USE_RETAINED_WARRANTY';
 
-$arrayAvailableType = array(
-	Facture::TYPE_SITUATION => $langs->trans("InvoiceSituation"),
-	Facture::TYPE_STANDARD.'+'.Facture::TYPE_SITUATION => $langs->trans("InvoiceSituation").' + '.$langs->trans("InvoiceStandard"),
-);
-$selected = $conf->global->$confkey;
-$curentInput = (empty($inputCount) ? 1 : ($inputCount + 1));
-$formSelectInvoiceType = $form->selectarray('value'.$curentInput, $arrayAvailableType, $selected, 1);
-_printInputFormPart($confkey, $langs->trans('AllowedInvoiceForRetainedWarranty'), '', array(), $formSelectInvoiceType);
 
-//_printOnOff('INVOICE_RETAINED_WARRANTY_LIMITED_TO_SITUATION', $langs->trans('RetainedwarrantyOnlyForSituation'));
-_printOnOff('INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION', $langs->trans('RetainedwarrantyOnlyForSituationFinal'));
 
 $metas = array(
 	'type' => 'number',

From 3490dc32281469a529235d891f8cf77ecf61cdec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Dec 2021 16:31:28 +0100
Subject: [PATCH 06/82] Update functions.lib.php

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5d48edabe03..741aa0816ef 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3600,7 +3600,7 @@ function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF
  *                                  				Example: picto.png                  if picto.png is stored into htdocs/theme/mytheme/img
  *                                  				Example: picto.png@mymodule         if picto.png is stored into htdocs/mymodule/img
  *                                  				Example: /mydir/mysubdir/picto.png  if picto.png is stored into htdocs/mydir/mysubdir (pictoisfullpath must be set to 1)
- *                                                  Example: fontawesome_envelope-open-text_fas_red if you want to use fontaweseome icons: fontawesome_<icon-name>_style_color_size
+ *                                                  Example: fontawesome_envelope-open-text_fas_red_1em if you want to use fontaweseome icons: fontawesome_<icon-name>_<style>_<color>_<size> (only icon-name is mandatory)
  *	@param		string		$moreatt				Add more attribute on img tag (For example 'class="pictofixedwidth"')
  *	@param		boolean|int	$pictoisfullpath		If true or 1, image path is a full path
  *	@param		int			$srconly				Return only content of the src attribute of img.

From 817a9594ae96ae0abaf04e1f80eae492193887d6 Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Tue, 28 Dec 2021 14:32:57 +0100
Subject: [PATCH 07/82] Convert setup of situation invoice to new setup system
 + fix size

---
 htdocs/admin/facture_situation.php         | 204 ++-------------------
 htdocs/core/class/html.form.class.php      |  43 +++--
 htdocs/core/class/html.formsetup.class.php |  28 ++-
 3 files changed, 68 insertions(+), 207 deletions(-)

diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php
index 5aba9e62074..636c5781b69 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/facture_situation.php
@@ -94,47 +94,22 @@ $formSetup->newItem('INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION')
 	->nameText = $langs->trans('RetainedwarrantyOnlyForSituationFinal');
 
 
-// TODO : TODO : TODO
-$item = $formSetup->newItem('INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION');
-
-$metas = array(
+$item = $formSetup->newItem('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT');
+$item->nameText = $langs->trans('RetainedwarrantyDefaultPercent');
+$item->fieldAttr = array(
 	'type' => 'number',
 	'step' => '0.01',
 	'min' => 0,
 	'max' => 100
 );
-_printInputFormPart('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT', $langs->trans('RetainedwarrantyDefaultPercent'), '', $metas);
 
 
-/*
-// Hôte
-$item = $formSetup->newItem('NO_PARAM_JUST_TEXT');
-$item->fieldOverride = (empty($_SERVER['HTTPS']) ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'];
-$item->cssClass = 'minwidth500';
-
-// Setup conf MYMODULE_MYPARAM1 as a simple string input
-$item = $formSetup->newItem('MYMODULE_MYPARAM1');
-
-// Setup conf MYMODULE_MYPARAM1 as a simple textarea input but we replace the text of field title
-$item = $formSetup->newItem('MYMODULE_MYPARAM2');
-$item->nameText = $item->getNameText().' more html text ';
-
-// Setup conf MYMODULE_MYPARAM3
-$item = $formSetup->newItem('MYMODULE_MYPARAM3');
-$item->setAsThirdpartyType();
-
-// Setup conf MYMODULE_MYPARAM4 : exemple of quick define write style
-$formSetup->newItem('MYMODULE_MYPARAM4')->setAsYesNo();
-
-// Setup conf MYMODULE_MYPARAM5
-$formSetup->newItem('MYMODULE_MYPARAM5')->setAsEmailTemplate('thirdparty');
-
-// Setup conf MYMODULE_MYPARAM6
-$formSetup->newItem('MYMODULE_MYPARAM6')->setAsSecureKey()->enabled = 0; // disabled
-
-// Setup conf MYMODULE_MYPARAM7
-$formSetup->newItem('MYMODULE_MYPARAM7')->setAsProduct();
-*/
+// Conditions paiements
+$item = $formSetup->newItem('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID');
+$item->nameText = $langs->trans('PaymentConditionsShortRetainedWarranty');
+$form->load_cache_conditions_paiements();
+$item->fieldOutputOverride = $form->cache_conditions_paiements[$conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID]['label'];
+$item->fieldInputOverride = $form->getSelectConditionsPaiements($conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID, 'INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID', -1, 1);
 
 
 /*
@@ -180,169 +155,18 @@ if ($action == 'edit') {
 }
 
 if (count($formSetup->items) > 0) {
-	print '<div class="tabsAction">';
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
-	print '</div>';
+	if ($action != 'edit') {
+		print '<div class="tabsAction">';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
+		print '</div>';
+	}
 } else {
 	print '<br>'.$langs->trans("NothingToSetup");
 }
 
 
-print '<hr/>';
-
-
-
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-
-
-print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-print '<table class="noborder centpercent">';
-
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Parameter").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
-
-
-
-
-
-$metas = array(
-	'type' => 'number',
-	'step' => '0.01',
-	'min' => 0,
-	'max' => 100
-);
-_printInputFormPart('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT', $langs->trans('RetainedwarrantyDefaultPercent'), '', $metas);
-
-// Conditions paiements
-$inputCount = empty($inputCount) ? 1 : ($inputCount + 1);
-print '<tr class="oddeven">';
-print '<td>'.$langs->trans('PaymentConditionsShortRetainedWarranty').'</td>';
-print '<td class="center" width="20">&nbsp;</td>';
-print '<td class="right" width="300">';
-print '<input type="hidden" name="param'.$inputCount.'" value="INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID">';
-$form->select_conditions_paiements($conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID, 'value'.$inputCount, -1, 1);
-print '</td></tr>';
-
-
-print '</table>';
-print '</div>';
-
-print '<br>';
-
-_updateBtn();
-
-print '</form>';
-
 print dol_get_fiche_end();
 
 // End of page
 llxFooter();
 $db->close();
-
-/**
- * Print an update button
- *
- * @return void
- */
-function _updateBtn()
-{
-	global $langs;
-	print '<div class="center">';
-	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-	print '</div>';
-}
-
-/**
- * Print a On/Off button
- *
- * @param string $confkey the conf key
- * @param bool   $title   Title of conf
- * @param string $desc    Description
- *
- * @return void
- */
-function _printOnOff($confkey, $title = false, $desc = '')
-{
-	global $langs;
-
-	print '<tr class="oddeven">';
-	print '<td>'.($title ? $title : $langs->trans($confkey));
-	if (!empty($desc)) {
-		print '<br><small>'.$langs->trans($desc).'</small>';
-	}
-	print '</td>';
-	print '<td class="center" width="20">&nbsp;</td>';
-	print '<td class="right" width="300">';
-	print ajax_constantonoff($confkey);
-	print '</td></tr>';
-}
-
-
-/**
- * Print a form part
- *
- * @param string $confkey the conf key
- * @param bool   $title   Title of conf
- * @param string $desc    Description of
- * @param array  $metas   html meta
- * @param string $type    type of input textarea or input
- * @param bool   $help    help description
- *
- * @return void
- */
-function _printInputFormPart($confkey, $title = false, $desc = '', $metas = array(), $type = 'input', $help = false)
-{
-	global $langs, $conf, $db, $inputCount;
-
-	$inputCount = empty($inputCount) ? 1 : ($inputCount + 1);
-	$form = new Form($db);
-
-	$defaultMetas = array(
-		'name' => 'value'.$inputCount
-	);
-
-	if ($type != 'textarea') {
-		$defaultMetas['type']   = 'text';
-		$defaultMetas['value']  = $conf->global->{$confkey};
-	}
-
-
-	$metas = array_merge($defaultMetas, $metas);
-	$metascompil = '';
-	foreach ($metas as $key => $values) {
-		$metascompil .= ' '.$key.'="'.$values.'" ';
-	}
-
-	print '<tr class="oddeven">';
-	print '<td>';
-
-	if (!empty($help)) {
-		print $form->textwithtooltip(($title ? $title : $langs->trans($confkey)), $langs->trans($help), 2, 1, img_help(1, ''));
-	} else {
-		print $title ? $title : $langs->trans($confkey);
-	}
-
-	if (!empty($desc)) {
-		print '<br><small>'.$langs->trans($desc).'</small>';
-	}
-
-	print '</td>';
-	print '<td class="center" width="20">&nbsp;</td>';
-	print '<td class="right" width="300">';
-	print '<input type="hidden" name="param'.$inputCount.'" value="'.$confkey.'">';
-
-	print '<input type="hidden" name="action" value="setModuleOptions">';
-	if ($type == 'textarea') {
-		print '<textarea '.$metascompil.'  >'.dol_htmlentities($conf->global->{$confkey}).'</textarea>';
-	} elseif ($type == 'input') {
-		print '<input '.$metascompil.'  />';
-	} else {
-		// custom
-		print $type;
-	}
-	print '</td></tr>';
-}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 0525ad6f3c8..693cf235cf3 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3893,7 +3893,7 @@ class Form
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *      Return list of payment modes.
+	 *      print list of payment modes.
 	 *      Constant MAIN_DEFAULT_PAYMENT_TERM_ID can used to set default value but scope is all application, probably not what you want.
 	 *      See instead to force the default value by the caller.
 	 *
@@ -3908,8 +3908,28 @@ class Form
 	public function select_conditions_paiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '')
 	{
 		// phpcs:enable
-		global $langs, $user, $conf;
+		print $this->getSelectConditionsPaiements($selected, $htmlname, $filtertype, $addempty, $noinfoadmin, $morecss);
+	}
 
+
+	/**
+	 *      Return list of payment modes.
+	 *      Constant MAIN_DEFAULT_PAYMENT_TERM_ID can used to set default value but scope is all application, probably not what you want.
+	 *      See instead to force the default value by the caller.
+	 *
+	 *      @param	int		$selected		Id of payment term to preselect by default
+	 *      @param	string	$htmlname		Nom de la zone select
+	 *      @param	int		$filtertype		Not used
+	 *		@param	int		$addempty		Add an empty entry
+	 * 		@param	int		$noinfoadmin	0=Add admin info, 1=Disable admin info
+	 * 		@param	string	$morecss		Add more CSS on select tag
+	 *		@return	void
+	 */
+	public function getSelectConditionsPaiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '')
+	{
+
+		global $langs, $user, $conf;
+		$out = '';
 		dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);
 
 		$this->load_cache_conditions_paiements();
@@ -3919,24 +3939,25 @@ class Form
 			$selected = $conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;
 		}
 
-		print '<select id="'.$htmlname.'" class="flat selectpaymentterms'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
+		$out.=  '<select id="'.$htmlname.'" class="flat selectpaymentterms'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
 		if ($addempty) {
-			print '<option value="0">&nbsp;</option>';
+			$out.=  '<option value="0">&nbsp;</option>';
 		}
 		foreach ($this->cache_conditions_paiements as $id => $arrayconditions) {
 			if ($selected == $id) {
-				print '<option value="'.$id.'" selected>';
+				$out.=  '<option value="'.$id.'" selected>';
 			} else {
-				print '<option value="'.$id.'">';
+				$out.=  '<option value="'.$id.'">';
 			}
-			print $arrayconditions['label'];
-			print '</option>';
+			$out.=  $arrayconditions['label'];
+			$out.=  '</option>';
 		}
-		print '</select>';
+		$out.=  '</select>';
 		if ($user->admin && empty($noinfoadmin)) {
-			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			$out.=  info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
-		print ajax_combobox($htmlname);
+		$out.=  ajax_combobox($htmlname);
+		return $out;
 	}
 
 
diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index 25ab99bfe01..722d7a8f247 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -215,7 +215,7 @@ class FormSetup
 			$out = '<table class="noborder centpercent">';
 			$out .= '<thead>';
 			$out .= '<tr class="liste_titre">';
-			$out .= '	<td class="titlefield">' . $this->langs->trans("Parameter") . '</td>';
+			$out .= '	<td>' . $this->langs->trans("Parameter") . '</td>';
 			$out .= '	<td>' . $this->langs->trans("Value") . '</td>';
 			$out .= '</tr>';
 			$out .= '</thead>';
@@ -560,13 +560,16 @@ class FormSetupItem
 	/** @var string $helpText  */
 	public $helpText = '';
 
-	/** @var string $value  */
+	/** @var string $fieldValue  */
 	public $fieldValue;
 
+	/** @var array $fieldAttr  fields attribute only for compatible fields like input text */
+	public $fieldAttr;
+
 	/** @var bool|string set this var to override field output will override $fieldInputOverride and $fieldOutputOverride too */
 	public $fieldOverride = false;
 
-	/** @var bool|string set this var to override field output */
+	/** @var bool|string set this var to override field input */
 	public $fieldInputOverride = false;
 
 	/** @var bool|string set this var to override field output */
@@ -583,6 +586,7 @@ class FormSetupItem
 	/**
 	 * TODO each type must have setAs{type} method to help configuration
 	 *   And set var as protected when its done configuration must be done by method
+	 *   this is important for retrocompatibility of futures versions
 	 * @var string $type  'string', 'textarea', 'category:'.Categorie::TYPE_CUSTOMER', 'emailtemplate', 'thirdparty_type'
 	 */
 	protected $type = 'string';
@@ -598,9 +602,15 @@ class FormSetupItem
 	 */
 	public function __construct($confKey)
 	{
-		global $langs, $db, $conf;
+		global $langs, $db, $conf, $form;
 		$this->db = $db;
-		$this->form = new Form($this->db);
+
+		if (!empty($form) && is_object($form) && get_class($form) == 'Form') { // form class have cache inside so I use it for optimise
+			$this->form = $form;
+		} else {
+			$this->form = new Form($this->db);
+		}
+
 		$this->langs = $langs;
 		$this->entity = $conf->entity;
 
@@ -700,6 +710,10 @@ class FormSetupItem
 			return $this->fieldInputOverride;
 		}
 
+		$this->fieldAttr['name'] = $this->confKey;
+		$this->fieldAttr['id'] = 'setup-'.$this->confKey;
+		$this->fieldAttr['value'] = $this->fieldValue;
+
 		$out = '';
 
 		if ($this->type == 'title') {
@@ -726,7 +740,9 @@ class FormSetupItem
 				$out.= $this->form->select_produits($selected, $this->confKey, '', 0, 0, 1, 2, '', 0, array(), 0, '1', 0, $this->cssClass, 0, '', null, 1);
 			}
 		} else {
-			$out.= '<input name="'.$this->confKey.'"  class="flat '.(empty($this->cssClass) ? 'minwidth200' : $this->cssClass).'" value="'.$this->fieldValue.'">';
+			if (empty($this->fieldAttr)) { $this->fieldAttr['class'] = 'flat '.(empty($this->cssClass) ? 'minwidth200' : $this->cssClass); }
+
+			$out.= '<input '.FormSetup::generateAttributesStringFromArray($this->fieldAttr).' />';
 		}
 
 		return $out;

From e9e100410a814d917e452227091ab741a2618545 Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Tue, 28 Dec 2021 14:51:19 +0100
Subject: [PATCH 08/82] Fix empty value

---
 htdocs/admin/facture_situation.php         | 4 +++-
 htdocs/core/class/html.formsetup.class.php | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php
index 636c5781b69..789faacacad 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/facture_situation.php
@@ -108,7 +108,9 @@ $item->fieldAttr = array(
 $item = $formSetup->newItem('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID');
 $item->nameText = $langs->trans('PaymentConditionsShortRetainedWarranty');
 $form->load_cache_conditions_paiements();
-$item->fieldOutputOverride = $form->cache_conditions_paiements[$conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID]['label'];
+if (!empty($conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID) && isset($form->cache_conditions_paiements[$conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID]['label'])) {
+	$item->fieldOutputOverride = $form->cache_conditions_paiements[$conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID]['label'];
+}
 $item->fieldInputOverride = $form->getSelectConditionsPaiements($conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID, 'INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID', -1, 1);
 
 
diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index 722d7a8f247..8cfab129444 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -605,7 +605,7 @@ class FormSetupItem
 		global $langs, $db, $conf, $form;
 		$this->db = $db;
 
-		if (!empty($form) && is_object($form) && get_class($form) == 'Form') { // form class have cache inside so I use it for optimise
+		if (!empty($form) && is_object($form) && get_class($form) == 'Form') { // the form class has a cache inside so I am using it to optimize
 			$this->form = $form;
 		} else {
 			$this->form = new Form($this->db);

From 9af621c6f882dedcaa47ec2eb6134fb0e2f7f4ee Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Tue, 28 Dec 2021 18:43:04 +0100
Subject: [PATCH 09/82] Fix scrutinizerh

---
 htdocs/core/class/html.formsetup.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index 8cfab129444..4f5557279f4 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -353,7 +353,8 @@ class FormSetup
 		 */
 
 		$item = new FormSetupItem($confKey);
-		$item->setTypeFromTypeString($params['type']);
+		// need to be ignored from scrutinizer setTypeFromTypeString was created as deprecated to incite developper to use object oriented usage
+		/** @scrutinizer ignore-deprecated */ $item->setTypeFromTypeString($params['type']);
 
 		if (!empty($params['enabled'])) {
 			$item->enabled = $params['enabled'];
@@ -598,7 +599,7 @@ class FormSetupItem
 	/**
 	 * Constructor
 	 *
-	 * @param $confKey the conf key used in database
+	 * @param string $confKey the conf key used in database
 	 */
 	public function __construct($confKey)
 	{

From e07905f9503b5cfeaeb798b55712d6056055c7b3 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 29 Dec 2021 20:34:08 +0100
Subject: [PATCH 10/82] var

---
 htdocs/theme/eldy/btn.inc.php | 6 ++++--
 htdocs/theme/md/btn.inc.php   | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index cf2f1ead60e..1b92ef80f04 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -5,11 +5,12 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 /* <style type="text/css" > */
 
 :root {
-			--btncolortext:rgb(<?php print $colortextlink; ?>);
+			--btncolortext: rgb(<?php print $colortextlink; ?>);
 			--btncolorbg: #fbfbfb;
 			--btncolorborderhover: none;
 			--btncolorborder: #FFF;
 			--butactiondeletebg: rgb(234,228,225);
+			--butactionbg: rgb(<?php print $butactionbg; ?>);
 }
 
 <?php
@@ -26,6 +27,7 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
             --btncolorborderhover: #ffffff;
             --btncolorborder: #2b2c2e;
             --butactiondeletebg: rgb(252,84,91);
+			--butactionbg: rgb(173,140,79);
 
       }\n";
 	if ($conf->global->THEME_DARKMODEENABLED != 2) {
@@ -64,7 +66,7 @@ span.butAction, span.butActionDelete {
 	font-size: 0.9em;
 }
 .butAction {
-	background: rgb(<?php echo $butactionbg ?>);
+	background: var(--butactionbg);
 	color: #FFF !important;
 	/* background: rgb(230, 232, 239); */
 }
diff --git a/htdocs/theme/md/btn.inc.php b/htdocs/theme/md/btn.inc.php
index 5ef2dbe9e8d..867da470971 100644
--- a/htdocs/theme/md/btn.inc.php
+++ b/htdocs/theme/md/btn.inc.php
@@ -10,6 +10,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 			--btncolorborderhover: none;
 			--btncolorborder: #FFF;
 			--butactiondeletebg: rgb(234,228,225);
+			--butactionbg: rgb(<?php print $butactionbg; ?>);
 }
 
 <?php
@@ -26,6 +27,7 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
             --btncolorborderhover: #ffffff;
             --btncolorborder: #2b2c2e;
             --butactiondeletebg: rgb(252,84,91);
+			--butactionbg: rgb(173,140,79);
 
       }\n";
 	if ($conf->global->THEME_DARKMODEENABLED != 2) {

From cab4b762d34208f4accd12cd54c3e552f6f4aa53 Mon Sep 17 00:00:00 2001
From: bjoern86 <github@sitemind.de>
Date: Sat, 1 Jan 2022 20:24:30 +0100
Subject: [PATCH 11/82] Adds possibility to add senders name to
 $formmail->fromname

If INVOICE_EMAIL_SENDER_NAME, SHIPPING_EMAIL_SENDER_NAME, COMMANDE_EMAIL_SENDER_NAME or ORDER_SUPPLIER_EMAIL_SENDER_NAME is beeing set, use it as sender name. If not, keep $formmail->fromname blank
---
 htdocs/core/tpl/card_presend.tpl.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 7cc95c81fe0..ff107a0dea3 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -124,22 +124,22 @@ if ($action == 'presend') {
 
 	if ($object->element === 'facture' && !empty($conf->global->INVOICE_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->INVOICE_EMAIL_SENDER;
-		$formmail->fromname = '';
+		(!empty($conf->global->INVOICE_EMAIL_SENDER_NAME) ? $formmail->fromname = $conf->global->INVOICE_EMAIL_SENDER_NAME : $formmail->fromname = '');
 		$formmail->fromtype = 'special';
 	}
 	if ($object->element === 'shipping' && !empty($conf->global->SHIPPING_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->SHIPPING_EMAIL_SENDER;
-		$formmail->fromname = '';
+		(!empty($conf->global->SHIPPING_EMAIL_SENDER_NAME) ? $formmail->fromname = $conf->global->SHIPPING_EMAIL_SENDER_NAME : $formmail->fromname = '');
 		$formmail->fromtype = 'special';
 	}
 	if ($object->element === 'commande' && !empty($conf->global->COMMANDE_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->COMMANDE_EMAIL_SENDER;
-		$formmail->fromname = '';
+		(!empty($conf->global->COMMANDE_EMAIL_SENDER_NAME) ? $formmail->fromname = $conf->global->COMMANDE_EMAIL_SENDER_NAME : $formmail->fromname = '');
 		$formmail->fromtype = 'special';
 	}
 	if ($object->element === 'order_supplier' && !empty($conf->global->ORDER_SUPPLIER_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->ORDER_SUPPLIER_EMAIL_SENDER;
-		$formmail->fromname = '';
+		(!empty($conf->global->ORDER_SUPPLIER_EMAIL_SENDER_NAME) ? $formmail->fromname = $conf->global->ORDER_SUPPLIER_EMAIL_SENDER_NAME : $formmail->fromname = '');
 		$formmail->fromtype = 'special';
 	}
 

From b1f750ac2f55959b9f6371c04ad21bec6cd7edf2 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Tue, 4 Jan 2022 10:35:44 +0100
Subject: [PATCH 12/82] NEW: Project contact tab

---
 htdocs/contact/project.php       | 118 +++++++++++++++++++++++
 htdocs/core/lib/contact.lib.php  | 159 +++++++++++++++++++++++++++++++
 htdocs/langs/en_US/projects.lang |   1 +
 htdocs/langs/fr_FR/projects.lang |   1 +
 4 files changed, 279 insertions(+)
 create mode 100644 htdocs/contact/project.php

diff --git a/htdocs/contact/project.php b/htdocs/contact/project.php
new file mode 100644
index 00000000000..2a5888f02f5
--- /dev/null
+++ b/htdocs/contact/project.php
@@ -0,0 +1,118 @@
+<?php
+/*
+ * Copyright (C) 2021		VIAL--GOUTEYRON Quentin		<quentin.vial-gouteyron@atm-consulting.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 <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/contact/project.php
+ *  \ingroup    contact
+ *  \brief      Page of third party projects
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
+$langs->loadLangs(array("contacts", "companies", "projects"));
+
+// Security check
+$id = GETPOST('id', 'int');
+$result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('projectcontact'));
+
+/*
+ *	Actions
+ */
+
+$parameters = array('id' => $id);
+$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');
+}
+
+/*
+ *	View
+ */
+
+$form = new Form($db);
+
+if($id) {
+    require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php';
+
+    $object = new Contact($db);
+
+    $result = $object->fetch($id);
+    if(empty($object->thirdparty)) {
+        $object->fetch_thirdparty();
+    }
+    $socid = $object->thirdparty->id;
+    $title = $langs->trans("Projects");
+    if(! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+        $title = $object->name." - ".$title;
+    }
+    llxHeader('', $title);
+
+    if(! empty($conf->notification->enabled)) {
+        $langs->load("mails");
+    }
+    $head = contact_prepare_head($object);
+
+    print dol_get_fiche_head($head, 'project', $langs->trans("Contact"), -1, 'contact');
+
+    $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
+    $morehtmlref = '<div class="refidno">';
+    if(empty($conf->global->SOCIETE_DISABLE_CONTACTS) && !empty($socid)) {
+        $object->thirdparty->fetch($socid);
+        // Thirdparty
+        $morehtmlref .= $langs->trans('ThirdParty').' : ';
+        if($object->thirdparty->id > 0) {
+            $morehtmlref .= $object->thirdparty->getNomUrl(1, 'contact');
+        }
+        else {
+            $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+        }
+    }
+    $morehtmlref .= '</div>';
+
+    dol_banner_tab($object, 'id', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom', $morehtmlref);
+
+    print '<div class="fichecenter">';
+
+    print '<div class="underbanner clearboth"></div>';
+    print '<table class="border centpercent tableforfield">';
+
+// Civility
+    print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td>';
+    print $object->getCivilityLabel();
+    print '</td></tr>';
+
+    print '</table>';
+
+    print '</div>';
+
+    print dol_get_fiche_end();
+    print '<br>';
+
+    // Projects list
+    $result = show_contacts_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?id='.$object->id, 1);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index c60cb0c8c18..e2f735dc25d 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -57,6 +57,40 @@ function contact_prepare_head(Contact $object)
 	$head[$tab][2] = 'perso';
 	$tab++;
 
+    if (!empty($conf->projet->enabled) && (!empty($user->rights->projet->lire))) {
+		$nbProject = 0;
+		// Enable caching of thirdrparty count projects
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
+		$cachekey = 'count_projects_contact_'.$object->id;
+		$dataretrieved = dol_getcache($cachekey);
+
+		if (!is_null($dataretrieved)) {
+			$nbProject = $dataretrieved;
+		} else {
+            $sql = 'SELECT COUNT(n.rowid) as nb';
+            $sql .= ' FROM '.MAIN_DB_PREFIX.'projet as n';
+            $sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact as cc ON (n.rowid = cc.element_id)';
+            $sql .= ' WHERE cc.fk_socpeople = '.((int) $object->id);
+            $sql .= ' AND cc.fk_c_type_contact IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE element="project" AND source="external")';
+            $sql .= ' AND n.entity IN ('.getEntity('project').')';
+			$resql = $db->query($sql);
+			if ($resql) {
+				$obj = $db->fetch_object($resql);
+				$nbProject = $obj->nb;
+			} else {
+				dol_print_error($db);
+			}
+			dol_setcache($cachekey, $nbProject, 120);	// If setting cache fails, this is not a problem, so we do not test result.
+		}
+		$head[$tab][0] = DOL_URL_ROOT.'/contact/project.php?id='.$object->id;
+		$head[$tab][1] = $langs->trans("Projects");
+		if ($nbProject > 0) {
+			$head[$tab][1] .= '<span class="badge marginleftonlyshort">'.$nbProject.'</span>';
+		}
+		$head[$tab][2] = 'project';
+		$tab++;
+	}
+
 	// Related items
 	if (!empty($conf->commande->enabled) || !empty($conf->propal->enabled) || !empty($conf->facture->enabled) || !empty($conf->ficheinter->enabled) || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
 		$head[$tab][0] = DOL_URL_ROOT.'/contact/consumption.php?id='.$object->id;
@@ -117,3 +151,128 @@ function contact_prepare_head(Contact $object)
 
 	return $head;
 }
+
+/**
+ * 		Show html area for list of projects
+ *
+ *		@param	Conf		$conf			Object conf
+ * 		@param	Translate	$langs			Object langs
+ * 		@param	DoliDB		$db				Database handler
+ * 		@param	Object		$object			Third party object
+ *      @param  string		$backtopage		Url to go once contact is created
+ *      @param  int         $nocreatelink   1=Hide create project link
+ *      @param	string		$morehtmlright	More html on right of title
+ *      @return	int
+ */
+function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatelink = 0, $morehtmlright = '')
+{
+	global $user;
+
+	$i = -1;
+
+	if (!empty($conf->projet->enabled) && $user->rights->projet->lire) {
+		$langs->load("projects");
+
+		$newcardbutton = '';
+		if (!empty($conf->projet->enabled) && $user->rights->projet->creer && empty($nocreatelink)) {
+			$newcardbutton .= dolGetButtonTitle($langs->trans('AddProject'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage));
+		}
+
+		print "\n";
+		print load_fiche_titre($langs->trans("ProjectsHavingThisContact"), $newcardbutton.$morehtmlright, '');
+		print '<div class="div-table-responsive">';
+		print "\n".'<table class="noborder" width=100%>';
+
+		$sql  = 'SELECT p.rowid as id, p.entity, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status, p.fk_opp_status, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount';
+        $sql .= ', cls.code as opp_status_code';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_lead_status as cls on p.fk_opp_status = cls.rowid';
+        $sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact as cc ON (p.rowid = cc.element_id)';
+        $sql .= ' WHERE cc.fk_socpeople = '.((int) $object->id);
+        $sql .= ' AND cc.fk_c_type_contact IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE element="project" AND source="external")';
+        $sql .= ' AND p.entity IN ('.getEntity('project').')';
+        $sql .= ' ORDER BY p.dateo DESC';
+
+		$result = $db->query($sql);
+		if ($result) {
+			$num = $db->num_rows($result);
+
+			print '<tr class="liste_titre">';
+			print '<td>'.$langs->trans("Ref").'</td>';
+			print '<td>'.$langs->trans("Name").'</td>';
+			print '<td class="center">'.$langs->trans("DateStart").'</td>';
+			print '<td class="center">'.$langs->trans("DateEnd").'</td>';
+			print '<td class="right">'.$langs->trans("OpportunityAmountShort").'</td>';
+			print '<td class="center">'.$langs->trans("OpportunityStatusShort").'</td>';
+			print '<td class="right">'.$langs->trans("OpportunityProbabilityShort").'</td>';
+			print '<td class="right">'.$langs->trans("Status").'</td>';
+			print '</tr>';
+
+			if ($num > 0) {
+				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
+				$projecttmp = new Project($db);
+
+				$i = 0;
+
+				while ($i < $num) {
+					$obj = $db->fetch_object($result);
+					$projecttmp->fetch($obj->id);
+
+					// To verify role of users
+					$userAccess = $projecttmp->restrictedProjectArea($user);
+
+					if ($user->rights->projet->lire && $userAccess > 0) {
+						print '<tr class="oddeven">';
+
+						// Ref
+						print '<td>';
+						print $projecttmp->getNomUrl(1);
+						print '</td>';
+
+						// Label
+						print '<td>'.$obj->title.'</td>';
+						// Date start
+						print '<td class="center">'.dol_print_date($db->jdate($obj->do), "day").'</td>';
+						// Date end
+						print '<td class="center">'.dol_print_date($db->jdate($obj->de), "day").'</td>';
+						// Opp amount
+						print '<td class="right">';
+						if ($obj->opp_status_code) {
+							print price($obj->opp_amount, 1, '', 1, -1, -1, '');
+						}
+						print '</td>';
+						// Opp status
+						print '<td class="center">';
+						if ($obj->opp_status_code) {
+							print $langs->trans("OppStatus".$obj->opp_status_code);
+						}
+						print '</td>';
+						// Opp percent
+						print '<td class="right">';
+						if ($obj->opp_percent) {
+							print price($obj->opp_percent, 1, '', 1, 0).'%';
+						}
+						print '</td>';
+						// Status
+						print '<td class="right">'.$projecttmp->getLibStatut(5).'</td>';
+
+						print '</tr>';
+					}
+					$i++;
+				}
+			} else {
+				print '<tr class="oddeven"><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+			}
+			$db->free($result);
+		} else {
+			dol_print_error($db);
+		}
+		print "</table>";
+		print '</div>';
+
+		print "<br>\n";
+	}
+
+	return $i;
+}
\ No newline at end of file
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index c19f32a0396..517eb09ae2d 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them 
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+ProjectsHavingThisContact=Projects having this contact
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index b158ed28334..dc8ecb24b55 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Remarque : les projets existant
 SelectLinesOfTimeSpentToInvoice=Sélectionnez les lignes de temps passé non facturées, puis l'action groupée "Générer la facture" pour les facturer
 ProjectTasksWithoutTimeSpent=Tâches de projet sans temps consommé
 FormForNewLeadDesc=Veuillez remplir ce formulaire de contact ou écrivez un e-mail à <b>%s</b>.
+ProjectsHavingThisContact=Projets ayant ce contact associé
\ No newline at end of file

From f0677ed665280517df698247585fb018a033216b Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 4 Jan 2022 09:42:24 +0000
Subject: [PATCH 13/82] Fixing style errors.

---
 htdocs/contact/project.php      | 97 ++++++++++++++++-----------------
 htdocs/core/lib/contact.lib.php | 32 +++++------
 2 files changed, 64 insertions(+), 65 deletions(-)

diff --git a/htdocs/contact/project.php b/htdocs/contact/project.php
index 2a5888f02f5..b05709f019a 100644
--- a/htdocs/contact/project.php
+++ b/htdocs/contact/project.php
@@ -40,8 +40,8 @@ $hookmanager->initHooks(array('projectcontact'));
 
 $parameters = array('id' => $id);
 $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');
 }
 
 /*
@@ -50,67 +50,66 @@ if($reshook < 0) {
 
 $form = new Form($db);
 
-if($id) {
-    require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php';
+if ($id) {
+	require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php';
 
-    $object = new Contact($db);
+	$object = new Contact($db);
 
-    $result = $object->fetch($id);
-    if(empty($object->thirdparty)) {
-        $object->fetch_thirdparty();
-    }
-    $socid = $object->thirdparty->id;
-    $title = $langs->trans("Projects");
-    if(! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
-        $title = $object->name." - ".$title;
-    }
-    llxHeader('', $title);
+	$result = $object->fetch($id);
+	if (empty($object->thirdparty)) {
+		$object->fetch_thirdparty();
+	}
+	$socid = $object->thirdparty->id;
+	$title = $langs->trans("Projects");
+	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+		$title = $object->name." - ".$title;
+	}
+	llxHeader('', $title);
 
-    if(! empty($conf->notification->enabled)) {
-        $langs->load("mails");
-    }
-    $head = contact_prepare_head($object);
+	if (! empty($conf->notification->enabled)) {
+		$langs->load("mails");
+	}
+	$head = contact_prepare_head($object);
 
-    print dol_get_fiche_head($head, 'project', $langs->trans("Contact"), -1, 'contact');
+	print dol_get_fiche_head($head, 'project', $langs->trans("Contact"), -1, 'contact');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref = '<div class="refidno">';
-    if(empty($conf->global->SOCIETE_DISABLE_CONTACTS) && !empty($socid)) {
-        $object->thirdparty->fetch($socid);
-        // Thirdparty
-        $morehtmlref .= $langs->trans('ThirdParty').' : ';
-        if($object->thirdparty->id > 0) {
-            $morehtmlref .= $object->thirdparty->getNomUrl(1, 'contact');
-        }
-        else {
-            $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
-        }
-    }
-    $morehtmlref .= '</div>';
+	$morehtmlref = '<div class="refidno">';
+	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS) && !empty($socid)) {
+		$object->thirdparty->fetch($socid);
+		// Thirdparty
+		$morehtmlref .= $langs->trans('ThirdParty').' : ';
+		if ($object->thirdparty->id > 0) {
+			$morehtmlref .= $object->thirdparty->getNomUrl(1, 'contact');
+		} else {
+			$morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+		}
+	}
+	$morehtmlref .= '</div>';
 
-    dol_banner_tab($object, 'id', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom', $morehtmlref);
+	dol_banner_tab($object, 'id', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom', $morehtmlref);
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border centpercent tableforfield">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">';
 
-// Civility
-    print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td>';
-    print $object->getCivilityLabel();
-    print '</td></tr>';
+	// Civility
+	print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td>';
+	print $object->getCivilityLabel();
+	print '</td></tr>';
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    print dol_get_fiche_end();
-    print '<br>';
+	print dol_get_fiche_end();
+	print '<br>';
 
-    // Projects list
-    $result = show_contacts_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?id='.$object->id, 1);
+	// Projects list
+	$result = show_contacts_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?id='.$object->id, 1);
 }
 
 // End of page
diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index e2f735dc25d..ba116d3b904 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -57,7 +57,7 @@ function contact_prepare_head(Contact $object)
 	$head[$tab][2] = 'perso';
 	$tab++;
 
-    if (!empty($conf->projet->enabled) && (!empty($user->rights->projet->lire))) {
+	if (!empty($conf->projet->enabled) && (!empty($user->rights->projet->lire))) {
 		$nbProject = 0;
 		// Enable caching of thirdrparty count projects
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -67,12 +67,12 @@ function contact_prepare_head(Contact $object)
 		if (!is_null($dataretrieved)) {
 			$nbProject = $dataretrieved;
 		} else {
-            $sql = 'SELECT COUNT(n.rowid) as nb';
-            $sql .= ' FROM '.MAIN_DB_PREFIX.'projet as n';
-            $sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact as cc ON (n.rowid = cc.element_id)';
-            $sql .= ' WHERE cc.fk_socpeople = '.((int) $object->id);
-            $sql .= ' AND cc.fk_c_type_contact IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE element="project" AND source="external")';
-            $sql .= ' AND n.entity IN ('.getEntity('project').')';
+			$sql = 'SELECT COUNT(n.rowid) as nb';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as n';
+			$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact as cc ON (n.rowid = cc.element_id)';
+			$sql .= ' WHERE cc.fk_socpeople = '.((int) $object->id);
+			$sql .= ' AND cc.fk_c_type_contact IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE element="project" AND source="external")';
+			$sql .= ' AND n.entity IN ('.getEntity('project').')';
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
@@ -184,14 +184,14 @@ function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $
 		print "\n".'<table class="noborder" width=100%>';
 
 		$sql  = 'SELECT p.rowid as id, p.entity, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status, p.fk_opp_status, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount';
-        $sql .= ', cls.code as opp_status_code';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_lead_status as cls on p.fk_opp_status = cls.rowid';
-        $sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact as cc ON (p.rowid = cc.element_id)';
-        $sql .= ' WHERE cc.fk_socpeople = '.((int) $object->id);
-        $sql .= ' AND cc.fk_c_type_contact IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE element="project" AND source="external")';
-        $sql .= ' AND p.entity IN ('.getEntity('project').')';
-        $sql .= ' ORDER BY p.dateo DESC';
+		$sql .= ', cls.code as opp_status_code';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_lead_status as cls on p.fk_opp_status = cls.rowid';
+		$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact as cc ON (p.rowid = cc.element_id)';
+		$sql .= ' WHERE cc.fk_socpeople = '.((int) $object->id);
+		$sql .= ' AND cc.fk_c_type_contact IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE element="project" AND source="external")';
+		$sql .= ' AND p.entity IN ('.getEntity('project').')';
+		$sql .= ' ORDER BY p.dateo DESC';
 
 		$result = $db->query($sql);
 		if ($result) {
@@ -275,4 +275,4 @@ function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $
 	}
 
 	return $i;
-}
\ No newline at end of file
+}

From 8034b5316a777596b817e02133f90dc4d9565387 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 4 Jan 2022 12:05:06 +0100
Subject: [PATCH 14/82] NEW Add possibility with constant
 MAIN_LOGIN_BADCHARUNAUTHORIZED to define bad character unauthorized into
 login name

---
 htdocs/user/class/user.class.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 780744b4c8e..4da393f6564 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1393,6 +1393,8 @@ class User extends CommonObject
 
 		dol_syslog(get_class($this)."::create login=".$this->login.", user=".(is_object($user) ? $user->id : ''), LOG_DEBUG);
 
+		$badCharUnauthorizedIntoLoginName = getDolGlobalString('MAIN_LOGIN_BADCHARUNAUTHORIZED', '/[,@<>"\']/');
+
 		// Check parameters
 		if (!empty($conf->global->USER_MAIL_REQUIRED) && !isValidEMail($this->email)) {
 			$langs->load("errors");
@@ -1403,7 +1405,7 @@ class User extends CommonObject
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"));
 			return -1;
-		} elseif (preg_match('/[,@<>"\']/', $this->login)) {
+		} elseif (preg_match($badCharUnauthorizedIntoLoginName, $this->login)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadCharIntoLoginName");
 			return -1;
@@ -1787,6 +1789,8 @@ class User extends CommonObject
 		$this->fk_warehouse = (int) $this->fk_warehouse;
 
 		// Check parameters
+		$badCharUnauthorizedIntoLoginName = getDolGlobalString('MAIN_LOGIN_BADCHARUNAUTHORIZED', '/[,@<>"\']/');
+
 		if (!empty($conf->global->USER_MAIL_REQUIRED) && !isValidEMail($this->email)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadEMail", $this->email);
@@ -1796,7 +1800,7 @@ class User extends CommonObject
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFieldRequired", 'Login');
 			return -1;
-		} elseif (preg_match('/[,@<>"\']/', $this->login)) {
+		} elseif (preg_match($badCharUnauthorizedIntoLoginName, $this->login)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadCharIntoLoginName");
 			return -1;

From 7a4b0e38cdd8d7050ca6cbee4d51a743d42bb4f9 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Wed, 5 Jan 2022 14:35:11 +0100
Subject: [PATCH 15/82] NEW : Contact filter project list

---
 htdocs/core/class/html.form.class.php | 17 +++++++++++------
 htdocs/langs/en_US/projects.lang      |  1 +
 htdocs/langs/fr_FR/projects.lang      |  1 +
 htdocs/projet/list.php                | 26 +++++++++++++++++++++++---
 4 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 89c45d4236b..dfd22cd644f 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1690,12 +1690,17 @@ class Form
 				$out .= '<select class="flat'.($moreclass ? ' '.$moreclass : '').'" id="'.$htmlid.'" name="'.$htmlname.(($num || empty($disableifempty)) ? '' : ' disabled').($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';
 			}
 
-			if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple) {
-				$out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';
-			}
-			if ($showempty == 2) {
-				$out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>-- '.$langs->trans("Internal").' --</option>';
-			}
+            if($showempty && !is_numeric($showempty)) {
+                    $textforempty = $showempty;
+                    $out .= '<option class="optiongrey" value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'>'.$textforempty.'</option>';
+            } else {
+                if(($showempty == 1 || ($showempty == 3 && $num > 1)) && ! $multiple) {
+                    $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';
+                }
+                if($showempty == 2) {
+                    $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>-- '.$langs->trans("Internal").' --</option>';
+                }
+            }
 
 			$i = 0;
 			if ($num) {
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index c19f32a0396..fe0197d8739 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -197,6 +197,7 @@ InputPerMonth=Input per month
 InputDetail=Input detail
 TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index b158ed28334..39112b60bd7 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -197,6 +197,7 @@ InputPerMonth=Saisie par mois
 InputDetail=Saisir le détail
 TimeAlreadyRecorded=C'est le temps passé déjà enregistré pour cette tâche/jour et pour l'utilisateur %s
 ProjectsWithThisUserAsContact=Projets avec cet utilisateur comme contact
+ProjectsWithThisContact=Projets avec ce contact
 TasksWithThisUserAsContact=Tâches assignées à cet utilisateur
 ResourceNotAssignedToProject=Non assigné au projet
 ResourceNotAssignedToTheTask=Non assigné à la tache
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 4078afb20c0..2f99fd99b4a 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -98,6 +98,7 @@ $search_opp_amount = GETPOST("search_opp_amount", 'alpha');
 $search_budget_amount = GETPOST("search_budget_amount", 'alpha');
 $search_public = GETPOST("search_public", 'int');
 $search_project_user = GETPOST('search_project_user', 'int');
+$search_project_contact = GETPOST('search_project_contact', 'int');
 $search_sale = GETPOST('search_sale', 'int');
 $search_usage_opportunity = GETPOST('search_usage_opportunity', 'int');
 $search_usage_task = GETPOST('search_usage_task', 'int');
@@ -252,6 +253,7 @@ if (empty($reshook)) {
 		$search_public = "";
 		$search_sale = "";
 		$search_project_user = '';
+		$search_project_contact = '';
 		$search_sday = "";
 		$search_smonth = "";
 		$search_syear = "";
@@ -363,13 +365,14 @@ if (empty($user->rights->projet->all->lire)) {
 
 // Get id of types of contacts for projects (This list never contains a lot of elements)
 $listofprojectcontacttype = array();
-$sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
+$listofprojectcontacttypeexternal = array();
+$sql = "SELECT ctc.rowid, ctc.code, ctc.source FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
 $sql .= " WHERE ctc.element = '".$db->escape($object->element)."'";
-$sql .= " AND ctc.source = 'internal'";
 $resql = $db->query($sql);
 if ($resql) {
 	while ($obj = $db->fetch_object($resql)) {
-		$listofprojectcontacttype[$obj->rowid] = $obj->code;
+		if($obj->source == 'internal') $listofprojectcontacttype[$obj->rowid] = $obj->code;
+		else $listofprojectcontacttypeexternal[$obj->rowid] = $obj->code;
 	}
 } else {
 	dol_print_error($db);
@@ -377,6 +380,9 @@ if ($resql) {
 if (count($listofprojectcontacttype) == 0) {
 	$listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
 }
+if (count($listofprojectcontacttypeexternal) == 0) {
+	$listofprojectcontacttypeexternal[0] = '0'; // To avoid sql syntax error if not found
+}
 
 $distinct = 'DISTINCT'; // We add distinct until we are added a protection to be sure a contact of a project and task is only once.
 $sql = "SELECT ".$distinct." p.rowid as id, p.ref, p.title, p.fk_statut as status, p.fk_opp_status, p.public, p.fk_user_creat,";
@@ -417,6 +423,9 @@ if ($search_sale > 0) {
 if ($search_project_user > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ecp";
 }
+if ($search_project_contact > 0) {
+	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ecp_contact";
+}
 $sql .= " WHERE p.entity IN (".getEntity('project').')';
 if (!empty($conf->categorie->enabled)) {
 	$sql .= Categorie::getFilterSelectQuery(Categorie::TYPE_PROJECT, "p.rowid", $search_category_array);
@@ -501,6 +510,9 @@ if ($search_sale > 0) {
 if ($search_project_user > 0) {
 	$sql .= " AND ecp.fk_c_type_contact IN (".$db->sanitize(join(',', array_keys($listofprojectcontacttype))).") AND ecp.element_id = p.rowid AND ecp.fk_socpeople = ".((int) $search_project_user);
 }
+if ($search_project_contact > 0) {
+	$sql .= " AND ecp_contact.fk_c_type_contact IN (".$db->sanitize(join(',', array_keys($listofprojectcontacttypeexternal))).") AND ecp_contact.element_id = p.rowid AND ecp_contact.fk_socpeople = ".((int) $search_project_contact);
+}
 if ($search_opp_amount != '') {
 	$sql .= natural_search('p.opp_amount', $search_opp_amount, 1);
 }
@@ -689,6 +701,9 @@ if ($search_public != '') {
 if ($search_project_user != '') {
 	$param .= '&search_project_user='.urlencode($search_project_user);
 }
+if ($search_project_contact != '') {
+	$param .= '&search_project_user='.urlencode($search_project_contact);
+}
 if ($search_sale > 0) {
 	$param .= '&search_sale='.urlencode($search_sale);
 }
@@ -808,6 +823,11 @@ if (empty($user->rights->user->user->lire)) {
 $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_project_user ? $search_project_user : '', 'search_project_user', $tmptitle, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth250');
 $moreforfilter .= '</div>';
 
+$moreforfilter .= '<div class="divsearchfield">';
+$tmptitle = $langs->trans('ProjectsWithThisContact');
+$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->selectcontacts(0, $search_project_contact ? $search_project_contact : '', 'search_project_contact', $tmptitle);
+$moreforfilter .= '</div>';
+
 // If the user can view thirdparties other than his'
 if ($user->rights->societe->client->voir || $socid) {
 	$langs->load("commercial");

From 446ba2a416dc802b2bd525835d662a1c5807dc12 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Wed, 5 Jan 2022 15:33:05 +0100
Subject: [PATCH 16/82] FIX stickler

---
 htdocs/core/class/html.form.class.php | 23 ++++++++++++-----------
 htdocs/projet/list.php                |  2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index dfd22cd644f..3b46c69f4c0 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1690,17 +1690,18 @@ class Form
 				$out .= '<select class="flat'.($moreclass ? ' '.$moreclass : '').'" id="'.$htmlid.'" name="'.$htmlname.(($num || empty($disableifempty)) ? '' : ' disabled').($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';
 			}
 
-            if($showempty && !is_numeric($showempty)) {
-                    $textforempty = $showempty;
-                    $out .= '<option class="optiongrey" value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'>'.$textforempty.'</option>';
-            } else {
-                if(($showempty == 1 || ($showempty == 3 && $num > 1)) && ! $multiple) {
-                    $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';
-                }
-                if($showempty == 2) {
-                    $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>-- '.$langs->trans("Internal").' --</option>';
-                }
-            }
+			if ($showempty && ! is_numeric($showempty)) {
+				$textforempty = $showempty;
+				$out .= '<option class="optiongrey" value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'>'.$textforempty.'</option>';
+			}
+			else {
+				if (($showempty == 1 || ($showempty == 3 && $num > 1)) && ! $multiple) {
+					$out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';
+				}
+				if ($showempty == 2) {
+					$out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>-- '.$langs->trans("Internal").' --</option>';
+				}
+			}
 
 			$i = 0;
 			if ($num) {
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 2f99fd99b4a..bd7442b1827 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -371,7 +371,7 @@ $sql .= " WHERE ctc.element = '".$db->escape($object->element)."'";
 $resql = $db->query($sql);
 if ($resql) {
 	while ($obj = $db->fetch_object($resql)) {
-		if($obj->source == 'internal') $listofprojectcontacttype[$obj->rowid] = $obj->code;
+		if ($obj->source == 'internal') $listofprojectcontacttype[$obj->rowid] = $obj->code;
 		else $listofprojectcontacttypeexternal[$obj->rowid] = $obj->code;
 	}
 } else {

From 5fc0f18b0bc997ead31cb6b1cbf00dfd7048169f Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Fri, 7 Jan 2022 10:17:00 +0100
Subject: [PATCH 17/82] add column contact type

---
 htdocs/core/lib/contact.lib.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index e2f735dc25d..a97a59a3da3 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -184,12 +184,13 @@ function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $
 		print "\n".'<table class="noborder" width=100%>';
 
 		$sql  = 'SELECT p.rowid as id, p.entity, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status, p.fk_opp_status, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount';
-        $sql .= ', cls.code as opp_status_code';
+        $sql .= ', cls.code as opp_status_code, ctc.libelle';
         $sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';
         $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_lead_status as cls on p.fk_opp_status = cls.rowid';
         $sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact as cc ON (p.rowid = cc.element_id)';
+        $sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'c_type_contact as ctc ON (ctc.rowid = cc.fk_c_type_contact)';
         $sql .= ' WHERE cc.fk_socpeople = '.((int) $object->id);
-        $sql .= ' AND cc.fk_c_type_contact IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE element="project" AND source="external")';
+        $sql .= ' AND ctc.element="project" AND ctc.source="external"';
         $sql .= ' AND p.entity IN ('.getEntity('project').')';
         $sql .= ' ORDER BY p.dateo DESC';
 
@@ -200,6 +201,7 @@ function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $
 			print '<tr class="liste_titre">';
 			print '<td>'.$langs->trans("Ref").'</td>';
 			print '<td>'.$langs->trans("Name").'</td>';
+			print '<td>'.$langs->trans("ContactType").'</td>';
 			print '<td class="center">'.$langs->trans("DateStart").'</td>';
 			print '<td class="center">'.$langs->trans("DateEnd").'</td>';
 			print '<td class="right">'.$langs->trans("OpportunityAmountShort").'</td>';
@@ -232,6 +234,7 @@ function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $
 
 						// Label
 						print '<td>'.$obj->title.'</td>';
+						print '<td>'.$obj->libelle.'</td>';
 						// Date start
 						print '<td class="center">'.dol_print_date($db->jdate($obj->do), "day").'</td>';
 						// Date end

From f78a9ea6f5d7eba399b535172f6f13cfdbf26d53 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Fri, 7 Jan 2022 10:19:44 +0100
Subject: [PATCH 18/82] missing column

---
 htdocs/core/lib/contact.lib.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index 2e512fa7182..5a0c6c376fb 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -201,6 +201,7 @@ function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $
 			print '<tr class="liste_titre">';
 			print '<td>'.$langs->trans("Ref").'</td>';
 			print '<td>'.$langs->trans("Name").'</td>';
+			print '<td>'.$langs->trans("ContactType").'</td>';
 			print '<td class="center">'.$langs->trans("DateStart").'</td>';
 			print '<td class="center">'.$langs->trans("DateEnd").'</td>';
 			print '<td class="right">'.$langs->trans("OpportunityAmountShort").'</td>';
@@ -233,6 +234,7 @@ function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $
 
 						// Label
 						print '<td>'.$obj->title.'</td>';
+						print '<td>'.$obj->libelle.'</td>';
 						// Date start
 						print '<td class="center">'.dol_print_date($db->jdate($obj->do), "day").'</td>';
 						// Date end

From 840b0e48435da9f5b58271e44bfd81b046ee9c14 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Sat, 8 Jan 2022 14:47:40 +0100
Subject: [PATCH 19/82] FIX #19760 Uniformize label length

---
 .../install/mysql/migration/15.0.0-16.0.0.sql | 67 +++++++++++++++++++
 .../install/mysql/tables/llx_c_actioncomm.sql |  3 +-
 .../mysql/tables/llx_c_availability.sql       |  3 +-
 .../mysql/tables/llx_c_barcode_type.sql       |  3 +-
 .../mysql/tables/llx_c_chargesociales.sql     |  3 +-
 .../install/mysql/tables/llx_c_civility.sql   |  3 +-
 htdocs/install/mysql/tables/llx_c_country.sql |  3 +-
 .../install/mysql/tables/llx_c_currencies.sql |  3 +-
 .../install/mysql/tables/llx_c_effectif.sql   |  3 +-
 .../mysql/tables/llx_c_exp_tax_cat.sql        |  3 +-
 .../mysql/tables/llx_c_hrm_department.sql     |  3 +-
 .../mysql/tables/llx_c_hrm_function.sql       |  3 +-
 .../mysql/tables/llx_c_input_method.sql       |  3 +-
 .../mysql/tables/llx_c_input_reason.sql       |  3 +-
 .../mysql/tables/llx_c_lead_status.sql        |  3 +-
 .../install/mysql/tables/llx_c_paiement.sql   |  3 +-
 .../mysql/tables/llx_c_paper_format.sql       |  3 +-
 .../mysql/tables/llx_c_partnership_type.sql   |  3 +-
 .../mysql/tables/llx_c_product_nature.sql     |  4 +-
 .../tables/llx_c_productbatch_qcstatus.sql    |  3 +-
 .../install/mysql/tables/llx_c_propalst.sql   |  3 +-
 .../tables/llx_c_prospectcontactlevel.sql     |  3 +-
 .../mysql/tables/llx_c_prospectlevel.sql      |  3 +-
 .../mysql/tables/llx_c_recruitment_origin.sql |  3 +-
 .../mysql/tables/llx_c_shipment_mode.sql      |  3 +-
 .../tables/llx_c_shipment_package_type.sql    |  2 +-
 htdocs/install/mysql/tables/llx_c_stcomm.sql  |  3 +-
 .../mysql/tables/llx_c_stcommcontact.sql      |  3 +-
 .../mysql/tables/llx_c_type_contact.sql       |  3 +-
 .../mysql/tables/llx_c_type_container.sql     |  3 +-
 .../install/mysql/tables/llx_c_type_fees.sql  |  3 +-
 .../mysql/tables/llx_c_type_resource.sql      |  3 +-
 htdocs/install/mysql/tables/llx_c_typent.sql  |  3 +-
 htdocs/install/mysql/tables/llx_c_units.sql   |  3 +-
 34 files changed, 133 insertions(+), 33 deletions(-)
 create mode 100644 htdocs/install/mysql/migration/15.0.0-16.0.0.sql

diff --git a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
new file mode 100644
index 00000000000..9158aad8ae8
--- /dev/null
+++ b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
@@ -0,0 +1,67 @@
+--
+-- 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.
+-- To rebuild sequence for postgresql after insert by forcing id autoincrement fields:
+-- -- VPGSQL8.2 SELECT dol_util_rebuild_sequences();
+
+-- Missing in v15 or lower
+
+ALTER TABLE llx_c_availability MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_civility MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_country MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_currencies MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_effectif MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_exp_tax_cat MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_hrm_department MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_hrm_function MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_input_reason MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_lead_status MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_paper_format MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_partnership_type MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_product_nature MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_productbatch_qcstatus MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_propalst MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_prospectcontactlevel MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_prospectlevel MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_recruitment_origin MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_shipment_package_type MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_type_container MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_type_fees MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_type_resource MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_units MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_actioncomm MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_barcode_type MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_chargesociales MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_input_method MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_paiement MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_shipment_mode MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_stcomm MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_stcommcontact MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_type_contact MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_typent MODIFY COLUMN libelle varchar(128);
+
diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql
index a2b2dffe8a7..4ccbf4a1340 100644
--- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql
@@ -2,6 +2,7 @@
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004-2016      Laurent Destailleur  <eldy@users.sourceforge.net>
 -- Copyright (C) 2012 		    Florian Henry        <florian.henry@open-concept.pro>
+-- Copyright (C) 2022 		    Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -23,7 +24,7 @@ create table llx_c_actioncomm
   id         integer     PRIMARY KEY,
   code       varchar(50) NOT NULL,
   type       varchar(50) DEFAULT 'system' NOT NULL,
-  libelle    varchar(48) NOT NULL,
+  libelle    varchar(128) NOT NULL,
   module	 varchar(50) DEFAULT NULL,
   active     tinyint DEFAULT 1 NOT NULL,
   todo       tinyint,						-- deprecated
diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql
index 4cdc8d6203c..b36d89870b4 100644
--- a/htdocs/install/mysql/tables/llx_c_availability.sql
+++ b/htdocs/install/mysql/tables/llx_c_availability.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2011 Philippe GRAND      <philippe.grand@atoo-net.com>
 -- Copyright (C) 2020 Alexandre SPANGARO  <aspangaro@open-dsi.fr>
+-- Copyright (C) 2022 Juanjo Menent       <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -21,7 +22,7 @@ create table llx_c_availability
 (
 	rowid		integer	 	AUTO_INCREMENT PRIMARY KEY,
 	code		varchar(30) NOT NULL,
-	label		varchar(60) NOT NULL,
+	label		varchar(128) NOT NULL,
 	active		tinyint 	DEFAULT 1  NOT NULL,
 	position    integer NOT NULL DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql
index fc76fab2dc9..3aaea7a5f59 100644
--- a/htdocs/install/mysql/tables/llx_c_barcode_type.sql
+++ b/htdocs/install/mysql/tables/llx_c_barcode_type.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2007-2009 Regis Houssin        <regis.houssin@inodbox.com>
 -- Copyright (C) 2008      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022      Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -22,7 +23,7 @@ create table llx_c_barcode_type
   rowid    integer            AUTO_INCREMENT PRIMARY KEY,
   code     varchar(16)        NOT NULL,
   entity   integer  DEFAULT 1 NOT NULL,	-- multi company id
-  libelle  varchar(50)        NOT NULL,
+  libelle  varchar(128)        NOT NULL,
   coder    varchar(16)        NOT NULL,
   example  varchar(16)        NOT NULL
   
diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql
index 9da2976348f..78b87f95152 100644
--- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql
+++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004-2009      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 		    Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,7 +21,7 @@
 create table llx_c_chargesociales
 (
   id           integer AUTO_INCREMENT PRIMARY KEY,
-  libelle      varchar(80),
+  libelle      varchar(128),
   deductible   smallint DEFAULT 0 NOT NULL,
   active       tinyint DEFAULT 1  NOT NULL,
   code         varchar(12) NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_c_civility.sql b/htdocs/install/mysql/tables/llx_c_civility.sql
index 63fc8fca81f..9586101b254 100644
--- a/htdocs/install/mysql/tables/llx_c_civility.sql
+++ b/htdocs/install/mysql/tables/llx_c_civility.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2004 Benoit Mortier      <benoit.mortier@opensides.be>
 -- Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 Juanjo Menent       <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -21,7 +22,7 @@ create table llx_c_civility
 (
   rowid       integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
   code        varchar(6) NOT NULL,
-  label		  varchar(50),
+  label		  varchar(128),
   active      tinyint DEFAULT 1  NOT NULL,
   module      varchar(32) NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_country.sql b/htdocs/install/mysql/tables/llx_c_country.sql
index 7f7ba0d4113..d97c3b90371 100644
--- a/htdocs/install/mysql/tables/llx_c_country.sql
+++ b/htdocs/install/mysql/tables/llx_c_country.sql
@@ -2,6 +2,7 @@
 -- Copyright (C) 2001-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
 -- Copyright (C) 2004		Laurent Destailleur		<eldy@users.sourceforge.net>
 -- Copyright (C) 2014		Alexandre Spangaro		<aspangaro@open-dsi.fr>
+-- Copyright (C) 2022 	    Juanjo Menent           <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -23,7 +24,7 @@ create table llx_c_country
   rowid    integer            PRIMARY KEY,
   code     varchar(2)         NOT NULL,
   code_iso varchar(3)         ,
-  label    varchar(50)        NOT NULL,
+  label    varchar(128)        NOT NULL,
   eec      integer            ,
   active   tinyint DEFAULT 1  NOT NULL,
   favorite tinyint DEFAULT 0  NOT NULL
diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql
index 1943fa6eb41..d2d66236016 100644
--- a/htdocs/install/mysql/tables/llx_c_currencies.sql
+++ b/htdocs/install/mysql/tables/llx_c_currencies.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2005	Laurent Destailleur	<eldy@users.sourceforge.net>
 -- Copyright (C) 2012	Regis Houssin		<regis.houssin@inodbox.com>
+-- Copyright (C) 2022 	Juanjo Menent       <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,7 +21,7 @@
 create table llx_c_currencies
 (
   code_iso		varchar(3)  PRIMARY KEY,
-  label			varchar(64) NOT NULL,
+  label			varchar(128) NOT NULL,
   unicode		varchar(32) DEFAULT NULL,
   active		tinyint		DEFAULT 1  NOT NULL
   
diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql
index 26cab5c43da..dda78304fd9 100644
--- a/htdocs/install/mysql/tables/llx_c_effectif.sql
+++ b/htdocs/install/mysql/tables/llx_c_effectif.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004           Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 	        Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -21,7 +22,7 @@ create table llx_c_effectif
 (
   id      integer     PRIMARY KEY,
   code    varchar(12) NOT NULL,
-  libelle varchar(30),
+  libelle varchar(128),
   active  tinyint DEFAULT 1  NOT NULL,
   module  varchar(32) NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_exp_tax_cat.sql b/htdocs/install/mysql/tables/llx_c_exp_tax_cat.sql
index 90c60d87b97..6b106caa355 100644
--- a/htdocs/install/mysql/tables/llx_c_exp_tax_cat.sql
+++ b/htdocs/install/mysql/tables/llx_c_exp_tax_cat.sql
@@ -2,6 +2,7 @@
 -- Copyright (C) 2012 Mikael Carlavan     <mcarlavan@qis-network.com>
 -- Copyright (C) 2017 ATM Consulting      <contact@atm-consulting.fr>
 -- Copyright (C) 2017 Pierre-Henry Favre  <phf@atm-consulting.fr>
+-- Copyright (C) 2022 Juanjo Menent       <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,7 +21,7 @@
 
 CREATE TABLE IF NOT EXISTS llx_c_exp_tax_cat (
     rowid       integer  AUTO_INCREMENT PRIMARY KEY,
-    label       varchar(48) NOT NULL, 
+    label       varchar(128) NOT NULL,
     entity      integer DEFAULT 1 NOT NULL,
     active      integer DEFAULT 1 NOT NULL	          
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_hrm_department.sql b/htdocs/install/mysql/tables/llx_c_hrm_department.sql
index 13380bf03b9..fbe6c67671c 100644
--- a/htdocs/install/mysql/tables/llx_c_hrm_department.sql
+++ b/htdocs/install/mysql/tables/llx_c_hrm_department.sql
@@ -1,6 +1,7 @@
 --
 -- Copyright (C) 2013 Jean-François Ferry <jfefe@aternatik.fr>
 -- Copyright (C) 2015 Alexandre Spangaro  <aspangaro@open-dsi.fr>
+-- Copyright (C) 2022 Juanjo Menent       <jmenent@2byte.es>
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,7 +21,7 @@ create table llx_c_hrm_department
   rowid      	integer     PRIMARY KEY,
   pos   		tinyint DEFAULT 0 NOT NULL,
   code    		varchar(16) NOT NULL,
-  label 		varchar(50),
+  label 		varchar(128),
   active  		tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_c_hrm_function.sql b/htdocs/install/mysql/tables/llx_c_hrm_function.sql
index 3d6fc37fc2b..558893ba8d6 100644
--- a/htdocs/install/mysql/tables/llx_c_hrm_function.sql
+++ b/htdocs/install/mysql/tables/llx_c_hrm_function.sql
@@ -1,6 +1,7 @@
 --
 -- Copyright (C) 2013 Jean-François Ferry <jfefe@aternatik.fr>
 -- Copyright (C) 2015 Alexandre Spangaro  <aspangaro@open-dsi.fr>
+-- Copyright (C) 2022 Juanjo Menent       <jmenent@2byte.es>
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,7 +21,7 @@ create table llx_c_hrm_function
   rowid     integer     PRIMARY KEY,
   pos   	tinyint DEFAULT 0 NOT NULL,
   code    	varchar(16) NOT NULL,
-  label 	varchar(50),
+  label 	varchar(128),
   c_level   tinyint DEFAULT 0 NOT NULL,
   active  	tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql
index 40ed48f8fc6..fc77566e6bd 100644
--- a/htdocs/install/mysql/tables/llx_c_input_method.sql
+++ b/htdocs/install/mysql/tables/llx_c_input_method.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 	   Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -21,7 +22,7 @@ create table llx_c_input_method
 (
   rowid    integer AUTO_INCREMENT PRIMARY KEY,
   code     varchar(30),
-  libelle  varchar(60),
+  libelle  varchar(128),
   active   tinyint default 1  NOT NULL,
   module   varchar(32) NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql
index dba58dbbecc..f57a9a877ab 100644
--- a/htdocs/install/mysql/tables/llx_c_input_reason.sql
+++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 	   Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -23,7 +24,7 @@ create table llx_c_input_reason
 (
   rowid		integer AUTO_INCREMENT PRIMARY KEY,
   code		varchar(30),
-  label		varchar(60),
+  label		varchar(128),
   active	tinyint default 1  NOT NULL,
   module    varchar(32) NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_lead_status.sql b/htdocs/install/mysql/tables/llx_c_lead_status.sql
index 9027c0f6ca1..7905c5b6c05 100644
--- a/htdocs/install/mysql/tables/llx_c_lead_status.sql
+++ b/htdocs/install/mysql/tables/llx_c_lead_status.sql
@@ -1,5 +1,6 @@
 -- Manage Lead
 -- Copyright (C) 2014  Florian HENRY <florian.henry@open-concept.pro>
+-- Copyright (C) 2022  Juanjo Menent <jmenent@2byte.es>
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -18,7 +19,7 @@ create table llx_c_lead_status
 (
   rowid       integer AUTO_INCREMENT PRIMARY KEY,
   code 		  varchar(10),
-  label       varchar(50),
+  label       varchar(128),
   position    integer,
   percent     double(5,2),
   active      tinyint DEFAULT 1 NOT NULL
diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql
index 739d31e946d..535e5115e85 100644
--- a/htdocs/install/mysql/tables/llx_c_paiement.sql
+++ b/htdocs/install/mysql/tables/llx_c_paiement.sql
@@ -3,6 +3,7 @@
 -- Copyright (C) 2004-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
 -- Copyright (C) 2014		Alexandre Spangaro		<aspangaro@open-dsi.fr>
 -- Copyright (C) 2017		Regis Houssin			<regis.houssin@inodbox.com>
+-- Copyright (C) 2022 		Juanjo Menent           <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -24,7 +25,7 @@ create table llx_c_paiement
   id					integer AUTO_INCREMENT PRIMARY KEY,
   entity				integer	DEFAULT 1 NOT NULL,	-- multi company id
   code       		varchar(6)  NOT NULL,
-  libelle    		varchar(62),
+  libelle    		varchar(128),
   type       		smallint,	-- 0: input money, 1: output money, 2: input and output, 3: other
   active     		tinyint DEFAULT 1  NOT NULL,
   accountancy_code	varchar(32) NULL,
diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql
index 45c56ce379f..fd9fc672b68 100644
--- a/htdocs/install/mysql/tables/llx_c_paper_format.sql
+++ b/htdocs/install/mysql/tables/llx_c_paper_format.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2007 Regis Houssin <regis.houssin@inodbox.com>
+-- Copyright (C) 2022 Juanjo Menent <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,7 +21,7 @@ create table llx_c_paper_format
 (
   rowid    integer                          AUTO_INCREMENT PRIMARY KEY,
   code     varchar(16)                      NOT NULL,
-  label    varchar(50)                      NOT NULL,
+  label    varchar(128)                      NOT NULL,
   width    float(6,2)                       DEFAULT 0,  -- Largeur du papier
   height   float(6,2)                       DEFAULT 0,  -- Hauteur du papier
   unit     varchar(5)                       NOT NULL,   -- Mesure unit
diff --git a/htdocs/install/mysql/tables/llx_c_partnership_type.sql b/htdocs/install/mysql/tables/llx_c_partnership_type.sql
index d2a4a3b7549..99841f967cb 100644
--- a/htdocs/install/mysql/tables/llx_c_partnership_type.sql
+++ b/htdocs/install/mysql/tables/llx_c_partnership_type.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2021 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 Juanjo Menent        <jmenent@2byte.es>
 -- 
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -29,7 +30,7 @@ create table llx_c_partnership_type
   rowid      	integer AUTO_INCREMENT PRIMARY KEY,
   entity        integer DEFAULT 1 NOT NULL,
   code          varchar(32) NOT NULL,
-  label 	    varchar(64)	NOT NULL,
+  label 	    varchar(128)	NOT NULL,
   active  	    tinyint DEFAULT 1 NOT NULL
 )ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_c_product_nature.sql b/htdocs/install/mysql/tables/llx_c_product_nature.sql
index 3c467ce7cf8..e2efdf2a981 100644
--- a/htdocs/install/mysql/tables/llx_c_product_nature.sql
+++ b/htdocs/install/mysql/tables/llx_c_product_nature.sql
@@ -1,5 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2020 Florian HENRY  <florian.henry@scopen.fr>
+-- Copyright (C) 2022 Juanjo Menent  <jmenent@2byte.es>
+
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -19,6 +21,6 @@
 CREATE TABLE llx_c_product_nature (
      rowid integer AUTO_INCREMENT PRIMARY KEY,
      code tinyint NOT NULL,
-     label varchar(100),
+     label varchar(128),
      active tinyint DEFAULT 1  NOT NULL
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
index 73daa56067a..06a2a76220d 100644
--- a/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
+++ b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2012-2017      Noé Cendrier  <noe.cendrier@altairis.fr>
+-- Copyright (C) 2022 		    Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -21,6 +22,6 @@ CREATE TABLE llx_c_productbatch_qcstatus
   rowid    integer            AUTO_INCREMENT PRIMARY KEY,
   entity 	 integer NOT NULL DEFAULT 1,
   code     varchar(16)        NOT NULL,
-  label    varchar(50)        NOT NULL,
+  label    varchar(128)        NOT NULL,
   active   integer  DEFAULT 1 NOT NULL  
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql
index 2a107b52735..7b3351a52b8 100644
--- a/htdocs/install/mysql/tables/llx_c_propalst.sql
+++ b/htdocs/install/mysql/tables/llx_c_propalst.sql
@@ -1,6 +1,7 @@
 -- ===================================================================
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004           Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 		    Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -21,7 +22,7 @@ create table llx_c_propalst
 (
   id              smallint    PRIMARY KEY,
   code            varchar(12) NOT NULL,
-  label           varchar(30),
+  label           varchar(128),
   active          tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_c_prospectcontactlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectcontactlevel.sql
index 421b3452371..b9efe7967ad 100644
--- a/htdocs/install/mysql/tables/llx_c_prospectcontactlevel.sql
+++ b/htdocs/install/mysql/tables/llx_c_prospectcontactlevel.sql
@@ -1,5 +1,6 @@
 -- ===================================================================
 -- Copyright (C) 2020 	   Open-Dsi  <support@open-dsi.fr>
+-- Copyright (C) 2022 	   Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -19,7 +20,7 @@
 create table llx_c_prospectcontactlevel
 (
   code            varchar(12) PRIMARY KEY,
-  label           varchar(30),
+  label           varchar(128),
   sortorder       smallint,
   active          smallint    DEFAULT 1 NOT NULL,
   module          varchar(32) NULL
diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql
index 70e26dc3a26..31d3abcb5bc 100644
--- a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql
+++ b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql
@@ -1,5 +1,6 @@
 -- ===================================================================
 -- Copyright (C) 2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -19,7 +20,7 @@
 create table llx_c_prospectlevel
 (
   code            varchar(12) PRIMARY KEY,
-  label           varchar(30),
+  label           varchar(128),
   sortorder       smallint,
   active          smallint    DEFAULT 1 NOT NULL,
   module          varchar(32) NULL
diff --git a/htdocs/install/mysql/tables/llx_c_recruitment_origin.sql b/htdocs/install/mysql/tables/llx_c_recruitment_origin.sql
index b18f7eb383c..2d1c6682900 100644
--- a/htdocs/install/mysql/tables/llx_c_recruitment_origin.sql
+++ b/htdocs/install/mysql/tables/llx_c_recruitment_origin.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2005-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 	   Juanjo Menent        <jmenent@2byte.es>
 -- 
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -28,6 +29,6 @@ create table llx_c_recruitment_origin
 (
   rowid      	integer AUTO_INCREMENT PRIMARY KEY,
   code          varchar(32) NOT NULL,
-  label 	    varchar(64)	NOT NULL,
+  label 	    varchar(128)	NOT NULL,
   active  	    tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
index 6f49f682f24..4f0d584d6d7 100644
--- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
+++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
@@ -1,5 +1,6 @@
 -- ===================================================================
 -- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2022 Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -22,7 +23,7 @@ create table llx_c_shipment_mode
   entity				   integer	DEFAULT 1 NOT NULL,	-- multi company id
   tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   code             varchar(30) NOT NULL,
-  libelle          varchar(50) NOT NULL,
+  libelle          varchar(128) NOT NULL,
   description      text,
   tracking         varchar(255) NULL,
   active           tinyint DEFAULT 0,
diff --git a/htdocs/install/mysql/tables/llx_c_shipment_package_type.sql b/htdocs/install/mysql/tables/llx_c_shipment_package_type.sql
index e510352eba2..92dd861fd49 100644
--- a/htdocs/install/mysql/tables/llx_c_shipment_package_type.sql
+++ b/htdocs/install/mysql/tables/llx_c_shipment_package_type.sql
@@ -2,7 +2,7 @@
 create table llx_c_shipment_package_type
 (
     rowid        integer  AUTO_INCREMENT PRIMARY KEY,
-    label        varchar(50) NOT NULL,  -- Short name
+    label        varchar(128) NOT NULL,  -- Short name
     description	 varchar(255), -- Description
     active       integer DEFAULT 1 NOT NULL, -- Active or not	
     entity       integer DEFAULT 1 NOT NULL -- Multi company id 
diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql
index 5f31666b28c..aa5d58a280f 100644
--- a/htdocs/install/mysql/tables/llx_c_stcomm.sql
+++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004-2015      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 		    Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -21,7 +22,7 @@ create table llx_c_stcomm
 (
   id       integer      PRIMARY KEY,
   code     varchar(12)  NOT NULL,
-  libelle  varchar(30),
+  libelle  varchar(128),
   picto    varchar(128),
   active   tinyint default 1  NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_stcommcontact.sql b/htdocs/install/mysql/tables/llx_c_stcommcontact.sql
index c906e4f5103..7ab74e123f6 100644
--- a/htdocs/install/mysql/tables/llx_c_stcommcontact.sql
+++ b/htdocs/install/mysql/tables/llx_c_stcommcontact.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2020 	   Open-Dsi  <support@open-dsi.fr>
+-- Copyright (C) 2022 	   Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,7 +21,7 @@ create table llx_c_stcommcontact
 (
   id       integer      PRIMARY KEY,
   code     varchar(12)  NOT NULL,
-  libelle  varchar(30),
+  libelle  varchar(128),
   picto    varchar(128),
   active   tinyint default 1  NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql
index c222b0fe273..4b12661657e 100644
--- a/htdocs/install/mysql/tables/llx_c_type_contact.sql
+++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2005     Patrick Rouillon     <patrick.rouillon.net>
 -- Copyright (C) 2005     Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 	  Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -32,7 +33,7 @@ create table llx_c_type_contact
   element       varchar(30) NOT NULL,
   source        varchar(8)  DEFAULT 'external' NOT NULL,
   code          varchar(32) NOT NULL,
-  libelle 	    varchar(64)	NOT NULL,
+  libelle 	    varchar(128)	NOT NULL,
   active  	    tinyint DEFAULT 1  NOT NULL,
   module        varchar(32) NULL,
   position      integer NOT NULL DEFAULT 0
diff --git a/htdocs/install/mysql/tables/llx_c_type_container.sql b/htdocs/install/mysql/tables/llx_c_type_container.sql
index 53a89fe873b..6de3d041669 100644
--- a/htdocs/install/mysql/tables/llx_c_type_container.sql
+++ b/htdocs/install/mysql/tables/llx_c_type_container.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2018     Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 	  Juanjo Menent        <jmenent@2byte.es>
 -- 
 --
 -- This program is free software; you can redistribute it and/or modify
@@ -30,7 +31,7 @@ create table llx_c_type_container
   rowid      	integer AUTO_INCREMENT PRIMARY KEY,
   code          varchar(32) NOT NULL,
   entity		integer	DEFAULT 1 NOT NULL,	-- multi company id
-  label 	    varchar(64)	NOT NULL,
+  label 	    varchar(128)	NOT NULL,
   module     	varchar(32) NULL,
   active  	    tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql
index 3f9c49c95d7..d620e38cf69 100644
--- a/htdocs/install/mysql/tables/llx_c_type_fees.sql
+++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql
@@ -2,6 +2,7 @@
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004           Laurent Destailleur  <eldy@users.sourceforge.net>
 -- Copyright (C) 2014           Alexandre Spangaro   <aspangaro@open-dsi.fr>
+-- Copyright (C) 2022 	        Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -23,7 +24,7 @@ create table llx_c_type_fees
 (
   id        		integer      AUTO_INCREMENT PRIMARY KEY,
   code      		varchar(12)  NOT NULL,
-  label				varchar(30),
+  label				varchar(128),
   type				integer DEFAULT 0,		-- 0=type product, 1=type service
   accountancy_code	varchar(32) NULL,
   active    		tinyint DEFAULT 1   NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_c_type_resource.sql b/htdocs/install/mysql/tables/llx_c_type_resource.sql
index e490755b1f7..f88f502a038 100644
--- a/htdocs/install/mysql/tables/llx_c_type_resource.sql
+++ b/htdocs/install/mysql/tables/llx_c_type_resource.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2014     Jean-François Ferry <jfefe@aternatik.fr>
+-- Copyright (C) 2022 	  Juanjo Menent        <jmenent@2byte.es>
 -- 
 --
 -- This program is free software; you can redistribute it and/or modify
@@ -29,6 +30,6 @@ create table llx_c_type_resource
 (
   rowid      	integer AUTO_INCREMENT PRIMARY KEY,
   code          varchar(32) NOT NULL,
-  label 	    varchar(64)	NOT NULL,
+  label 	    varchar(128)	NOT NULL,
   active  	    tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql
index 0b15e70b15b..69253f98857 100644
--- a/htdocs/install/mysql/tables/llx_c_typent.sql
+++ b/htdocs/install/mysql/tables/llx_c_typent.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004           Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 	        Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -21,7 +22,7 @@ create table llx_c_typent
 (
   id         integer      PRIMARY KEY,
   code       varchar(12)  NOT NULL,
-  libelle    varchar(64),
+  libelle    varchar(128),
   fk_country integer NULL,		-- Defined only to have specific list for countries that can't use generic list (like argentina that need type A or B)
   active     tinyint DEFAULT 1   NOT NULL,
   module     varchar(32) NULL,
diff --git a/htdocs/install/mysql/tables/llx_c_units.sql b/htdocs/install/mysql/tables/llx_c_units.sql
index 7b2424a8f54..94046d25b87 100644
--- a/htdocs/install/mysql/tables/llx_c_units.sql
+++ b/htdocs/install/mysql/tables/llx_c_units.sql
@@ -2,6 +2,7 @@
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004           Laurent Destailleur  <eldy@users.sourceforge.net>
 -- Copyright (C) 2012           Cédric Salvador      <csalvador@gpcsolutions.fr>
+-- Copyright (C) 2022 	        Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -23,7 +24,7 @@ create table llx_c_units(
 	code            varchar(3),
     sortorder		smallint,
 	scale           integer,
-	label           varchar(50),
+	label           varchar(128),
 	short_label     varchar(5),
 	unit_type       varchar(10),
 	active          tinyint DEFAULT 1 NOT NULL

From 960aaded8eba83f58c0a04f056869f9e28b6a694 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 9 Jan 2022 21:08:06 +0100
Subject: [PATCH 20/82] NEW Thirdparty - Add rules customer accountancy code is
 mandatory to validate invoice

---
 htdocs/compta/facture/card.php                | 10 +++++-
 htdocs/compta/facture/class/facture.class.php |  2 +-
 htdocs/langs/en_US/errors.lang                |  2 ++
 htdocs/societe/admin/societe.php              | 31 +++++++++++++++++++
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index c7376f961f8..7881c76ff80 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -607,7 +607,7 @@ if (empty($reshook)) {
 		// Check parameters
 
 		// Check for mandatory fields in thirdparty (defined into setup)
-		$array_to_check = array('IDPROF1', 'IDPROF2', 'IDPROF3', 'IDPROF4', 'IDPROF5', 'IDPROF6', 'EMAIL');
+		$array_to_check = array('IDPROF1', 'IDPROF2', 'IDPROF3', 'IDPROF4', 'IDPROF5', 'IDPROF6', 'EMAIL', 'ACCOUNTANCY_CODE_CUSTOMER');
 		foreach ($array_to_check as $key) {
 			$keymin = strtolower($key);
 			$i = (int) preg_replace('/[^0-9]/', '', $key);
@@ -635,6 +635,14 @@ if (empty($reshook)) {
 						setEventMessages($langs->trans("ErrorBadEMail", $object->thirdparty->email).' ('.$langs->trans("ForbiddenBySetupRules").')', null, 'errors');
 					}
 				}
+				if ($key == 'ACCOUNTANCY_CODE_CUSTOMER') {
+					// Check for mandatory
+					if (!empty($conf->global->SOCIETE_ACCOUNTANCY_CODE_CUSTOMER_INVOICE_MANDATORY) && empty($object->thirdparty->code_compta)) {
+						$langs->load("errors");
+						$error++;
+						setEventMessages($langs->trans("ErrorAccountancyCodeCustomerIsMandatory", $object->thirdparty->name).' ('.$langs->trans("ForbiddenBySetupRules").')', null, 'errors');
+					}
+				}
 			}
 		}
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 4f72b5a14a3..57d0f347913 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1622,7 +1622,7 @@ class Facture extends CommonInvoice
 		if ($rowid) {
 			$sql .= " WHERE f.rowid=".((int) $rowid);
 		} else {
-			$sql .= ' WHERE f.entity IN ('.getEntity('invoice').')'; // Dont't use entity if you use rowid
+			$sql .= ' WHERE f.entity IN ('.getEntity('invoice').')'; // Don't use entity if you use rowid
 			if ($ref) {
 				$sql .= " AND f.ref='".$this->db->escape($ref)."'";
 			}
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 7f4ca7b074f..1f00d2fe5eb 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
 ErrorBadThirdPartyName=Bad value for third-party name
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=The %s is mandatory
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=Bad syntax for customer code
 ErrorBadBarCodeSyntax=Bad syntax for barcode. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
 ErrorCustomerCodeRequired=Customer code required
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 2f272ceca1c..9e1fb330019 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -169,6 +169,20 @@ if ($action == 'setdoc') {
 	}
 }
 
+//Activate Set accountancy code customer invoice mandatory
+if ($action == "setaccountancycodecustomerinvoicemandatory") {
+	$setaccountancycodecustomerinvoicemandatory = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "SOCIETE_ACCOUNTANCY_CODE_CUSTOMER_INVOICE_MANDATORY", $setaccountancycodecustomerinvoicemandatory, 'yesno', 0, '', $conf->entity);
+	if (!($res > 0)) {
+		$error++;
+	}
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+}
+
 //Activate Set ref in list
 if ($action == "setaddrefinlist") {
 	$setaddrefinlist = GETPOST('value', 'int');
@@ -709,6 +723,23 @@ foreach ($profid as $key => $val) {
 	$i++;
 }
 
+if ($conf->accounting->enabled) {
+	print '<tr class="oddeven">';
+	print '<td colspan="2">'.$langs->trans('CustomerAccountancyCodeShort')."</td>\n";
+	print '<td colspan="2"></td>';
+
+	if (!empty($conf->global->SOCIETE_ACCOUNTANCY_CODE_CUSTOMER_INVOICE_MANDATORY)) {
+		print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaccountancycodecustomerinvoicemandatory&token='.newToken().'&value=0">';
+		print img_picto($langs->trans("Activated"), 'switch_on');
+		print '</a></td>';
+	} else {
+		print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaccountancycodecustomerinvoicemandatory&token='.newToken().'&value=1">';
+		print img_picto($langs->trans("Disabled"), 'switch_off');
+		print '</a></td>';
+	}
+	print "</tr>\n";
+}
+
 print "</table>\n";
 print '</div>';
 

From cc6dd99bf6e998f0e39bab6eb0be09d69acbea2a Mon Sep 17 00:00:00 2001
From: BENKE Charlene <1179011+defrance@users.noreply.github.com>
Date: Thu, 13 Jan 2022 12:20:54 +0100
Subject: [PATCH 21/82] NEW : addMoreActionsButtonsList hook for button in list

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

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 0b67327b11c..3c2e8763fe1 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -237,7 +237,7 @@ if ($action != 'export_csv') {
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
 	$parameters = array();
-	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	$reshook = $hookmanager->executeHooks('addMoreActionsButtonsList', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) {
 		$button = '<input type="button" id="exportcsvbutton" name="exportcsvbutton" class="butAction" value="'.$langs->trans("Export").' ('.$conf->global->ACCOUNTING_EXPORT_FORMAT.')" />';
 

From c4c43fc9f9dab0a597974f9cfbfd5f214874ceab Mon Sep 17 00:00:00 2001
From: BENKE Charlene <1179011+defrance@users.noreply.github.com>
Date: Thu, 13 Jan 2022 12:22:16 +0100
Subject: [PATCH 22/82] Update list.php

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

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 8b2ba49d1bc..a90400cfd7a 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -766,7 +766,7 @@ if (count($filter)) {
 }
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('addMoreActionsButtonsList', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
 	// Button re-export
 	if (!empty($conf->global->ACCOUNTING_REEXPORT)) {

From 05603730ca6ca9bf636a71faa27027e9a0dee670 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <1179011+defrance@users.noreply.github.com>
Date: Thu, 13 Jan 2022 12:22:45 +0100
Subject: [PATCH 23/82] Update listbyaccount.php

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

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index d73f4228f97..837a372a32d 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -473,7 +473,7 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('addMoreActionsButtonsList', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
 	$newcardbutton = dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param);
 	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));

From 90829bd255d4ff7b9aea63b6b93d58420f9da8ae Mon Sep 17 00:00:00 2001
From: BENKE Charlene <1179011+defrance@users.noreply.github.com>
Date: Thu, 13 Jan 2022 12:23:14 +0100
Subject: [PATCH 24/82] Update listbysubaccount.php

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

diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
index e529126d8ce..c6fb95d5ab7 100644
--- a/htdocs/accountancy/bookkeeping/listbysubaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -473,7 +473,7 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('addMoreActionsButtonsList', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
 	$newcardbutton = dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param);
 	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly'));

From 9cd4bfabff98a9e15297228277e859e7237fa62c Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Sat, 15 Jan 2022 21:53:49 +0100
Subject: [PATCH 25/82] Create new line when add ordered product in TakePOS

When TAKEPOS_GROUP_SAME_PRODUCT is enabled in TakePOS and you add product, avoid group it if product is ordered
---
 htdocs/takepos/invoice.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index ec2fd256cfe..2603fef7f2a 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -537,6 +537,7 @@ if ($action == "addline") {
 	if (!empty($conf->global->TAKEPOS_GROUP_SAME_PRODUCT)) {
 		foreach ($invoice->lines as $line) {
 			if ($line->product_ref == $prod->ref) {
+				if ($line->special_code==4) continue; // If this line is sended to printer create new line
 				$result = $invoice->updateline($line->id, $line->desc, $line->subprice, $line->qty + 1, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
 				if ($result < 0) {
 					dol_htmloutput_errors($invoice->error, $invoice->errors, 1);

From 255d8ba7537d5920834533348a92313be0eddda0 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Tue, 18 Jan 2022 10:59:10 +0100
Subject: [PATCH 26/82] FIX : rankorder + vacant positions

---
 htdocs/hrm/class/position.class.php                  | 2 +-
 htdocs/hrm/skill_card.php                            | 6 +++---
 htdocs/install/mysql/migration/14.0.0-15.0.0.sql     | 2 +-
 htdocs/install/mysql/tables/llx_hrm_job_user-hrm.sql | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 26298c31aa7..bd31311f4bf 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -109,7 +109,7 @@ class Position extends CommonObject
 		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
 		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
 		'fk_contrat' => array('type'=>'integer:Contrat:contrat/class/contrat.class.php', 'label'=>'fk_contrat', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>0,),
-		'fk_user' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Employee', 'enabled'=>'1', 'position'=>55, 'notnull'=>1, 'visible'=>1,),
+		'fk_user' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Employee', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>1,),
 		'fk_job' => array('type'=>'integer:Job:/hrm/class/job.class.php', 'label'=>'Job', 'enabled'=>'1', 'position'=>56, 'notnull'=>1, 'visible'=>1,),
 		'date_start' => array('type'=>'date', 'label'=>'DateStart', 'enabled'=>'1', 'position'=>51, 'notnull'=>1, 'visible'=>1,),
 		'date_end' => array('type'=>'date', 'label'=>'DateEnd', 'enabled'=>'1', 'position'=>52, 'notnull'=>0, 'visible'=>1,),
diff --git a/htdocs/hrm/skill_card.php b/htdocs/hrm/skill_card.php
index 6fa601249db..a06cf40952a 100644
--- a/htdocs/hrm/skill_card.php
+++ b/htdocs/hrm/skill_card.php
@@ -264,7 +264,7 @@ if (($id || $ref) && $action == 'edit') {
 	if (is_array($SkilldetRecords) && count($SkilldetRecords) > 0) {
 		print '<table>';
 		foreach ($SkilldetRecords as $sk) {
-			if ($sk->rank > $MaxNumberSkill) {
+			if ($sk->rankorder > $MaxNumberSkill) {
 				continue;
 			}
 
@@ -291,7 +291,7 @@ if (($id || $ref) && $action == 'edit') {
 				//              if (!empty($val['help'])) {
 				//                  print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
 				//              } else {
-					print $langs->trans($val['label']).'&nbsp;'.$langs->trans('rank').'&nbsp;'.$sk->rank;
+					print $langs->trans($val['label']).'&nbsp;'.$langs->trans('rank').'&nbsp;'.$sk->rankorder;
 				//              }
 				print '</td>';
 				print '<td class="valuefieldcreate">';
@@ -696,7 +696,7 @@ if ($action != "create" && $action != "edit") {
 			break; // Should not happen
 		}
 
-		if ($obj->rank > $MaxNumberSkill) {
+		if ($obj->rankorder > $MaxNumberSkill) {
 			continue;
 		}
 
diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index e60208cf56d..ae5625cabbb 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -289,7 +289,7 @@ CREATE TABLE llx_hrm_job_user(
     date_creation datetime NOT NULL,
     tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_contrat integer,
-    fk_user integer NOT NULL,
+    fk_user integer,
     fk_job integer NOT NULL,
     date_start date,
     date_end date,
diff --git a/htdocs/install/mysql/tables/llx_hrm_job_user-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_job_user-hrm.sql
index 33906d1607f..4e10bf64bf8 100644
--- a/htdocs/install/mysql/tables/llx_hrm_job_user-hrm.sql
+++ b/htdocs/install/mysql/tables/llx_hrm_job_user-hrm.sql
@@ -23,7 +23,7 @@ CREATE TABLE llx_hrm_job_user(
 	date_creation datetime NOT NULL,
 	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_contrat integer,
-	fk_user integer NOT NULL,
+	fk_user integer,
 	fk_job integer NOT NULL,
 	date_start datetime,
 	date_end datetime,

From 59921d60b3d1840d768daa45a8f1a6187c828384 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 21 Jan 2022 13:38:59 +0100
Subject: [PATCH 27/82] Length label control

---
 htdocs/admin/dict.php | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 5245e60ad67..0b2404050e6 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2018	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
  * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@inodbox.com>
- * Copyright (C) 2010-2016	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2010-2022	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2011-2021	Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2011		Remy Younes				<ryounes@gmail.com>
  * Copyright (C) 2012-2015	Marcos García			<marcosgdf@gmail.com>
@@ -2408,6 +2408,33 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 					$fieldValue = '0';
 				}
 			}
+
+			// Labels Length
+			$maxlength = '';
+			if (in_array($fieldlist[$field], array('libelle', 'label'))) {
+				if ($fieldlist[$field] == 'label' || $fieldlist[$field] == 'libelle') {
+					switch ($tabname) {
+						case MAIN_DB_PREFIX . 'c_accounting_category':
+						case MAIN_DB_PREFIX . 'c_ecotaxe':
+						case MAIN_DB_PREFIX . 'c_email_senderprofile':
+						case MAIN_DB_PREFIX . 'c_forme_juridique':
+						case MAIN_DB_PREFIX . 'c_holiday_types':
+						case MAIN_DB_PREFIX . 'c_payment_term':
+						case MAIN_DB_PREFIX . 'c_transport_mode':
+							$maxlength = ' maxlength="255"';
+							break;
+						case MAIN_DB_PREFIX . 'c_email_templates':
+							$maxlength = ' maxlength="180"';
+							break;
+						case MAIN_DB_PREFIX . 'c_socialnetworks':
+							$maxlength = ' maxlength="150"';
+							break;
+						default:
+							$maxlength = ' maxlength="128"';
+					}
+				}
+			}
+
 			print '<td class="'.$classtd.'">';
 			$transfound = 0;
 			$transkey = '';
@@ -2426,7 +2453,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				}
 			}
 			if (!$transfound) {
-				print '<input type="text" class="flat'.($class ? ' '.$class : '').'" value="'.dol_escape_htmltag($fieldValue).'" name="'.$fieldlist[$field].'">';
+				print '<input type="text" class="flat'.($class ? ' '.$class : '').'"'.($maxlength ? ' '.$maxlength : '').' value="'.dol_escape_htmltag($fieldValue).'" name="'.$fieldlist[$field].'">';
 			} else {
 				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$transkey.'">';
 			}

From 18e308e800e0899d1b52ff67a3b2245a40c9e11e Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 21 Jan 2022 13:47:20 +0100
Subject: [PATCH 28/82] remove leftover if

---
 htdocs/admin/dict.php | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 0b2404050e6..954b3e632ca 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -2412,26 +2412,24 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			// Labels Length
 			$maxlength = '';
 			if (in_array($fieldlist[$field], array('libelle', 'label'))) {
-				if ($fieldlist[$field] == 'label' || $fieldlist[$field] == 'libelle') {
-					switch ($tabname) {
-						case MAIN_DB_PREFIX . 'c_accounting_category':
-						case MAIN_DB_PREFIX . 'c_ecotaxe':
-						case MAIN_DB_PREFIX . 'c_email_senderprofile':
-						case MAIN_DB_PREFIX . 'c_forme_juridique':
-						case MAIN_DB_PREFIX . 'c_holiday_types':
-						case MAIN_DB_PREFIX . 'c_payment_term':
-						case MAIN_DB_PREFIX . 'c_transport_mode':
-							$maxlength = ' maxlength="255"';
-							break;
-						case MAIN_DB_PREFIX . 'c_email_templates':
-							$maxlength = ' maxlength="180"';
-							break;
-						case MAIN_DB_PREFIX . 'c_socialnetworks':
-							$maxlength = ' maxlength="150"';
-							break;
-						default:
-							$maxlength = ' maxlength="128"';
-					}
+				switch ($tabname) {
+					case MAIN_DB_PREFIX . 'c_accounting_category':
+					case MAIN_DB_PREFIX . 'c_ecotaxe':
+					case MAIN_DB_PREFIX . 'c_email_senderprofile':
+					case MAIN_DB_PREFIX . 'c_forme_juridique':
+					case MAIN_DB_PREFIX . 'c_holiday_types':
+					case MAIN_DB_PREFIX . 'c_payment_term':
+					case MAIN_DB_PREFIX . 'c_transport_mode':
+						$maxlength = ' maxlength="255"';
+						break;
+					case MAIN_DB_PREFIX . 'c_email_templates':
+						$maxlength = ' maxlength="180"';
+						break;
+					case MAIN_DB_PREFIX . 'c_socialnetworks':
+						$maxlength = ' maxlength="150"';
+						break;
+					default:
+						$maxlength = ' maxlength="128"';
 				}
 			}
 

From 84d446cf73ec1e14432253ebd2ff3ebc7b5b2d57 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Fri, 21 Jan 2022 15:31:30 +0100
Subject: [PATCH 29/82] NEW possibility to consume multiple   batch

---
 htdocs/mrp/js/lib_dispatch.js.php |  6 ++++--
 htdocs/mrp/mo_production.php      | 16 ++++++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/htdocs/mrp/js/lib_dispatch.js.php b/htdocs/mrp/js/lib_dispatch.js.php
index 8a5eef60211..aa29b38c5fb 100644
--- a/htdocs/mrp/js/lib_dispatch.js.php
+++ b/htdocs/mrp/js/lib_dispatch.js.php
@@ -70,10 +70,12 @@ function addDispatchLine(index, type, mode)
 	mode = mode || 'qtymissing'
 
 	console.log("fourn/js/lib_dispatch.js.php Split line type="+type+" index="+index+" mode="+mode);
+    if(mode == 'qtymissingconsume') var inputId = 'qtytoconsume';
+    else var inputId = 'qtytoproduce';
 	var nbrTrs = $("tr[name^='"+type+"_"+index+"']").length; 				// position of line for batch
 	var $row = $("tr[name='"+type+'_'+index+"_1']").clone(true); 				// clone last batch line to jQuery object
 	var	qtyOrdered = parseFloat($("#qty_ordered_"+index).val()); 	// Qty ordered is same for all rows
-	var	qty = parseFloat($("#qtytoproduce-"+index+"-"+nbrTrs).val());
+	var	qty = parseFloat($("#"+inputId+"-"+index+"-"+nbrTrs).val());
 	var	qtyDispatched;
 
 	if (mode === 'lessone')
@@ -83,7 +85,7 @@ function addDispatchLine(index, type, mode)
 	else
 	{
 		qtyDispatched = parseFloat($("#qty_dispatched_"+index).val()) + qty;
-		console.log(qty);
+		console.log($("#qty_dispatched_"+index).val());
 		// If user did not reduced the qty to dispatch on old line, we keep only 1 on old line and the rest on new line
 		if (qtyDispatched == qtyOrdered && qtyDispatched > 1) {
 			qtyDispatched = parseFloat($("#qty_dispatched_"+index).val()) + 1;
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index ca9480eb1ae..fa5897bb5f0 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -811,6 +811,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						$alreadyconsumed += $line2['qty'];
 					}
 
+					$suffix = '_'.$line->id;
+					print '<!-- Line to dispatch '.$suffix.' -->'."\n";
+					// hidden fields for js function
+					print '<input id="qty_ordered'.$suffix.'" type="hidden" value="'.$line->qty.'">';
+					print '<input id="qty_dispatched'.$suffix.'" type="hidden" value="'.$alreadyconsumed.'">';
+
 					print '<tr>';
 					print '<td>'.$tmpproduct->getNomUrl(1);
 					print '<br><span class="opacitymedium small">'.$tmpproduct->label.'</span>';
@@ -914,13 +920,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					if (in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
 						$i = 1;
 						print '<!-- Enter line to consume -->'."\n";
-						print '<tr>';
+						print '<tr name="batch_'.$line->id.'_'.$i.'">';
 						print '<td><span class="opacitymedium">'.$langs->trans("ToConsume").'</span></td>';
 						$preselected = (GETPOSTISSET('qty-'.$line->id.'-'.$i) ? GETPOST('qty-'.$line->id.'-'.$i) : max(0, $line->qty - $alreadyconsumed));
 						if ($action == 'consumeorproduce' && !GETPOSTISSET('qty-'.$line->id.'-'.$i)) {
 							$preselected = 0;
 						}
-						print '<td class="right"><input type="text" class="width50 right" name="qty-'.$line->id.'-'.$i.'" value="'.$preselected.'"></td>';
+						print '<td class="right"><input type="text" class="width50 right" id="qtytoconsume-'.$line->id.'-'.$i.'" name="qty-'.$line->id.'-'.$i.'" value="'.$preselected.'"></td>';
 						if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
 							print '<td></td>';
 						}
@@ -945,6 +951,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 								print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'">';
 							}
 							print '</td>';
+							print '<td>';
+							if ($tmpproduct->status_batch) {
+								$type = 'batch';
+								print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$line->id.', \''.$type.'\', \'qtymissingconsume\')"');
+							}
+							print '</td>';
 						}
 						print '</tr>';
 					}

From be01e3b1aca44814fcd5f5f2ac1f755d547b6d25 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Jan 2022 14:48:18 +0100
Subject: [PATCH 30/82] Migration

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 6 +++---
 htdocs/install/mysql/migration/15.0.0-16.0.0.sql | 2 +-
 2 files changed, 4 insertions(+), 4 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 a9f1a669e52..517771ced4e 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
@@ -484,9 +484,9 @@ ALTER TABLE llx_delivery DROP FOREIGN KEY  fk_livraison_fk_user_author;
 ALTER TABLE llx_delivery DROP FOREIGN KEY  fk_livraison_fk_user_valid;
 
 -- add constraint
-ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_soc			FOREIGN KEY (fk_soc)			REFERENCES llx_societe (rowid);
-ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_user_author	FOREIGN KEY (fk_user_author)	REFERENCES llx_user (rowid);
-ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_user_valid	FOREIGN KEY (fk_user_valid)	REFERENCES llx_user (rowid);
+ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
+ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_user_author FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid);
+ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_user_valid FOREIGN KEY (fk_user_valid) REFERENCES llx_user (rowid);
 
 ALTER TABLE llx_deliverydet DROP FOREIGN KEY  fk_livraisondet_fk_livraison;
 ALTER TABLE llx_deliverydet DROP INDEX idx_livraisondet_fk_expedition;
diff --git a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
index 1ef84b065b9..93eecc6fa89 100644
--- a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
+++ b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
@@ -1,7 +1,7 @@
 --
 -- 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.
+-- when current version is 15.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

From c131bdcbd307301a70d28f165d62410216bf9071 Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Mon, 24 Jan 2022 16:06:02 +0100
Subject: [PATCH 31/82] NEW : Add hooks on salaries and sociales card

---
 htdocs/compta/sociales/card.php | 28 +++++++++++++++++++++++++---
 htdocs/salaries/card.php        | 20 +++++++++++++++++---
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 7454f61f6de..f0dd02eac80 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -56,6 +56,9 @@ $label = GETPOST('label', 'alpha');
 $actioncode = GETPOST('actioncode');
 $fk_user = GETPOST('userid', 'int');
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('propalcard', 'globalcard'));
+
 $object = new ChargeSociales($db);
 if ($id > 0) {
 	$object->fetch($id);
@@ -74,6 +77,12 @@ $result = restrictedArea($user, 'tax', $object->id, 'chargesociales', 'charges')
  * Actions
  */
 
+$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');
+}
+
 // Classify paid
 if ($action == 'confirm_paid' && $user->rights->tax->charges->creer && $confirm == 'yes') {
 	$object->fetch($id);
@@ -416,6 +425,8 @@ if ($id > 0) {
 	$object = new ChargeSociales($db);
 	$result = $object->fetch($id);
 
+	$formconfirm = '';
+	
 	if ($result > 0) {
 		$head = tax_prepare_head($object);
 
@@ -433,25 +444,36 @@ if ($id > 0) {
 				$formquestion[] = array('type' => 'date', 'name' => 'clone_period', 'label' => $langs->trans("PeriodEndDate"), 'value' => -1);
 			}
 
-			print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneTax', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 240);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneTax', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 240);
 		}
 
 
 		if ($action == 'paid') {
 			$text = $langs->trans('ConfirmPaySocialContribution');
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans('PaySocialContribution'), $text, "confirm_paid", '', '', 2);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans('PaySocialContribution'), $text, "confirm_paid", '', '', 2);
 		}
 
 		// Confirmation of the removal of the Social Contribution
 		if ($action == 'delete') {
 			$text = $langs->trans('ConfirmDeleteSocialContribution');
-			print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('DeleteSocialContribution'), $text, 'confirm_delete', '', '', 2);
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('DeleteSocialContribution'), $text, 'confirm_delete', '', '', 2);
 		}
 
 		if ($action == 'edit') {
 			print "<form name=\"charge\" action=\"".$_SERVER["PHP_SELF"]."?id=$object->id&amp;action=update\" method=\"post\">";
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 		}
+		// Call Hook formConfirm
+		$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
+		$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;
 
 		print dol_get_fiche_head($head, 'card', $langs->trans("SocialContribution"), -1, 'bill');
 
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index f5ebbcf0ec6..dc1a98209f4 100755
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -647,6 +647,7 @@ if ($action == 'create') {
 
 if ($id) {
 	$head = salaries_prepare_head($object);
+	$formconfirm = '';
 
 	if ($action === 'clone') {
 		$formquestion = array(
@@ -657,17 +658,17 @@ if ($id) {
 		$formquestion[] = array('type' => 'date', 'name' => 'clone_date_start', 'label' => $langs->trans("DateStart"), 'value' => -1);
 		$formquestion[] = array('type' => 'date', 'name' => 'clone_date_end', 'label' => $langs->trans("DateEnd"), 'value' => -1);
 
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneSalary', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 240);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneSalary', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 240);
 	}
 
 	if ($action == 'paid') {
 		$text = $langs->trans('ConfirmPaySalary');
-		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans('PaySalary'), $text, "confirm_paid", '', '', 2);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans('PaySalary'), $text, "confirm_paid", '', '', 2);
 	}
 
 	if ($action == 'delete') {
 		$text = $langs->trans('ConfirmDeleteSalary');
-		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('DeleteSalary'), $text, 'confirm_delete', '', '', 2);
+		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('DeleteSalary'), $text, 'confirm_delete', '', '', 2);
 	}
 
 	if ($action == 'edit') {
@@ -675,6 +676,19 @@ if ($id) {
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 	}
 
+	// 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;
+
+
 	print dol_get_fiche_head($head, 'card', $langs->trans("SalaryPayment"), -1, 'salary');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/salaries/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';

From 6cb97b1346fdbbebc08cf0ea477517d84d9171a4 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 24 Jan 2022 15:13:40 +0000
Subject: [PATCH 32/82] Fixing style errors.

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

diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index f0dd02eac80..d1ef5c1ea08 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -426,7 +426,7 @@ if ($id > 0) {
 	$result = $object->fetch($id);
 
 	$formconfirm = '';
-	
+
 	if ($result > 0) {
 		$head = tax_prepare_head($object);
 

From 0e8b7ef656eb8259757c38b87ba006cb5bc1379a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Jan 2022 16:38:25 +0100
Subject: [PATCH 33/82] Clean code

---
 htdocs/core/lib/sendings.lib.php          |  2 +-
 htdocs/core/tpl/commonfields_view.tpl.php | 48 +++++++++++++----------
 htdocs/delivery/card.php                  |  4 +-
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 0814c0f4825..e2ab74b8cfc 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -180,7 +180,7 @@ function delivery_prepare_head($object)
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->commande->dir_output."/".dol_sanitizeFileName($tmpobject->ref);
+	$upload_dir = $conf->expedition->dir_output."/sending/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 	$nbLinks = Link::count($db, $tmpobject->element, $tmpobject->id);
 	$head[$h][0] = DOL_URL_ROOT.'/expedition/document.php?id='.$tmpobject->id;
diff --git a/htdocs/core/tpl/commonfields_view.tpl.php b/htdocs/core/tpl/commonfields_view.tpl.php
index 29bf3943cea..42ead1573f4 100644
--- a/htdocs/core/tpl/commonfields_view.tpl.php
+++ b/htdocs/core/tpl/commonfields_view.tpl.php
@@ -110,11 +110,9 @@ print '</table>';
 
 // We close div and reopen for second column
 print '</div>';
-print '<div class="fichehalfright">';
 
-print '<div class="underbanner clearboth"></div>';
-print '<table class="border centpercent tableforfield">';
 
+$rightpart = '';
 $alreadyoutput = 1;
 foreach ($object->fields as $key => $val) {
 	if ($alreadyoutput) {
@@ -139,38 +137,46 @@ foreach ($object->fields as $key => $val) {
 
 	$value = $object->$key;
 
-	print '<tr><td';
-	print ' class="'.(empty($val['tdcss']) ? 'titlefield' : $val['tdcss']).'  fieldname_'.$key;
-	//if ($val['notnull'] > 0) print ' fieldrequired';		// No fieldrequired inthe view output
+	$rightpart .= '<tr><td';
+	$rightpart .= ' class="'.(empty($val['tdcss']) ? 'titlefield' : $val['tdcss']).'  fieldname_'.$key;
+	//if ($val['notnull'] > 0) $rightpart .= ' fieldrequired';		// No fieldrequired inthe view output
 	if ($val['type'] == 'text' || $val['type'] == 'html') {
-		print ' tdtop';
+		$rightpart .= ' tdtop';
 	}
-	print '">';
+	$rightpart.= '">';
 	if (!empty($val['help'])) {
-		print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
+		$rightpart .= $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
 	} else {
-		print $langs->trans($val['label']);
+		$rightpart .= $langs->trans($val['label']);
 	}
-	print '</td>';
-	print '<td class="valuefield fieldname_'.$key;
+	$rightpart .= '</td>';
+	$rightpart .= '<td class="valuefield fieldname_'.$key;
 	if ($val['type'] == 'text') {
-		print ' wordbreak';
+		$rightpart .= ' wordbreak';
 	}
 	if (!empty($val['cssview'])) {
-		print ' '.$val['cssview'];
+		$rightpart .= ' '.$val['cssview'];
 	}
-	print '">';
+	$rightpart .= '">';
 	if (in_array($val['type'], array('text', 'html'))) {
-		print '<div class="longmessagecut">';
+		$rightpart .= '<div class="longmessagecut">';
 	}
-	print $object->showOutputField($val, $key, $value, '', '', '', 0);
-	//print dol_escape_htmltag($object->$key, 1, 1);
+	$rightpart .= $object->showOutputField($val, $key, $value, '', '', '', 0);
+	//$rightpart .= dol_escape_htmltag($object->$key, 1, 1);
 	if (in_array($val['type'], array('text', 'html'))) {
-		print '</div>';
+		$rightpart .= '</div>';
 	}
-	print '</td>';
-	print '</tr>';
+	$rightpart .= '</td>';
+	$rightpart .= '</tr>';
 }
 
+
+print '<div class="fichehalfright">';
+print '<div class="underbanner clearboth"></div>';
+
+print '<table class="border centpercent tableforfield">';
+
+print $rightpart;
+
 ?>
 <!-- END PHP TEMPLATE commonfields_view.tpl.php -->
diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index 62955da7f06..00975946f6b 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -101,7 +101,7 @@ if ($action == 'add') {
 	$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 
 	if (!$conf->expedition_bon->enabled && !empty($conf->stock->enabled)) {
-		$expedition->entrepot_id = GETPOST('entrepot_id');
+		$expedition->entrepot_id = GETPOST('entrepot_id', 'int');
 	}
 
 	// We loop on each line of order to complete object delivery with qty to delivery
@@ -282,7 +282,7 @@ if ($action == 'create') {    // Create. Seems to no be used
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
 			print '<input type="hidden" name="ref" value="'.$object->ref.'">';
 
-			print dol_get_fiche_head($head, 'delivery', $langs->trans("Shipment"), -1, 'sending');
+			print dol_get_fiche_head($head, 'delivery', $langs->trans("Shipment"), -1, 'dolly');
 
 			/*
 			 * Confirmation de la suppression

From bb11ab992ba91d7250f1cf3faee1e0cbd3bf3d9a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Jan 2022 17:50:35 +0100
Subject: [PATCH 34/82] Trans

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

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 47daec0851b..1bf5233f660 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2216,4 +2216,5 @@ NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
 EachTerminalHasItsOwnCounter=Each terminal use its own counter.
-FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
\ No newline at end of file
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
\ No newline at end of file

From d56048387575db738e6945dbe33d59e09c851698 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Jan 2022 18:32:03 +0100
Subject: [PATCH 35/82] Fix permission from group not found

---
 htdocs/user/class/user.class.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 6345cac8b1a..71ed5f9a7e2 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1149,9 +1149,12 @@ class User extends CommonObject
 				$sql .= " AND r.entity = ".((int) $conf->entity);
 			}
 		} else {
-			$sql .= " AND gr.entity = ".((int) $conf->entity);
-			$sql .= " AND gu.entity = ".((int) $conf->entity);
-			$sql .= " AND r.entity = ".((int) $conf->entity);
+			$sql .= " AND gr.entity = ".((int) $conf->entity);	// Only groups created in current entity
+			// The entity on the table usergroup_user should be useless and shoumd never be used because it is alreay into gr and r.
+			// but when using MULTICOMPANY_TRANSVERSE_MODE, we may insert record that make rubbish result due to duplicate record of
+			// other entities, so we are forced to add a filter here
+			$sql .= " AND gu.entity IN (0,".$conf->entity.")";
+			$sql .= " AND r.entity = ".((int) $conf->entity);	// Only permission of modules enabled in current entity
 		}
 		$sql .= " AND gr.fk_usergroup = gu.fk_usergroup";
 		$sql .= " AND gu.fk_user = ".((int) $this->id);

From 9f377b7fe42977ecc0e3d5e1dc41b7536f972afb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 24 Jan 2022 23:58:16 +0100
Subject: [PATCH 36/82] Better responsive on small screen

---
 htdocs/compta/bank/bankentries_list.php | 53 +++++++++++++------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index c05f0f4530c..3d8e6f8bd98 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -1339,14 +1339,15 @@ if ($resql) {
 				$labeltoshow = $langs->trans($reg[1]);
 			} else {
 				if ($objp->label == '(payment_salary)') {
-					$labeltoshow = dol_trunc($langs->trans("SalaryPayment", 40));
+					$labeltoshow = $langs->trans("SalaryPayment");
 				} else {
 					$labeltoshow = dol_escape_htmltag($objp->label);
 					$titletoshow = $objp->label;
 				}
 			}
-			print '<td class="tdoverflowmax300"'.($titletoshow ? ' title="'.dol_escape_htmltag($titletoshow).'"' : '').'>';
-			print $labeltoshow;	// Already escaped
+
+
+			print '<td class="tdoverflowmax250"'.($titletoshow ? ' title="'.dol_escape_htmltag($titletoshow).'"' : '').'>';
 
 			// Add info about links after description
 			$cachebankaccount = array();
@@ -1355,70 +1356,70 @@ if ($resql) {
 				if ($links[$key]['type'] == 'withdraw') {
 					$banktransferstatic->id = $links[$key]['url_id'];
 					$banktransferstatic->ref = $links[$key]['label'];
-					print ' '.$banktransferstatic->getNomUrl(0);
+					print $banktransferstatic->getNomUrl(0).' ';
 				} elseif ($links[$key]['type'] == 'payment') {
 					$paymentstatic->id = $links[$key]['url_id'];
 					$paymentstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
 					$paymentstatic->date = $db->jdate($objp->do);
-					print ' '.$paymentstatic->getNomUrl(2);
+					print $paymentstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'payment_supplier') {
 					$paymentsupplierstatic->id = $links[$key]['url_id'];
 					$paymentsupplierstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
-					print ' '.$paymentsupplierstatic->getNomUrl(2);
+					print $paymentsupplierstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'payment_sc') {
 					$paymentscstatic->id = $links[$key]['url_id'];
 					$paymentscstatic->ref = $links[$key]['url_id'];
 					$paymentscstatic->label = $links[$key]['label'];
-					print ' '.$paymentscstatic->getNomUrl(2);
+					print $paymentscstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'payment_vat') {
 					$paymentvatstatic->id = $links[$key]['url_id'];
 					$paymentvatstatic->ref = $links[$key]['url_id'];
-					print ' '.$paymentvatstatic->getNomUrl(2);
+					print $paymentvatstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'payment_salary') {
 					$paymentsalstatic->id = $links[$key]['url_id'];
 					$paymentsalstatic->ref = $links[$key]['url_id'];
 					$paymentsalstatic->label = $links[$key]['label'];
-					print ' '.$paymentsalstatic->getNomUrl(2);
+					print $paymentsalstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'payment_loan') {
 					print '<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$links[$key]['url_id'].'">';
 					print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
-					print '</a>';
+					print '</a> ';
 				} elseif ($links[$key]['type'] == 'payment_donation') {
 					$paymentdonationstatic->id = $links[$key]['url_id'];
 					$paymentdonationstatic->ref = $links[$key]['url_id'];
-					print ' '.$paymentdonationstatic->getNomUrl(2);
+					print $paymentdonationstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'payment_expensereport') {
 					$paymentexpensereportstatic->id = $links[$key]['url_id'];
 					$paymentexpensereportstatic->ref = $links[$key]['url_id'];
-					print ' '.$paymentexpensereportstatic->getNomUrl(2);
+					print $paymentexpensereportstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'payment_various') {
 					$paymentvariousstatic->id = $links[$key]['url_id'];
 					$paymentvariousstatic->ref = $links[$key]['url_id'];
-					print ' '.$paymentvariousstatic->getNomUrl(2);
+					print $paymentvariousstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'banktransfert') {
 					// Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail.
 					if ($objp->amount > 0) {
 						$banklinestatic->fetch($links[$key]['url_id']);
 						$bankstatic->id = $banklinestatic->fk_account;
 						$bankstatic->label = $banklinestatic->bank_account_ref;
-						print ' ('.$langs->trans("TransferFrom").' ';
+						print $langs->trans("TransferFrom").' ';
 						print $bankstatic->getNomUrl(1, 'transactions');
 						print ' '.$langs->trans("toward").' ';
 						$bankstatic->id = $objp->bankid;
 						$bankstatic->label = $objp->bankref;
 						print $bankstatic->getNomUrl(1, '');
-						print ')';
+						print ' - ';
 					} else {
 						$bankstatic->id = $objp->bankid;
 						$bankstatic->label = $objp->bankref;
-						print ' ('.$langs->trans("TransferFrom").' ';
+						print $langs->trans("TransferFrom").' ';
 						print $bankstatic->getNomUrl(1, '');
 						print ' '.$langs->trans("toward").' ';
 						$banklinestatic->fetch($links[$key]['url_id']);
 						$bankstatic->id = $banklinestatic->fk_account;
 						$bankstatic->label = $banklinestatic->bank_account_ref;
 						print $bankstatic->getNomUrl(1, 'transactions');
-						print ')';
+						print ' - ';
 					}
 					//var_dump($links);
 				} elseif ($links[$key]['type'] == 'company') {
@@ -1430,22 +1431,22 @@ if ($resql) {
 					// Information is already shown using the payment_salary link. No need of this link.
 				} else {
 					// Show link with label $links[$key]['label']
-					if (!empty($objp->label) && !empty($links[$key]['label'])) {
-						print ' - ';
-					}
 					print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
 					if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
 						// Label generique car entre parentheses. On l'affiche en le traduisant
 						if ($reg[1] == 'paiement') {
 							$reg[1] = 'Payment';
 						}
-						print ' '.$langs->trans($reg[1]);
+						print $langs->trans($reg[1]);
 					} else {
-						print ' '.$links[$key]['label'];
+						print $links[$key]['label'];
 					}
-					print '</a>';
+					print '</a>'.($labeltoshow ? ' - ' : '');
 				}
 			}
+
+			print $labeltoshow;	// Already escaped
+
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -1488,7 +1489,7 @@ if ($resql) {
 
 		// Payment type
 		if (!empty($arrayfields['type']['checked'])) {
-			print '<td align="center" class="nowrap">';
+			print '<td class="tdoverflowmax100 center">';
 			$labeltype = ($langs->trans("PaymentTypeShort".$objp->fk_type) != "PaymentTypeShort".$objp->fk_type) ? $langs->trans("PaymentTypeShort".$objp->fk_type) : $langs->getLabelFromKey($db, $objp->fk_type, 'c_paiement', 'code', 'libelle', '', 1);
 			if ($labeltype == 'SOLD') {
 				print '&nbsp;'; //$langs->trans("InitialBankBalance");
@@ -1514,9 +1515,9 @@ if ($resql) {
 			print '<td class="tdoverflowmax150">';
 
 			$companylinked_id = 0;
-				$userlinked_id = 0;
+			$userlinked_id = 0;
 
-				//payment line type to define user display and user or company linked
+			//payment line type to define user display and user or company linked
 			foreach ($links as $key => $value) {
 				if ($links[$key]['type'] == 'payment_sc') {
 					$type_link = 'payment_sc';

From 19dcc95d6f3d7b289de44bd49df70a01109345c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 24 Jan 2022 23:58:31 +0100
Subject: [PATCH 37/82] Fix tooltip for payment

---
 .../class/paymentexpensereport.class.php              | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 48adeab929d..3aac0cee2b8 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -635,7 +635,16 @@ class PaymentExpenseReport extends CommonObject
 		if (empty($this->ref)) {
 			$this->ref = $this->label;
 		}
-		$label = $langs->trans("ShowPayment").': '.$this->ref;
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Payment").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		if (!empty($this->ref)) {
+			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		}
+		if (!empty($this->datep)) {
+			$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->datep, 'dayhour');
+		}
 
 		if (!empty($this->id)) {
 			$link = '<a href="'.DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';

From b64856807ba381a57f35e895c774b69837a2028b Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 25 Jan 2022 00:09:41 +0100
Subject: [PATCH 38/82] Update llx_c_action_trigger.sql

---
 .../mysql/data/llx_c_action_trigger.sql       | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index 258b56f1471..119a4215f56 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -9,6 +9,7 @@
 -- Copyright (C) 2013       Cedric Gross            <c.gross@kreiz-it.fr>
 -- Copyright (C) 2014       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
 -- Copyright (C) 2015       Bahfir Abbes            <bafbes@gmail.com>
+-- Copyright (C) 2022       Anthony Berton          <anthony.berton@bb2a.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
@@ -39,6 +40,7 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('COMPANY_DELETE','Third party deleted','Executed when you delete third party','societe',1);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_MODIFY','Customer proposal modified','Executed when a customer proposal is modified','propal',2);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_SENTBYMAIL','Commercial proposal sent by mail','Executed when a commercial proposal is sent by mail','propal',3);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',2);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',2);
@@ -46,17 +48,20 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_DELETE','Customer proposal deleted','Executed when a customer proposal is deleted','propal',2);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_VALIDATE','Customer order validate','Executed when a customer order is validated','commande',4);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_CLOSE','Customer order classify delivered','Executed when a customer order is set delivered','commande',5);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_MODIFY','Customer order modified','Executed when a customer order is set modified','commande',5);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_CLASSIFY_BILLED','Customer order classify billed','Executed when a customer order is set to billed','commande',5);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_CANCEL','Customer order canceled','Executed when a customer order is canceled','commande',5);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SENTBYMAIL','Customer order sent by mail','Executed when a customer order is sent by mail ','commande',5);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_DELETE','Customer order deleted','Executed when a customer order is deleted','commande',5);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_MODIFY','Customer invoice modified','Executed when a customer invoice is modified','facture',7);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',9);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_DELETE','Customer invoice deleted','Executed when a customer invoice is deleted','facture',9);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_VALIDATE','Price request validated','Executed when a commercial proposal is validated','proposal_supplier',10);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_MODIFY','Price request modified','Executed when a commercial proposal is modified','proposal_supplier',10);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_SENTBYMAIL','Price request sent by mail','Executed when a commercial proposal is sent by mail','proposal_supplier',10);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_CLOSE_SIGNED','Price request closed signed','Executed when a customer proposal is closed signed','proposal_supplier',10);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_CLOSE_REFUSED','Price request closed refused','Executed when a customer proposal is closed refused','proposal_supplier',10);
@@ -64,6 +69,7 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 --insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_CREATE','Supplier order created','Executed when a supplier order is created','order_supplier',11);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',12);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',13);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_MODIFY','Supplier order request modified','Executed when a supplier order is modified','order_supplier',13);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_SUBMIT','Supplier order request submited','Executed when a supplier order is approved','order_supplier',13);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_RECEIVE','Supplier order request received','Executed when a supplier order is received','order_supplier',13);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13);
@@ -72,20 +78,24 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_CLASSIFY_BILLED','Supplier order set billed','Executed when a supplier order is set as billed','order_supplier',14);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_DELETE','Supplier order deleted','Executed when a supplier order is deleted','order_supplier',14);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',15);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_MODIFY','Supplier invoice modified','Executed when a supplier invoice is modified','invoice_supplier',15);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_UNVALIDATE','Supplier invoice unvalidated','Executed when a supplier invoice status is set back to draft','invoice_supplier',15);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',16);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',17);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',17);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_DELETE','Supplier invoice deleted','Executed when a supplier invoice is deleted','invoice_supplier',17);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_MODIFY','Contract modified','Executed when a contract is modified','contrat',18);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_SENTBYMAIL','Contract sent by mail','Executed when a contract is sent by mail','contrat',18);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_DELETE','Contract deleted','Executed when a contract is deleted','contrat',18);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_MODIFY','Shipping modified','Executed when a shipping is modified','shipping',20);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_DELETE','Shipping sent is deleted','Executed when a shipping is deleted','shipping',21);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECEPTION_VALIDATE','Reception validated','Executed when a reception is validated','reception',22);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECEPTION_SENTBYMAIL','Reception sent by mail','Executed when a reception is sent by mail','reception',22);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_MODIFY','Member modified','Executed when a member is modified','member',23);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_SENTBYMAIL','Mails sent from member card','Executed when you send email from member card','member',23);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_SUBSCRIPTION_CREATE','Member subscribtion recorded','Executed when a member subscribtion is deleted','member',24);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_SUBSCRIPTION_MODIFY','Member subscribtion modified','Executed when a member subscribtion is modified','member',24);
@@ -94,21 +104,27 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',26);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_EXCLUDE','Member excluded','Executed when a member is excluded','member',27);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',30);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_MODIFY','Intervention modify','Executed when a intervention is modify','ficheinter',30);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',32);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',33);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',34);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',35);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_DELETE','Intervention is deleted','Executed when a intervention is deleted','ficheinter',35);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',40);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',41);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_DELETE','Product or service deleted','Executed when a product or sevice is deleted','product',42);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expensereport',201);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',202);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',202);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',203);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_PAID','Expense report billed','Executed when an expense report is set as billed','expensereport',204);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_DELETE','Expense report deleted','Executed when an expense report is deleted','expensereport',205);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',211);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',212);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',212);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_CREATE','Project creation','Executed when a project is created','project',140);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_VALIDATE','Project validation','Executed when a project is validated','project',141);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_MODIFY','Project modified','Executed when a project is modified','project',142);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_DELETE','Project deleted','Executed when a project is deleted','project',143);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TICKET_CREATE','Ticket created','Executed when a ticket is created','ticket',161);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TICKET_MODIFY','Ticket modified','Executed when a ticket is modified','ticket',163);
@@ -122,11 +138,7 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_DELETE','User update','Executed when a user is deleted','user',303);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_NEW_PASSWORD','User update','Executed when a user is change password','user',304);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_ENABLEDISABLE','User update','Executed when a user is enable or disable','user',305);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',41);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_MODIFY','Member modified','Executed when a member is modified','member',23);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_MODIFY','Intervention modified','Executed when a intervention is modified','ficheinter',19);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_CREATE','Project creation','Executed when a project is created','project',140);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_MODIFY','Project modified','Executed when a project is modified','project',142);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BOM_VALIDATE','BOM validated','Executed when a BOM is validated','bom',650);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BOM_UNVALIDATE','BOM unvalidated','Executed when a BOM is unvalidated','bom',651);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BOM_CLOSE','BOM disabled','Executed when a BOM is disabled','bom',652);
@@ -140,7 +152,6 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_MODIFY','Contact address update','Executed when a contact is updated','contact',51);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact address record','contact',52);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',53);
-
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTJOBPOSITION_CREATE','Job created','Executed when a job is created','recruitment',7500);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTJOBPOSITION_MODIFY','Job modified','Executed when a job is modified','recruitment',7502);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTJOBPOSITION_SENTBYMAIL','Mails sent from job record','Executed when you send email from job record','recruitment',7504);

From 1bd86e4bae73e93f85b3870b1333a2166b59ad55 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 25 Jan 2022 00:11:04 +0100
Subject: [PATCH 39/82] Update 14.0.0-15.0.0.sql

---
 htdocs/install/mysql/migration/14.0.0-15.0.0.sql | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index f383c706653..f1921a41e77 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -494,3 +494,15 @@ INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) value
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_DELETE','User update','Executed when a user is deleted','user',303);
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_NEW_PASSWORD','User update','Executed when a user is change password','user',304);
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_ENABLEDISABLE','User update','Executed when a user is enable or disable','user',305);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_MODIFY','Customer proposal modified','Executed when a customer proposal is modified','propal',2);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_MODIFY','Customer order modified','Executed when a customer order is set modified','commande',5);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_MODIFY','Customer invoice modified','Executed when a customer invoice is modified','facture',7);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_MODIFY','Price request modified','Executed when a commercial proposal is modified','proposal_supplier',10);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_MODIFY','Supplier order request modified','Executed when a supplier order is modified','order_supplier',13);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_MODIFY','Supplier invoice modified','Executed when a supplier invoice is modified','invoice_supplier',15);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_MODIFY','Contract modified','Executed when a contract is modified','contrat',18);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_MODIFY','Shipping modified','Executed when a shipping is modified','shipping',20);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_MODIFY','Intervention modify','Executed when a intervention is modify','ficheinter',30);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',41);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',202);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',212);

From 1d265d801a3229723e1c34b813dbde980bd6f895 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 25 Jan 2022 00:19:09 +0100
Subject: [PATCH 40/82] Update 14.0.0-15.0.0.sql

---
 htdocs/install/mysql/migration/14.0.0-15.0.0.sql | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index f1921a41e77..f383c706653 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -494,15 +494,3 @@ INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) value
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_DELETE','User update','Executed when a user is deleted','user',303);
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_NEW_PASSWORD','User update','Executed when a user is change password','user',304);
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_ENABLEDISABLE','User update','Executed when a user is enable or disable','user',305);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_MODIFY','Customer proposal modified','Executed when a customer proposal is modified','propal',2);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_MODIFY','Customer order modified','Executed when a customer order is set modified','commande',5);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_MODIFY','Customer invoice modified','Executed when a customer invoice is modified','facture',7);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_MODIFY','Price request modified','Executed when a commercial proposal is modified','proposal_supplier',10);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_MODIFY','Supplier order request modified','Executed when a supplier order is modified','order_supplier',13);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_MODIFY','Supplier invoice modified','Executed when a supplier invoice is modified','invoice_supplier',15);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_MODIFY','Contract modified','Executed when a contract is modified','contrat',18);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_MODIFY','Shipping modified','Executed when a shipping is modified','shipping',20);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_MODIFY','Intervention modify','Executed when a intervention is modify','ficheinter',30);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',41);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',202);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',212);

From 13dbadf7702cb708b539e414113356d7b7241295 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 25 Jan 2022 00:19:41 +0100
Subject: [PATCH 41/82] Update 15.0.0-16.0.0.sql

---
 htdocs/install/mysql/migration/15.0.0-16.0.0.sql | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
index 93eecc6fa89..a6be50a91a7 100644
--- a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
+++ b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
@@ -39,3 +39,17 @@ UPDATE llx_rights_def SET perms = 'writeall' WHERE perms = 'writeall_advance' AN
 -- v16
 
 ALTER TABLE llx_projet_task_time ADD COLUMN fk_product integer NULL;
+
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_MODIFY','Customer proposal modified','Executed when a customer proposal is modified','propal',2);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_MODIFY','Customer order modified','Executed when a customer order is set modified','commande',5);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_MODIFY','Customer invoice modified','Executed when a customer invoice is modified','facture',7);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_MODIFY','Price request modified','Executed when a commercial proposal is modified','proposal_supplier',10);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_MODIFY','Supplier order request modified','Executed when a supplier order is modified','order_supplier',13);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_MODIFY','Supplier invoice modified','Executed when a supplier invoice is modified','invoice_supplier',15);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_MODIFY','Contract modified','Executed when a contract is modified','contrat',18);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_MODIFY','Shipping modified','Executed when a shipping is modified','shipping',20);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_MODIFY','Intervention modify','Executed when a intervention is modify','ficheinter',30);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',41);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',202);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',212);
+

From a1f676eb8cac354d7621f291acca15cd7604be82 Mon Sep 17 00:00:00 2001
From: Je2fb <46494485+Je2fb@users.noreply.github.com>
Date: Tue, 25 Jan 2022 09:07:53 +0100
Subject: [PATCH 42/82] Add new expression in Dynamic Price

Add the expression supplier_min_price_with_discount for select the buy price.
---
 htdocs/product/dynamic_price/class/price_parser.class.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/dynamic_price/class/price_parser.class.php b/htdocs/product/dynamic_price/class/price_parser.class.php
index 3d28f4b6011..8a1bb68a157 100644
--- a/htdocs/product/dynamic_price/class/price_parser.class.php
+++ b/htdocs/product/dynamic_price/class/price_parser.class.php
@@ -263,13 +263,16 @@ class PriceParser
 			return -1;
 		} elseif ($res == 0) {
 			$supplier_min_price = 0;
+        	$supplier_min_price_with_discount = 0;
 		} else {
 			 $supplier_min_price = $productFournisseur->fourn_unitprice;
+			 $supplier_min_price_with_discount = $productFournisseur->fourn_unitprice_with_discount;
 		}
 
 		//Accessible values by expressions
 		$extra_values = array_merge($extra_values, array(
 			"supplier_min_price" => $supplier_min_price,
+			"supplier_min_price_with_discount" => $supplier_min_price_with_discount,
 		));
 
 		//Parse the expression and return the price, if not error occurred check if price is higher than min
@@ -329,12 +332,13 @@ class PriceParser
 		//Values for product expressions
 		$extra_values = array_merge($extra_values, array(
 			"supplier_min_price" => 1,
+			"supplier_min_price_with_discount" => 2,
 		));
 
 		//Values for supplier product expressions
 		$extra_values = array_merge($extra_values, array(
-			"supplier_quantity" => 2,
-			"supplier_tva_tx" => 3,
+			"supplier_quantity" => 3,
+			"supplier_tva_tx" => 4,
 		));
 		return $this->parseExpression($product, $expression, $extra_values);
 	}

From d1dd70f9cca12b6fbc6e160b726f8cfb9649acf1 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 25 Jan 2022 08:10:58 +0000
Subject: [PATCH 43/82] Fixing style errors.

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

diff --git a/htdocs/product/dynamic_price/class/price_parser.class.php b/htdocs/product/dynamic_price/class/price_parser.class.php
index 8a1bb68a157..9bd986a3c73 100644
--- a/htdocs/product/dynamic_price/class/price_parser.class.php
+++ b/htdocs/product/dynamic_price/class/price_parser.class.php
@@ -263,7 +263,7 @@ class PriceParser
 			return -1;
 		} elseif ($res == 0) {
 			$supplier_min_price = 0;
-        	$supplier_min_price_with_discount = 0;
+			$supplier_min_price_with_discount = 0;
 		} else {
 			 $supplier_min_price = $productFournisseur->fourn_unitprice;
 			 $supplier_min_price_with_discount = $productFournisseur->fourn_unitprice_with_discount;

From 15346d1c4acafb7576914b4b48df2e73ba233fef Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Tue, 25 Jan 2022 09:17:30 +0100
Subject: [PATCH 44/82] getTasksArray() fetch_optionals to populate ExtraFields

---
 htdocs/projet/class/task.class.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index d0b27caf326..87a66279714 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -800,9 +800,10 @@ class Task extends CommonObject
 	 * @param	array	$extrafields	    Show additional column from project or task
 	 * @param   int     $includebilltime    Calculate also the time to bill and billed
 	 * @param   array   $search_array_options Array of search
+	 * @param   int     $loadextras         Fetch all Extrafields on each task
 	 * @return 	array						Array of tasks
 	 */
-	public function getTasksArray($usert = null, $userp = null, $projectid = 0, $socid = 0, $mode = 0, $filteronproj = '', $filteronprojstatus = '-1', $morewherefilter = '', $filteronprojuser = 0, $filterontaskuser = 0, $extrafields = array(), $includebilltime = 0, $search_array_options = array())
+	public function getTasksArray($usert = null, $userp = null, $projectid = 0, $socid = 0, $mode = 0, $filteronproj = '', $filteronprojstatus = '-1', $morewherefilter = '', $filteronprojuser = 0, $filterontaskuser = 0, $extrafields = array(), $includebilltime = 0, $search_array_options = array(), $loadextras = 0)
 	{
 		global $conf, $hookmanager;
 
@@ -1022,6 +1023,10 @@ class Task extends CommonObject
 							}
 						}
 					}
+
+					if ($loadextras) {
+						$tasks[$i]->fetch_optionals();
+					}
 				}
 
 				$i++;

From 76b0dee58a8fce97e1ebfcdbbdcfe6e23eb8d51c Mon Sep 17 00:00:00 2001
From: Thomas Negre <tnegre@open-dsi.fr>
Date: Tue, 25 Jan 2022 09:59:49 +0100
Subject: [PATCH 45/82] Fix ticket module : security check would prevent
 automatic fill of thirdparty fields when creating a ticket from thirdparty
 card.

---
 htdocs/ticket/agenda.php    | 1 -
 htdocs/ticket/card.php      | 1 -
 htdocs/ticket/contact.php   | 1 -
 htdocs/ticket/messaging.php | 1 -
 4 files changed, 4 deletions(-)

diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index 66cbe8e7290..9a4af31014a 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -80,7 +80,6 @@ if (!$action) {
 
 // Security check
 $id = GETPOST("id", 'int');
-$socid = 0;
 if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $id, '');
 
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 0af211d8a5c..690bcb5cad2 100755
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -115,7 +115,6 @@ if ($id || $track_id || $ref) {
 $url_page_current = DOL_URL_ROOT.'/ticket/card.php';
 
 // Security check - Protection if external user
-$socid = 0;
 if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $object->id);
 
diff --git a/htdocs/ticket/contact.php b/htdocs/ticket/contact.php
index d31469f13f2..093aaf5de1e 100644
--- a/htdocs/ticket/contact.php
+++ b/htdocs/ticket/contact.php
@@ -61,7 +61,6 @@ $permissiontoadd = $user->rights->ticket->write;
 
 // Security check
 $id = GETPOST("id", 'int');
-$socid = 0;
 if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $object->id, '');
 
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index 61291836cdb..292fff329ad 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -80,7 +80,6 @@ $permissiontoadd = $user->rights->ticket->write;
 
 // Security check
 $id = GETPOST("id", 'int');
-$socid = 0;
 if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $object->id, '');
 

From 54e5b5d369f88f8ef505dee41e0e05cd3647e1b3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Jan 2022 13:40:22 +0100
Subject: [PATCH 46/82] Fix reponsive

---
 htdocs/core/boxes/box_produits_alerte_stock.php | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 14862f3cf43..e074cb76198 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -163,7 +163,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'td' => 'class="tdoverflowmax100 maxwidth150onsmartphone"',
 						'text' => $objp->label,
 					);
 
@@ -186,18 +186,13 @@ class box_produits_alerte_stock extends ModeleBoxes
 						}
 					}
 
-					$this->info_box_contents[$line][] = array(
+					/*$this->info_box_contents[$line][] = array(
 						'td' => 'class="nowraponall right amount"',
-						'text' => $price,
-					);
+						'text' => $price.' '.$price_base_type,
+					);*/
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
-						'text' => $price_base_type,
-					);
-
-					$this->info_box_contents[$line][] = array(
-						'td' => 'class="center"',
+						'td' => 'class="center nowraponall"',
 						'text' => price2num($objp->total_stock, 'MS').' / '.$objp->seuil_stock_alerte,
 						'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)),
 					);

From bab35fd97d7492c77ed772cd224775cd50ebc419 Mon Sep 17 00:00:00 2001
From: Thomas Negre <tnegre@open-dsi.fr>
Date: Tue, 25 Jan 2022 09:59:49 +0100
Subject: [PATCH 47/82] Fix ticket module : security check would prevent
 automatic fill of thirdparty fields when creating a ticket from thirdparty
 card.

---
 htdocs/ticket/agenda.php    | 1 -
 htdocs/ticket/card.php      | 1 -
 htdocs/ticket/contact.php   | 1 -
 htdocs/ticket/messaging.php | 1 -
 4 files changed, 4 deletions(-)

diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index 66cbe8e7290..9a4af31014a 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -80,7 +80,6 @@ if (!$action) {
 
 // Security check
 $id = GETPOST("id", 'int');
-$socid = 0;
 if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $id, '');
 
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index cf665e8a470..7decdeadd7b 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -115,7 +115,6 @@ if ($id || $track_id || $ref) {
 $url_page_current = DOL_URL_ROOT.'/ticket/card.php';
 
 // Security check - Protection if external user
-$socid = 0;
 if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $object->id);
 
diff --git a/htdocs/ticket/contact.php b/htdocs/ticket/contact.php
index d31469f13f2..093aaf5de1e 100644
--- a/htdocs/ticket/contact.php
+++ b/htdocs/ticket/contact.php
@@ -61,7 +61,6 @@ $permissiontoadd = $user->rights->ticket->write;
 
 // Security check
 $id = GETPOST("id", 'int');
-$socid = 0;
 if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $object->id, '');
 
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index 61291836cdb..292fff329ad 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -80,7 +80,6 @@ $permissiontoadd = $user->rights->ticket->write;
 
 // Security check
 $id = GETPOST("id", 'int');
-$socid = 0;
 if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $object->id, '');
 

From 37338f9a6025b4f0a2f671f3dbcb6f217bf9e1c6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Jan 2022 14:03:29 +0100
Subject: [PATCH 48/82] Update card.php

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

diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index d1ef5c1ea08..888d3c77d6c 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -57,7 +57,7 @@ $actioncode = GETPOST('actioncode');
 $fk_user = GETPOST('userid', 'int');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('propalcard', 'globalcard'));
+$hookmanager->initHooks(array('taxcard', 'globalcard'));
 
 $object = new ChargeSociales($db);
 if ($id > 0) {

From ecc4a7c1ae899ff5a5d2d683fc569430c92deadd Mon Sep 17 00:00:00 2001
From: Markusi13 <Markusi13@users.noreply.github.com>
Date: Tue, 25 Jan 2022 14:55:34 +0100
Subject: [PATCH 49/82] Updated the old issue form to the new yml format

---
 .github/ISSUE_TEMPLATE/bug_report.md  | 35 ------------
 .github/ISSUE_TEMPLATE/bug_report.yml | 81 +++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 35 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 432f30f2332..00000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-name: Bug report
-about: Create a report to help us fix something that is broken
-title: ''
-labels: Bug
-assignees: ''
-
----
-
-# Instructions
-*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
-*Please:*
-- *replace the bracket enclosed texts with meaningful information*
-- *remove any unused sub-section*
-
-
-# Bug
-[*Short description*]
-
-## Environment
-- **Version**: [*Affected Dolibarr version(s)*]
-- **OS**: [*Server OS type and version*]
-- **Web server**: [*Webserver type and version*]
-- **PHP**: [*PHP version*]
-- **Database**: [*Database type and version*]
-- **URL(s)**: [*Affected URL(s)*]
-
-## Expected and actual behavior
-[*Verbose description*]
-
-## Steps to reproduce the behavior
-[*Verbose description*]
-
-## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)
-[*Files*]
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 00000000000..23948ad189c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,81 @@
+name: Bug report
+description: Create a report to help us fix something that is broken
+title: ''
+labels: ["Bug"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.
+        
+  - type: textarea
+    id: bug
+    attributes:
+      label: Bug
+      description: Please give a short description of the bug
+    validations:
+      required: true
+
+  - type: input
+    id: environmentversion
+    attributes:
+      label: Environment Version
+      description: Affected Dolibarr version(s)
+
+  - type: input
+    id: environmentos
+    attributes:
+      label: Environment OS
+      description: Server OS type and version
+      
+  - type: input
+    id: environmentwebserver
+    attributes:
+      label: Environment Web server
+      description: Webserver type and version
+      
+  - type: input
+    id: environmentphp
+    attributes:
+      label: Environment PHP
+      description: PHP version
+      
+  - type: input
+    id: environmentdatabase
+    attributes:
+      label: Environment Database
+      description: Database type and version
+
+  - type: input
+    id: environmenturls
+    attributes:
+      label: Environment URL(s)
+      description: Affected URL(s)
+
+  - type: textarea
+    id: expectedbehaviour
+    attributes:
+      label: Expected and actual behavior
+      description: Verbose description
+
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Steps to reproduce the behavior
+      description: Verbose description
+      
+  - type: textarea
+    id: files
+    attributes:
+      label: Attached files
+      description: Screenshots, screencasts, dolibarr.log, debugging informations
+      
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CODE_OF_CONDUCT.md)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true

From 7efa219e33e4aa6b17c6bcbaee916c688002167b Mon Sep 17 00:00:00 2001
From: Markusi13 <Markusi13@users.noreply.github.com>
Date: Tue, 25 Jan 2022 14:55:52 +0100
Subject: [PATCH 50/82] Update bug_report.yml

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 23948ad189c..2459458dc90 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,6 @@
 name: Bug report
 description: Create a report to help us fix something that is broken
-title: ''
+title:
 labels: ["Bug"]
 
 body:

From 688e74aad877bdcb9966acd4a73083c20db093a0 Mon Sep 17 00:00:00 2001
From: Markusi13 <Markusi13@users.noreply.github.com>
Date: Tue, 25 Jan 2022 14:56:01 +0100
Subject: [PATCH 51/82] Update bug_report.yml

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 2459458dc90..b215dc62f9c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,5 @@
 name: Bug report
 description: Create a report to help us fix something that is broken
-title:
 labels: ["Bug"]
 
 body:

From b7b88865e6ffe25997b7c74c61499676809f2bca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Jan 2022 14:58:00 +0100
Subject: [PATCH 52/82] Update card_presend.tpl.php

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

diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index ff107a0dea3..83f96c1bcb1 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -124,27 +124,25 @@ if ($action == 'presend') {
 
 	if ($object->element === 'facture' && !empty($conf->global->INVOICE_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->INVOICE_EMAIL_SENDER;
-		(!empty($conf->global->INVOICE_EMAIL_SENDER_NAME) ? $formmail->fromname = $conf->global->INVOICE_EMAIL_SENDER_NAME : $formmail->fromname = '');
+		$formmail->fromname = (!empty($conf->global->INVOICE_EMAIL_SENDER_NAME) ? $conf->global->INVOICE_EMAIL_SENDER_NAME : '');
 		$formmail->fromtype = 'special';
 	}
 	if ($object->element === 'shipping' && !empty($conf->global->SHIPPING_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->SHIPPING_EMAIL_SENDER;
-		(!empty($conf->global->SHIPPING_EMAIL_SENDER_NAME) ? $formmail->fromname = $conf->global->SHIPPING_EMAIL_SENDER_NAME : $formmail->fromname = '');
+		$formmail->fromname = (!empty($conf->global->SHIPPING_EMAIL_SENDER_NAME) ? $conf->global->SHIPPING_EMAIL_SENDER_NAME : '');
 		$formmail->fromtype = 'special';
 	}
 	if ($object->element === 'commande' && !empty($conf->global->COMMANDE_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->COMMANDE_EMAIL_SENDER;
-		(!empty($conf->global->COMMANDE_EMAIL_SENDER_NAME) ? $formmail->fromname = $conf->global->COMMANDE_EMAIL_SENDER_NAME : $formmail->fromname = '');
+		$formmail->fromname = (!empty($conf->global->COMMANDE_EMAIL_SENDER_NAME) ? $conf->global->COMMANDE_EMAIL_SENDER_NAME : '');
 		$formmail->fromtype = 'special';
 	}
 	if ($object->element === 'order_supplier' && !empty($conf->global->ORDER_SUPPLIER_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->ORDER_SUPPLIER_EMAIL_SENDER;
-		(!empty($conf->global->ORDER_SUPPLIER_EMAIL_SENDER_NAME) ? $formmail->fromname = $conf->global->ORDER_SUPPLIER_EMAIL_SENDER_NAME : $formmail->fromname = '');
+		$formmail->fromname = (!empty($conf->global->ORDER_SUPPLIER_EMAIL_SENDER_NAME) ? $conf->global->ORDER_SUPPLIER_EMAIL_SENDER_NAME : '');
 		$formmail->fromtype = 'special';
 	}
 
-
-
 	$formmail->trackid = $trackid;
 	$formmail->withfrom = 1;
 

From ea6dfb172c4f94c8afe9ed6c74d82e34f7682e5e Mon Sep 17 00:00:00 2001
From: Markusi13 <Markusi13@users.noreply.github.com>
Date: Tue, 25 Jan 2022 15:01:29 +0100
Subject: [PATCH 53/82] Update the feature request template to the new yml
 format

---
 .github/ISSUE_TEMPLATE/feature_request.md  | 27 -------------
 .github/ISSUE_TEMPLATE/feature_request.yml | 44 ++++++++++++++++++++++
 2 files changed, 44 insertions(+), 27 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 32e2deff2c1..00000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-name: Feature request
-about: Suggest a new idea for this project
-title: ''
-labels: Feature request
-assignees: ''
-
----
-
-# Instructions
-*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
-*Please:*
-- *replace the bracket enclosed texts with meaningful information*
-- *remove any unused sub-section*
-
-
-# Feature Request
-[*Short description*]
-
-## Use case
-[*Verbose description*]
-
-## Suggested implementation
-[*Verbose description*]
-
-## Suggested steps
-[*List of tasks to achieve goal*]
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 00000000000..f4975622a8f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,44 @@
+name: Feature request
+description: Suggest a new idea for this project
+labels: ["Feature request"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.
+
+  - type: textarea
+    id: feature-request
+    attributes:
+      label: Feature Request
+      description: Short description
+    validations:
+      required: true
+
+  - type: textarea
+    id: use-case
+    attributes:
+      label: Use case
+      description: Verbose description
+      
+  - type: textarea
+    id: suggested-implementation
+    attributes:
+      label: Suggested implementation
+      description: Verbose description
+
+  - type: textarea
+    id: suggested-steps
+    attributes:
+      label: Suggested steps
+      description: List of tasks to achieve goal
+      
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CODE_OF_CONDUCT.md)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true

From 4ab28b10ea0f4556cb4413fa674523433516e0f3 Mon Sep 17 00:00:00 2001
From: Markusi13 <Markusi13@users.noreply.github.com>
Date: Tue, 25 Jan 2022 15:02:11 +0100
Subject: [PATCH 54/82] Update bug_report.yml

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index b215dc62f9c..7e7a62c1e84 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -17,43 +17,43 @@ body:
       required: true
 
   - type: input
-    id: environmentversion
+    id: environment-version
     attributes:
       label: Environment Version
       description: Affected Dolibarr version(s)
 
   - type: input
-    id: environmentos
+    id: environment-os
     attributes:
       label: Environment OS
       description: Server OS type and version
       
   - type: input
-    id: environmentwebserver
+    id: environment-webserver
     attributes:
       label: Environment Web server
       description: Webserver type and version
       
   - type: input
-    id: environmentphp
+    id: environment-php
     attributes:
       label: Environment PHP
       description: PHP version
       
   - type: input
-    id: environmentdatabase
+    id: environment-database
     attributes:
       label: Environment Database
       description: Database type and version
 
   - type: input
-    id: environmenturls
+    id: environment-urls
     attributes:
       label: Environment URL(s)
       description: Affected URL(s)
 
   - type: textarea
-    id: expectedbehaviour
+    id: expected-behaviour
     attributes:
       label: Expected and actual behavior
       description: Verbose description

From 0126be54a330c0cf1830146404fa69289968889b Mon Sep 17 00:00:00 2001
From: Thomas Negre <tnegre@open-dsi.fr>
Date: Tue, 25 Jan 2022 15:12:32 +0100
Subject: [PATCH 55/82] fix ticket : an external user should be able to access
 only its own company tickets.

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

diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index e4ba75b84c5..44b9edf358e 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -157,6 +157,8 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 if (!$user->rights->ticket->read) {
 	accessforbidden();
 }
+// restrict view to current user's company
+if ($user->socid > 0) $socid = $user->socid;
 
 // Store current page url
 $url_page_current = DOL_URL_ROOT.'/ticket/list.php';

From 6677eccf45e01f334f84fc51449d4e96fb97ce05 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Jan 2022 16:01:50 +0100
Subject: [PATCH 56/82] Update user.class.php

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

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 6d4530d6077..a9dcbfe3b87 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1393,7 +1393,7 @@ class User extends CommonObject
 
 		dol_syslog(get_class($this)."::create login=".$this->login.", user=".(is_object($user) ? $user->id : ''), LOG_DEBUG);
 
-		$badCharUnauthorizedIntoLoginName = getDolGlobalString('MAIN_LOGIN_BADCHARUNAUTHORIZED', '/[,@<>"\']/');
+		$badCharUnauthorizedIntoLoginName = getDolGlobalString('MAIN_LOGIN_BADCHARUNAUTHORIZED', ',@<>"\'');
 
 		// Check parameters
 		if (!empty($conf->global->USER_MAIL_REQUIRED) && !isValidEMail($this->email)) {
@@ -1405,7 +1405,7 @@ class User extends CommonObject
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"));
 			return -1;
-		} elseif (preg_match($badCharUnauthorizedIntoLoginName, $this->login)) {
+		} elseif (preg_match('/['.preg_quote($badCharUnauthorizedIntoLoginName, '/').']/', $this->login)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadCharIntoLoginName");
 			return -1;

From 05ff99f2e61bd44af1646020a6a85299304d97f7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Jan 2022 16:03:30 +0100
Subject: [PATCH 57/82] Update user.class.php

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

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index a9dcbfe3b87..cd38b9f2d66 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1789,7 +1789,7 @@ class User extends CommonObject
 		$this->fk_warehouse = (int) $this->fk_warehouse;
 
 		// Check parameters
-		$badCharUnauthorizedIntoLoginName = getDolGlobalString('MAIN_LOGIN_BADCHARUNAUTHORIZED', '/[,@<>"\']/');
+		$badCharUnauthorizedIntoLoginName = getDolGlobalString('MAIN_LOGIN_BADCHARUNAUTHORIZED', ',@<>"\'');
 
 		if (!empty($conf->global->USER_MAIL_REQUIRED) && !isValidEMail($this->email)) {
 			$langs->load("errors");
@@ -1800,7 +1800,7 @@ class User extends CommonObject
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFieldRequired", 'Login');
 			return -1;
-		} elseif (preg_match($badCharUnauthorizedIntoLoginName, $this->login)) {
+		} elseif (preg_match('/['.preg_quote($badCharUnauthorizedIntoLoginName, '/').']/', $this->login)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadCharIntoLoginName");
 			return -1;

From 311d6d666dad46de5cd9ad35304b1497ad19bfb3 Mon Sep 17 00:00:00 2001
From: Thomas Negre <tnegre@open-dsi.fr>
Date: Tue, 25 Jan 2022 15:12:32 +0100
Subject: [PATCH 58/82] fix ticket : an external user should be able to access
 only its own company tickets.

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

diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index e4ba75b84c5..44b9edf358e 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -157,6 +157,8 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 if (!$user->rights->ticket->read) {
 	accessforbidden();
 }
+// restrict view to current user's company
+if ($user->socid > 0) $socid = $user->socid;
 
 // Store current page url
 $url_page_current = DOL_URL_ROOT.'/ticket/list.php';

From a7d3facf889e4431f7d6999b1cd3ba4185d00590 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 24 Jan 2022 23:58:31 +0100
Subject: [PATCH 59/82] Fix tooltip for payment

---
 .../class/paymentexpensereport.class.php              | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 48adeab929d..3aac0cee2b8 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -635,7 +635,16 @@ class PaymentExpenseReport extends CommonObject
 		if (empty($this->ref)) {
 			$this->ref = $this->label;
 		}
-		$label = $langs->trans("ShowPayment").': '.$this->ref;
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Payment").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		if (!empty($this->ref)) {
+			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		}
+		if (!empty($this->datep)) {
+			$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->datep, 'dayhour');
+		}
 
 		if (!empty($this->id)) {
 			$link = '<a href="'.DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';

From 4de5ee97b35dd4a18297b9bff18a692d9c3e7ef7 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Tue, 25 Jan 2022 16:37:33 +0100
Subject: [PATCH 60/82] NEW : split consumption line on MO

---
 htdocs/mrp/js/lib_dispatch.js.php | 36 ++++++++++++++++++-------------
 htdocs/mrp/mo_production.php      |  2 +-
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/htdocs/mrp/js/lib_dispatch.js.php b/htdocs/mrp/js/lib_dispatch.js.php
index aa29b38c5fb..d8285ac75c1 100644
--- a/htdocs/mrp/js/lib_dispatch.js.php
+++ b/htdocs/mrp/js/lib_dispatch.js.php
@@ -70,8 +70,14 @@ function addDispatchLine(index, type, mode)
 	mode = mode || 'qtymissing'
 
 	console.log("fourn/js/lib_dispatch.js.php Split line type="+type+" index="+index+" mode="+mode);
-    if(mode == 'qtymissingconsume') var inputId = 'qtytoconsume';
-    else var inputId = 'qtytoproduce';
+    if(mode == 'qtymissingconsume') {
+        var inputId = 'qtytoconsume';
+        var warehouseId = 'idwarehouse';
+    }
+    else {
+        var inputId = 'qtytoproduce';
+        var warehouseId = 'idwarehousetoproduce';
+    }
 	var nbrTrs = $("tr[name^='"+type+"_"+index+"']").length; 				// position of line for batch
 	var $row = $("tr[name='"+type+'_'+index+"_1']").clone(true); 				// clone last batch line to jQuery object
 	var	qtyOrdered = parseFloat($("#qty_ordered_"+index).val()); 	// Qty ordered is same for all rows
@@ -105,11 +111,11 @@ function addDispatchLine(index, type, mode)
 		$row.html($row.html().replace(re1, '_'+index+'_'+(nbrTrs+1)));
 		$row.html($row.html().replace(re2, '-'+index+'-'+(nbrTrs+1)));
 		//create new select2 to avoid duplicate id of cloned one
-		$row.find("select[name='"+'idwarehousetoproduce-'+index+'-'+(nbrTrs+1)+"']").select2();
+		$row.find("select[name='"+warehouseId+'-'+index+'-'+(nbrTrs+1)+"']").select2();
 		// TODO find solution to copy selected option to new select
 		// TODO find solution to keep new tr's after page refresh
 		//clear value
-		$row.find("input[name^='qtytoproduce']").val('');
+		$row.find("input[id^='"+inputId+"']").val('');
 		//change name of new row
 		$row.attr('name',type+'_'+index+'_'+(nbrTrs+1));
 		//insert new row before last row
@@ -120,20 +126,20 @@ function addDispatchLine(index, type, mode)
 		$(".csswarehouse_"+index+"_"+(nbrTrs+1)+":first-child").parent("span.selection").parent(".select2").detach();
 
 		/*  Suffix of lines are:  index _ trs.length */
-		$("#qtytoproduce-"+index+"-"+(nbrTrs+1)).focus();
-		if ($("#qtytoproduce-"+index+"-"+(nbrTrs)).val() == 0) {
-			$("#qtytoproduce-"+index+"-"+(nbrTrs)).val(1);
+		$("#"+inputId+"-"+index+"-"+(nbrTrs+1)).focus();
+		if ($("#"+inputId+"-"+index+"-"+(nbrTrs)).val() == 0) {
+			$("#"+inputId+"-"+index+"-"+(nbrTrs)).val(1);
 		}
 		var totalonallines = 0;
 		for (let i = 1; i <= nbrTrs; i++) {
-			console.log(i+" = "+parseFloat($("#qtytoproduce-"+index+"-"+i).val()));
-			totalonallines = totalonallines + parseFloat($("#qtytoproduce-"+index+"-"+i).val());
+			console.log(i+" = "+parseFloat($("#"+inputId+"-"+index+"-"+i).val()));
+			totalonallines = totalonallines + parseFloat($("#"+inputId+"-"+index+"-"+i).val());
 		}
 		console.log("totalonallines="+totalonallines);
 		if (totalonallines == qtyOrdered && qtyOrdered > 1) {
-			var prevouslineqty = $("#qtytoproduce-"+index+"-"+nbrTrs).val();
-			$("#qtytoproduce-"+index+"-"+(nbrTrs)).val(1);
-			$("#qtytoproduce-"+index+"-"+(nbrTrs+1)).val(prevouslineqty - 1);
+			var prevouslineqty = $("#"+inputId+"-"+index+"-"+nbrTrs).val();
+			$("#"+inputId+"-"+index+"-"+(nbrTrs)).val(1);
+			$("#"+inputId+"-"+index+"-"+(nbrTrs+1)).val(prevouslineqty - 1);
 		}
 		$("#qty_dispatched_"+index).val(qtyDispatched);
 
@@ -147,9 +153,9 @@ function addDispatchLine(index, type, mode)
 			$("#qty_"+(nbrTrs-1)+"_"+index).val(qty);
 		}
 		// Store arbitrary data for dispatch qty input field change event
-		$("#qtytoproduce-"+index+(nbrTrs)).data('qty', qty);
-		$("#qtytoproduce-"+index+(nbrTrs)).data('type', type);
-		$("#qtytoproduce-"+index+(nbrTrs)).data('index', index);
+		$("#"+inputId+"-"+index+(nbrTrs)).data('qty', qty);
+		$("#"+inputId+"-"+index+(nbrTrs)).data('type', type);
+		$("#"+inputId+"-"+index+(nbrTrs)).data('index', index);
 	}
 }
 
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index f83b32f1c99..6a5c41b77c5 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -1010,7 +1010,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						if ($tmpproduct->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 							if (empty($line->disable_stock_change)) {
 								$preselected = (GETPOSTISSET('idwarehouse-'.$line->id.'-'.$i) ? GETPOST('idwarehouse-'.$line->id.'-'.$i) : ($tmpproduct->fk_default_warehouse > 0 ? $tmpproduct->fk_default_warehouse : 'ifone'));
-								print $formproduct->selectWarehouses($preselected, 'idwarehouse-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', 1, 0, null, 'maxwidth200');
+								print $formproduct->selectWarehouses($preselected, 'idwarehouse-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', 1, 0, null, 'maxwidth200 csswarehouse_'.$line->id.'_'.$i);
 							} else {
 								print '<span class="opacitymedium">'.$langs->trans("DisableStockChange").'</span>';
 							}

From 4f54149555b0bed3c66382ca76d7885e1820a593 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 25 Jan 2022 22:28:47 +0100
Subject: [PATCH 61/82] Update commonobject.class.php

---
 htdocs/core/class/commonobject.class.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 2d5ae6ca78b..dbf8f3869e0 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2293,6 +2293,15 @@ abstract class CommonObject
 				if (get_class($this) == 'Fournisseur') {
 					$this->mode_reglement_supplier_id = $id;
 				}
+				// Triggers
+				if (!$error && !$notrigger) {
+					// Call triggers
+					$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $user);
+					if ($result < 0) {
+						$error++;
+					}
+					// End call triggers
+				}
 				return 1;
 			} else {
 				dol_syslog(get_class($this).'::setPaymentMethods Error '.$this->db->error());

From 30fd55addc270e58b5e3184db0b8dd967f1ceee0 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 26 Jan 2022 07:29:37 +0100
Subject: [PATCH 62/82] NEW API Proposals - Add POST lines

---
 .../comm/propal/class/api_proposals.class.php | 90 ++++++++++++++++++-
 1 file changed, 86 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 41ed388e044..6d4f9446021 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -1,7 +1,9 @@
 <?php
-/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2016   Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2020   Thibault FOUCART   		<support@ptibogxiv.net>
+/* Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2016       Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2020       Thibault FOUCART   		<support@ptibogxiv.net>
+ * Copyright (C) 2022       ATM Consulting   		<contact@atm-consulting.fr>
+ * Copyright (C) 2022       OpenDSI   				<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
@@ -308,7 +310,7 @@ class Proposals extends DolibarrApi
 	 * @param int   $id             Id of commercial proposal to update
 	 * @param array $request_data   Commercial proposal line data
 	 *
-	 * @url	POST {id}/lines
+	 * @url	POST {id}/line
 	 *
 	 * @return int
 	 */
@@ -368,6 +370,86 @@ class Proposals extends DolibarrApi
 		}
 	}
 
+	/**
+	 * Add lines to given commercial proposal
+	 *
+	 * @param int   $id             Id of commercial proposal to update
+	 * @param array $request_data   Commercial proposal line data
+	 *
+	 * @url	POST {id}/lines
+	 *
+	 * @return int
+	 */
+	public function postLines($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
+			throw new RestException(401);
+		}
+
+		$result = $this->propal->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Commercial Proposal not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$errors = [];
+		$this->db->begin();
+
+		foreach ($request_data as $TData)
+		{
+			if(empty($TData[0])) $TData = array($TData);
+
+			foreach ($TData as $lineData) {
+
+				$line = (object)$lineData;
+
+				$updateRes = $this->propal->addline(
+					$line->desc,
+					$line->subprice,
+					$line->qty,
+					$line->tva_tx,
+					$line->localtax1_tx,
+					$line->localtax2_tx,
+					$line->fk_product,
+					$line->remise_percent,
+					'HT',
+					0,
+					$line->info_bits,
+					$line->product_type,
+					$line->rang,
+					$line->special_code,
+					$line->fk_parent_line,
+					$line->fk_fournprice,
+					$line->pa_ht,
+					$line->label,
+					$line->date_start,
+					$line->date_end,
+					$line->array_options,
+					$line->fk_unit,
+					$line->origin,
+					$line->origin_id,
+					$line->multicurrency_subprice,
+					$line->fk_remise_except
+				);
+
+				if ($updateRes < 0) {
+					$errors['lineLabel'] = $line->label;
+					$errors['msg'] = $this->propal->errors;
+				}
+			}
+		}
+		if (empty($errors)) {
+			$this->db->commit();
+			return count($request_data);
+		} else {
+			$this->db->rollback();
+			throw new RestException(400, implode(", ", $errors));
+		}
+	}
+
 	/**
 	 * Update a line of given commercial proposal
 	 *

From 68ba60896f293d213a8bcab43e6fe61eecb79d86 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 26 Jan 2022 07:31:17 +0100
Subject: [PATCH 63/82] Copyright

---
 htdocs/comm/propal/class/api_proposals.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 6d4f9446021..778bdd3ba2f 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -1,9 +1,9 @@
 <?php
 /* Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016       Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2020       Thibault FOUCART   		<support@ptibogxiv.net>
- * Copyright (C) 2022       ATM Consulting   		<contact@atm-consulting.fr>
- * Copyright (C) 2022       OpenDSI   				<support@open-dsi.fr>
+ * Copyright (C) 2020       Thibault FOUCART        <support@ptibogxiv.net>
+ * Copyright (C) 2022       ATM Consulting          <contact@atm-consulting.fr>
+ * Copyright (C) 2022       OpenDSI                 <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

From 71876755d2c7c4092b06ab0897d47e1839cd229f Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 26 Jan 2022 06:35:26 +0000
Subject: [PATCH 64/82] Fixing style errors.

---
 htdocs/comm/propal/class/api_proposals.class.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 778bdd3ba2f..19e1451b300 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -398,13 +398,11 @@ class Proposals extends DolibarrApi
 		$errors = [];
 		$this->db->begin();
 
-		foreach ($request_data as $TData)
-		{
-			if(empty($TData[0])) $TData = array($TData);
+		foreach ($request_data as $TData) {
+			if (empty($TData[0])) $TData = array($TData);
 
 			foreach ($TData as $lineData) {
-
-				$line = (object)$lineData;
+				$line = (object) $lineData;
 
 				$updateRes = $this->propal->addline(
 					$line->desc,

From 31787a99f0c76e8f89022e12a717bdc4298f4dd3 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 26 Jan 2022 08:50:57 +0100
Subject: [PATCH 65/82] NEW Proposal - Add filter on proposal get lines

---
 .../comm/propal/class/api_proposals.class.php | 18 +++++--
 htdocs/comm/propal/class/propal.class.php     | 51 +++++++++++--------
 2 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 41ed388e044..7d71dc4f244 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -274,14 +274,17 @@ class Proposals extends DolibarrApi
 	/**
 	 * Get lines of a commercial proposal
 	 *
-	 * @param int   $id             Id of commercial proposal
+	 * @param int		$id				Id of commercial proposal
+	 * @param string    $sqlfilters 	Other criteria to filter answers separated by a comma. d is the alias for proposal lines table, p is the alias for product table. "Syntax example "(p.ref:like:'SO-%') and (d.date_start:<:'20220101')"
 	 *
 	 * @url	GET {id}/lines
 	 *
 	 * @return int
 	 */
-	public function getLines($id)
+	public function getLines($id, $sqlfilters = '')
 	{
+		$filters = "";
+
 		if (!DolibarrApiAccess::$user->rights->propal->lire) {
 			throw new RestException(401);
 		}
@@ -294,7 +297,16 @@ class Proposals extends DolibarrApi
 		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-		$this->propal->getLinesArray();
+
+		if (!empty($sqlfilters)) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$filters = " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+		$this->propal->getLinesArray($filters);
 		$result = array();
 		foreach ($this->propal->lines as $line) {
 			array_push($result, $this->_cleanObjectDatas($line));
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index fd3bbfe7171..1c532e26147 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1,20 +1,22 @@
 <?php
-/* Copyright (C) 2002-2004 Rodolphe Quiedeville		<rodolphe@quiedeville.org>
- * Copyright (C) 2004      Eric Seigne				<eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2011 Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005      Marc Barilley			<marc@ocebo.com>
- * Copyright (C) 2005-2013 Regis Houssin			<regis.houssin@inodbox.com>
- * Copyright (C) 2006      Andre Cianfarani			<acianfa@free.fr>
- * Copyright (C) 2008      Raphael Bertrand			<raphael.bertrand@resultic.fr>
- * Copyright (C) 2010-2020 Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2010-2017 Philippe Grand			<philippe.grand@atoo-net.com>
- * Copyright (C) 2012-2014 Christophe Battarel  	<christophe.battarel@altairis.fr>
- * Copyright (C) 2012      Cedric Salvador          <csalvador@gpcsolutions.fr>
- * Copyright (C) 2013      Florian Henry		  	<florian.henry@open-concept.pro>
- * Copyright (C) 2014-2015 Marcos García            <marcosgdf@gmail.com>
- * Copyright (C) 2018      Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2018-2021 Frédéric France          <frederic.france@netlogic.fr>
- * Copyright (C) 2018      Ferran Marcet         	<fmarcet@2byte.es>
+/* Copyright (C) 2002-2004  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004       Eric Seigne             <eric.seigne@ryxeo.com>
+ * Copyright (C) 2004-2011  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005       Marc Barilley           <marc@ocebo.com>
+ * Copyright (C) 2005-2013  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2006       Andre Cianfarani        <acianfa@free.fr>
+ * Copyright (C) 2008       Raphael Bertrand        <raphael.bertrand@resultic.fr>
+ * Copyright (C) 2010-2020  Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2010-2017  Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2012-2014  Christophe Battarel     <christophe.battarel@altairis.fr>
+ * Copyright (C) 2012       Cedric Salvador         <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
+ * Copyright (C) 2014-2015  Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
+ * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2022       ATM Consulting          <contact@atm-consulting.fr>
+ * Copyright (C) 2022       OpenDSI                 <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
@@ -1714,12 +1716,13 @@ class Propal extends CommonObject
 	/**
 	 * Load array lines
 	 *
-	 *	@param		int		$only_product	Return only physical products
-	 *	@param		int		$loadalsotranslation	Return translation for products
+	 *	@param		int			$only_product			Return only physical products
+	 *	@param		int			$loadalsotranslation	Return translation for products
+	 *	@param		string		$filters				Filter on other fields
 	 *
-	 * @return		int						<0 if KO, >0 if OK
+	 *	@return		int									<0 if KO, >0 if OK
 	 */
-	public function fetch_lines($only_product = 0, $loadalsotranslation = 0)
+	public function fetch_lines($only_product = 0, $loadalsotranslation = 0, $filters = '')
 	{
 		global $langs, $conf;
 		// phpcs:enable
@@ -1738,6 +1741,9 @@ class Propal extends CommonObject
 		if ($only_product) {
 			$sql .= ' AND p.fk_product_type = 0';
 		}
+		if ($filters) {
+			$sql .= $filters;
+		}
 		$sql .= ' ORDER by d.rang';
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
@@ -3689,12 +3695,13 @@ class Propal extends CommonObject
 
 	/**
 	 * 	Retrieve an array of proposal lines
+	 *	@param  string              $filters        Filter on other fields
 	 *
 	 * 	@return int		>0 if OK, <0 if KO
 	 */
-	public function getLinesArray()
+	public function getLinesArray($filters = '')
 	{
-		return $this->fetch_lines();
+		return $this->fetch_lines(0, 0, $filters);
 	}
 
 	/**

From ec723657c93da5d9f3160ebeba25fd0a44350828 Mon Sep 17 00:00:00 2001
From: Thomas Negre <tnegre@open-dsi.fr>
Date: Wed, 26 Jan 2022 09:55:41 +0100
Subject: [PATCH 66/82] new : allow informations to be displayed before the
 public ticket list

---
 htdocs/public/ticket/list.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index 8a353eea881..1a3c0c3babd 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -77,6 +77,9 @@ if (isset($_SESSION['email_customer'])) {
 
 $object = new Ticket($db);
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('ticketpubliclist', 'globalcard'));
+
 if (empty($conf->ticket->enabled)) {
 	accessforbidden('', 0, 0, 1);
 }
@@ -407,6 +410,11 @@ if ($action == "view_ticketlist") {
 				$varpage = empty($contextpage) ? $url_page_current : $contextpage;
 				$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
+				// allow to display information before list
+				$parameters=array('arrayfields'=>$arrayfields);
+				$reshook=$hookmanager->executeHooks('printFieldListHeader', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
+				print $hookmanager->resPrint;
+
 				print '<table class="liste '.($moreforfilter ? "listwithfilterbefore" : "").'">';
 
 				// Filter bar

From 95df5bebe6d8e938849a72bd931b1ca407073d5b Mon Sep 17 00:00:00 2001
From: pandreani <pandreani@open-dsi.fr>
Date: Wed, 26 Jan 2022 10:18:44 +0100
Subject: [PATCH 67/82] NEW stock limit in stock export CSV

---
 htdocs/core/modules/modStock.class.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 00e5a7859c0..b0de609a874 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -235,19 +235,22 @@ class modStock extends DolibarrModules
 			'p.rowid'=>"ProductId", 'p.ref'=>"Ref", 'p.fk_product_type'=>"Type", 'p.label'=>"Label", 'p.description'=>"Description", 'p.note'=>"Note",
 			'p.price'=>"Price", 'p.tva_tx'=>'VAT', 'p.tosell'=>"OnSell", 'p.tobuy'=>'OnBuy', 'p.duration'=>"Duration",
 			'p.datec'=>'DateCreation', 'p.tms'=>'DateModification', 'p.pmp'=>'PMPValue', 'p.cost_price'=>'CostPrice',
+			'p.seuil_stock_alerte'=>'StockLimit',
 		);
 		$this->export_TypeFields_array[$r] = array(
 			'e.rowid'=>'List:entrepot:ref::stock', 'e.ref'=>'Text', 'e.lieu'=>'Text', 'e.address'=>'Text', 'e.zip'=>'Text', 'e.town'=>'Text',
 			'p.rowid'=>"List:product:label::product", 'p.ref'=>"Text", 'p.fk_product_type'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.note'=>"Text",
 			'p.price'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean", 'p.duration'=>"Duree",
 			'p.datec'=>'Date', 'p.tms'=>'Date', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric',
-			'ps.reel'=>'Numeric'
+			'ps.reel'=>'Numeric',
+			'p.seuil_stock_alerte'=>'Numeric',
 		);
 		$this->export_entities_array[$r] = array(
 			'p.rowid'=>"product", 'p.ref'=>"product", 'p.fk_product_type'=>"product", 'p.label'=>"product", 'p.description'=>"product", 'p.note'=>"product",
 			'p.price'=>"product", 'p.tva_tx'=>'product', 'p.tosell'=>"product", 'p.tobuy'=>"product", 'p.duration'=>"product",
 			'p.datec'=>'product', 'p.tms'=>'product', 'p.pmp'=>'product', 'p.cost_price'=>'product',
-			'ps.reel'=>'stock'
+			'ps.reel'=>'stock',
+			'p.seuil_stock_alerte'=>'product',
 		);	// We define here only fields that use another icon that the one defined into export_icon
 		$this->export_aggregate_array[$r] = array('ps.reel'=>'SUM'); // TODO Not used yet
 		$this->export_dependencies_array[$r] = array('stock'=>array('p.rowid', 'e.rowid')); // We must keep this until the aggregate_array is used. To have a unique key, if we ask a field of a child, to avoid the DISTINCT to discard them.

From 3e1cfc2997208b5874b0761f37aad7ea0180e8f9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jan 2022 11:29:27 +0100
Subject: [PATCH 68/82] NEW Add status "Obsolete" to KM articles

---
 htdocs/bom/bom_card.php                       |  5 --
 .../class/knowledgerecord.class.php           |  6 +-
 .../knowledgerecord_card.php                  | 57 +++++++++++++++++--
 htdocs/langs/en_US/knowledgemanagement.lang   |  6 +-
 .../modulebuilder/template/myobject_card.php  | 12 +++-
 5 files changed, 72 insertions(+), 14 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 748aea4ddb2..7d83a88ce55 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -354,8 +354,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$formquestion = array();
 		if (!empty($conf->bom->enabled)) {
 			$langs->load("mrp");
-			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-			$formproduct = new FormProduct($db);
 			$forcecombo = 0;
 			if ($conf->browser->name == 'ie') {
 				$forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
@@ -384,8 +382,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$formquestion = array();
 		if (!empty($conf->bom->enabled)) {
 			$langs->load("mrp");
-			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-			$formproduct = new FormProduct($db);
 			$forcecombo = 0;
 			if ($conf->browser->name == 'ie') {
 				$forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
@@ -415,7 +411,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if (!empty($conf->bom->enabled)) {
 			$langs->load("mrp");
 			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-			$formproduct = new FormProduct($db);
 			$forcecombo = 0;
 			if ($conf->browser->name == 'ie') {
 				$forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 8629ec7bbc6..b241cb2d9e9 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -116,7 +116,7 @@ class KnowledgeRecord extends CommonObject
 		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
 		//'url' => array('type'=>'varchar(255)', 'label'=>'URL', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1, 'csslist'=>'tdoverflow200', 'help'=>'UrlForInfoPage'),
 		'fk_c_ticket_category' => array('type'=>'integer:CTicketCategory:ticket/class/cticketcategory.class.php:0::pos', 'label'=>'SuggestedForTicketsInGroup', 'enabled'=>'$conf->ticket->enabled', 'position'=>512, 'notnull'=>0, 'visible'=>-1, 'help'=>'YouCanLinkArticleToATicketCategory', 'csslist'=>'minwidth200 tdoverflowmax250'),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>5, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated'),),
+		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>5, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '9'=>'Obsolete'),),
 	);
 	public $rowid;
 	public $ref;
@@ -829,10 +829,10 @@ class KnowledgeRecord extends CommonObject
 			//$langs->load("knowledgemanagement");
 			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
 			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
-			$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Obsolete');
 			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
 			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
-			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
+			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Obsolete');
 		}
 
 		$statusType = 'status'.$status;
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index 809d69128cf..a388175dbcf 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -1,6 +1,5 @@
 <?php
-/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
+/* Copyright (C) 2017-2021 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -295,6 +294,56 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 	}
 
+	// Confirmation of action xxxx (You can use it for xxx = 'close', xxx = 'reopen', ...)
+	if ($action == 'close') {
+		$text = $langs->trans('ConfirmCloseKM', $object->ref);
+		/*if (! empty($conf->notification->enabled))
+		 {
+		 require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
+		 $notify = new Notify($db);
+		 $text .= '<br>';
+		 $text .= $notify->confirmMessage('MYOBJECT_CLOSE', $object->socid, $object);
+		 }*/
+
+		$formquestion = array();
+		/*
+		 $forcecombo=0;
+		 if ($conf->browser->name == 'ie') $forcecombo = 1;	// There is a bug in IE10 that make combo inside popup crazy
+		 $formquestion = array(
+		 // 'text' => $langs->trans("ConfirmClone"),
+		 // array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
+		 // array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
+		 // array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
+		 );
+		 */
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetObsolete'), $text, 'confirm_close', $formquestion, 0, 1, 220);
+	}
+
+	// Confirmation of action xxxx (You can use it for xxx = 'close', xxx = 'reopen', ...)
+	if ($action == 'reopen') {
+		$text = $langs->trans('ConfirmReopenKM', $object->ref);
+		/*if (! empty($conf->notification->enabled))
+		 {
+		 require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
+		 $notify = new Notify($db);
+		 $text .= '<br>';
+		 $text .= $notify->confirmMessage('MYOBJECT_CLOSE', $object->socid, $object);
+		 }*/
+
+		$formquestion = array();
+		/*
+		 $forcecombo=0;
+		 if ($conf->browser->name == 'ie') $forcecombo = 1;	// There is a bug in IE10 that make combo inside popup crazy
+		 $formquestion = array(
+		 // 'text' => $langs->trans("ConfirmClone"),
+		 // array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
+		 // array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
+		 // array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
+		 );
+		 */
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Re-Open'), $text, 'confirm_reopen', $formquestion, 0, 1, 220);
+	}
+
 	// Call Hook formConfirm
 	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
 	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -428,14 +477,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable&token='.newToken().'">'.$langs->trans("Enable").'</a>'."\n";
 				}
 			}
+			*/
 			if ($permissiontoadd) {
 				if ($object->status == $object::STATUS_VALIDATED) {
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close&token='.newToken().'">'.$langs->trans("Cancel").'</a>'."\n";
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close&token='.newToken().'">'.$langs->trans("SetObsolete").'</a>'."\n";
 				} else {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Re-Open").'</a>'."\n";
 				}
 			}
-			*/
 
 			// Delete (need delete permission, or if draft, just need create/modify permission)
 			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken(), '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
diff --git a/htdocs/langs/en_US/knowledgemanagement.lang b/htdocs/langs/en_US/knowledgemanagement.lang
index 1f5e9d3905b..ee93715a5c0 100644
--- a/htdocs/langs/en_US/knowledgemanagement.lang
+++ b/htdocs/langs/en_US/knowledgemanagement.lang
@@ -47,4 +47,8 @@ KnowledgeRecord = Article
 KnowledgeRecordExtraFields = Extrafields for Article
 GroupOfTicket=Group of tickets
 YouCanLinkArticleToATicketCategory=You can link an article to a ticket group (so the article will be suggested during qualification of new tickets)
-SuggestedForTicketsInGroup=Suggested for tickets when group is
\ No newline at end of file
+SuggestedForTicketsInGroup=Suggested for tickets when group is
+
+SetObsolete=Set as obsolete
+ConfirmCloseKM=Do you confirm the closing of this article as obsolete ?
+ConfirmReopenKM=Do you want to restore this article to status "Validated" ?
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index a493508878c..66279849abb 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -316,6 +316,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	if ($action == 'deleteline') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
 	}
+
 	// Clone confirmation
 	if ($action == 'clone') {
 		// Create an array for form
@@ -323,8 +324,17 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 	}
 
-	// Confirmation of action xxxx
+	// Confirmation of action xxxx (You can use it for xxx = 'close', xxx = 'reopen', ...)
 	if ($action == 'xxx') {
+		$text = $langs->trans('ConfirmActionMyObject', $object->ref);
+		/*if (! empty($conf->notification->enabled))
+		{
+			require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
+			$notify = new Notify($db);
+			$text .= '<br>';
+			$text .= $notify->confirmMessage('MYOBJECT_CLOSE', $object->socid, $object);
+		}*/
+
 		$formquestion = array();
 		/*
 		$forcecombo=0;

From 7b990a1a7ff7511337ffa9e169ba43ad531994d9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jan 2022 11:30:19 +0100
Subject: [PATCH 69/82] Fix phpcs

---
 htdocs/core/class/html.form.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index d29fd0d5e15..ff5f5d0d0a5 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1693,8 +1693,7 @@ class Form
 			if ($showempty && ! is_numeric($showempty)) {
 				$textforempty = $showempty;
 				$out .= '<option class="optiongrey" value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'>'.$textforempty.'</option>';
-			}
-			else {
+			} else {
 				if (($showempty == 1 || ($showempty == 3 && $num > 1)) && ! $multiple) {
 					$out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';
 				}

From b7d199657b38f96792fa06237a16405ee56c8921 Mon Sep 17 00:00:00 2001
From: Markusi13 <Markusi13@users.noreply.github.com>
Date: Wed, 26 Jan 2022 12:23:12 +0100
Subject: [PATCH 70/82] Update bug_report.yml

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 7e7a62c1e84..d7dc3d584e3 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -69,12 +69,3 @@ body:
     attributes:
       label: Attached files
       description: Screenshots, screencasts, dolibarr.log, debugging informations
-      
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Code of Conduct
-      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CODE_OF_CONDUCT.md)
-      options:
-        - label: I agree to follow this project's Code of Conduct
-          required: true

From a47145f96247f3155002d3d172f7f059f0e00eeb Mon Sep 17 00:00:00 2001
From: Markusi13 <Markusi13@users.noreply.github.com>
Date: Wed, 26 Jan 2022 12:23:25 +0100
Subject: [PATCH 71/82] Update feature_request.yml

---
 .github/ISSUE_TEMPLATE/feature_request.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index f4975622a8f..885f3472d18 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -33,12 +33,3 @@ body:
     attributes:
       label: Suggested steps
       description: List of tasks to achieve goal
-      
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Code of Conduct
-      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CODE_OF_CONDUCT.md)
-      options:
-        - label: I agree to follow this project's Code of Conduct
-          required: true

From 3b4c7ceb3bf5c81664cf4942aadefcdaab3fbcc2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jan 2022 13:00:48 +0100
Subject: [PATCH 72/82] Code comment

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2eb1802d303..5f46e9632c7 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -783,7 +783,7 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 				// keep lines feed
 			}
 			break;
-		case 'alphawithlgt':		// No " and no ../ but we keep balanced < > tags with no special chars inside. Can be used for email string like "Name <email>"
+		case 'alphawithlgt':		// No " and no ../ but we keep balanced < > tags with no special chars inside. Can be used for email string like "Name <email>". Less secured than 'alphanohtml'
 			if (!is_array($out)) {
 				$out = trim($out);
 				do {

From cceb98a1959fcfedac34067dd322b2aba3162e6f Mon Sep 17 00:00:00 2001
From: BB2A Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 26 Jan 2022 13:28:14 +0100
Subject: [PATCH 73/82] Correct VAR forget

---
 htdocs/theme/md/style.css.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 4dadc40306f..5e59c6be224 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -343,6 +343,7 @@ print '*/'."\n";
 	--productlinestockod: #002200;
 	--productlinestocktoolow: #884400;
 	--infoboxmoduleenabledbgcolor : linear-gradient(0.4turn, #fff, #fff, #fff, #e4efe8);
+	--butactionbg : #<?php print $butactionbg; ?>;
 }
 
 body {
@@ -444,7 +445,7 @@ input, select {
 	margin-top:1px;
 }
 #mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
-	background: rgb(<?php echo $butactionbg ?>);
+	background: var(--butactionbg);;
 	color: #FFF !important;
 	border-radius: 3px;
 	border-collapse: collapse;
@@ -569,7 +570,7 @@ a.butStatus {
 	padding-right: 5px;
 	background-color: transparent;
 	color: var(--colortext) !important;
-	border: 2px solid rgb(<?php echo $butactionbg ?>);
+	border: 2px solid var( --butactionbg);
 	margin: 0 0.45em !important;
 }
 

From 416543a5f5913b45c316d3df077b7ff5e4e29292 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jan 2022 13:49:46 +0100
Subject: [PATCH 74/82] Standardize code to allow deletion of an odt template

---
 htdocs/admin/agenda_other.php                                | 2 ++
 htdocs/admin/agenda_reminder.php                             | 2 ++
 htdocs/admin/barcode.php                                     | 1 +
 htdocs/admin/bom.php                                         | 2 ++
 htdocs/admin/commande.php                                    | 2 ++
 htdocs/admin/contract.php                                    | 2 ++
 htdocs/admin/delivery.php                                    | 2 ++
 htdocs/admin/eventorganization.php                           | 2 ++
 htdocs/admin/expedition.php                                  | 2 ++
 htdocs/admin/expensereport.php                               | 2 ++
 htdocs/admin/facture.php                                     | 2 ++
 htdocs/admin/facture_situation.php                           | 2 ++
 htdocs/admin/fichinter.php                                   | 2 ++
 htdocs/admin/holiday.php                                     | 2 ++
 htdocs/admin/hrm.php                                         | 2 ++
 htdocs/admin/import.php                                      | 2 ++
 htdocs/admin/knowledgemanagement.php                         | 3 ++-
 htdocs/admin/mrp.php                                         | 2 ++
 htdocs/admin/propal.php                                      | 2 ++
 htdocs/admin/reception_setup.php                             | 2 ++
 htdocs/admin/supplier_order.php                              | 2 ++
 htdocs/admin/supplier_payment.php                            | 2 ++
 htdocs/admin/supplier_proposal.php                           | 2 ++
 htdocs/admin/ticket.php                                      | 2 ++
 htdocs/admin/user.php                                        | 2 ++
 htdocs/admin/usergroup.php                                   | 2 ++
 htdocs/admin/workstation.php                                 | 1 +
 .../modules/propale/doc/doc_generic_proposal_odt.modules.php | 5 ++++-
 28 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 8e50380e2ae..1014d40de50 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -41,6 +41,8 @@ $langs->loadLangs(array('admin', 'other', 'agenda', 'users'));
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $param = GETPOST('param', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index 1d8cd8f723c..79aa081ddef 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -36,6 +36,8 @@ $langs->loadLangs(array("admin", "other", "agenda"));
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $param = GETPOST('param', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 $scandir = GETPOST('scandir', 'alpha');
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index 2fbfed35536..ee0fcd5d130 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -36,6 +36,7 @@ if (!$user->admin) {
 }
 
 $action = GETPOST('action', 'aZ09');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
 
 
 /*
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index a36c3698306..e3adb206d7e 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -36,6 +36,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'bom';
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 24a45bb413a..5c8eb88126c 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -46,6 +46,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'order';
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 1c6a0ec0458..0c8aba5ae2d 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -37,6 +37,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'contract';
diff --git a/htdocs/admin/delivery.php b/htdocs/admin/delivery.php
index 8e60b02a5bf..6f0f4c1b415 100644
--- a/htdocs/admin/delivery.php
+++ b/htdocs/admin/delivery.php
@@ -43,6 +43,8 @@ if (!$user->admin) {
 
 $action  = GETPOST('action', 'alpha');
 $value   = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label   = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'delivery';
diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index 8edc61bf255..904d10bff67 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -41,6 +41,8 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'myobject';
 
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 2d4736cc49d..12e0d0a6d01 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -43,6 +43,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'shipping';
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 5b73d995b5c..fc63940f0b8 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -43,6 +43,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'expensereport';
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index ae269492ddf..9eec54b03a7 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -42,6 +42,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'invoice';
diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php
index 789faacacad..609a6605d1a 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/facture_situation.php
@@ -51,6 +51,8 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'invoice';
 
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 4369bb9a2a7..c95f354a189 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -43,6 +43,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'ficheinter';
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index bfd7e22c461..c1755b17edf 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -39,6 +39,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'contract';
diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php
index 1ad84ce19ac..aea86069f4d 100644
--- a/htdocs/admin/hrm.php
+++ b/htdocs/admin/hrm.php
@@ -50,6 +50,8 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'myobject';
 
diff --git a/htdocs/admin/import.php b/htdocs/admin/import.php
index cd9d7b44074..37168baa3d4 100644
--- a/htdocs/admin/import.php
+++ b/htdocs/admin/import.php
@@ -41,6 +41,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 
 /*
  * Actions
diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index 8d93c16741a..c2440bbb885 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -37,8 +37,9 @@ $langs->loadLangs(array("admin", "knowledgemanagement"));
 // Parameters
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
-
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'knowledgemanagement';
diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index 54efdc4df19..fac6a3f3d41 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -37,6 +37,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'mrp';
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 22ce045a7ab..6384c561967 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -43,6 +43,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'propal';
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index 218cc1ef853..26300ece329 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -36,6 +36,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'reception';
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 808528cdc0a..0da79845d14 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -43,6 +43,8 @@ if (!$user->admin) {
 
 $type = GETPOST('type', 'alpha');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $scandir = GETPOST('scan_dir', 'alpha');
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index b31e4c9a433..a41f9fdf80c 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -37,6 +37,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scandir', 'alpha');
 $type = 'supplier_payment';
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 6e3f190aeb6..9bd684afb22 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -38,6 +38,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'supplier_proposal';
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index 03fd647dd29..f4e5b4f3fad 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -38,6 +38,8 @@ if (!$user->admin) {
 // Parameters
 $value = GETPOST('value', 'alpha');
 $action = GETPOST('action', 'aZ09');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scandir', 'alpha');
 $type = 'ticket';
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 85ab0f0e9a8..53de8fe2502 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -43,9 +43,11 @@ $extrafields = new ExtraFields($db);
 
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
 
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
+
 $scandir = GETPOST('scandir', 'alpha');
 $type = 'user';
 
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index 3319ab994a6..709b60068f7 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -42,6 +42,8 @@ $extrafields = new ExtraFields($db);
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $type = 'group';
 
 /*
diff --git a/htdocs/admin/workstation.php b/htdocs/admin/workstation.php
index e89cbb2fd41..58118827ed4 100644
--- a/htdocs/admin/workstation.php
+++ b/htdocs/admin/workstation.php
@@ -36,6 +36,7 @@ $langs->loadLangs(array("admin", "workstation"));
 // Parameters
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
 
 $value = GETPOST('value', 'alpha');
 
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index 636bf4c4f7f..e636645f6c8 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -178,7 +178,10 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
 			// Show list of found files
 			foreach ($listoffiles as $file) {
-				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=proposals/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'];
+				$texte .= ' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=proposals/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=PROPALE_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 

From 6d04bac740cddaa8310f2fc59fd0bbc56042b568 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jan 2022 13:50:49 +0100
Subject: [PATCH 75/82] phpcs

---
 htdocs/includes/odtphp/Segment.php | 519 ++++++++++++++---------------
 1 file changed, 257 insertions(+), 262 deletions(-)

diff --git a/htdocs/includes/odtphp/Segment.php b/htdocs/includes/odtphp/Segment.php
index ca8797ba577..811cf62dadd 100644
--- a/htdocs/includes/odtphp/Segment.php
+++ b/htdocs/includes/odtphp/Segment.php
@@ -16,296 +16,291 @@ class SegmentException extends Exception
  */
 class Segment implements IteratorAggregate, Countable
 {
-    protected $xml;
-    protected $xmlParsed = '';
-    protected $name;
-    protected $children = array();
-    protected $vars = array();
+	protected $xml;
+	protected $xmlParsed = '';
+	protected $name;
+	protected $children = array();
+	protected $vars = array();
 	protected $images = array();
 	protected $odf;
 	protected $file;
 
-    /**
-     * Constructor
-     *
-     * @param string $name  name of the segment to construct
-     * @param string $xml   XML tree of the segment
-     * @param string $odf   odf
-     */
-    public function __construct($name, $xml, $odf)
-    {
-        $this->name = (string) $name;
-        $this->xml = (string) $xml;
+	/**
+	 * Constructor
+	 *
+	 * @param string $name  name of the segment to construct
+	 * @param string $xml   XML tree of the segment
+	 * @param string $odf   odf
+	 */
+	public function __construct($name, $xml, $odf)
+	{
+		$this->name = (string) $name;
+		$this->xml = (string) $xml;
 		$this->odf = $odf;
-        $zipHandler = $this->odf->getConfig('ZIP_PROXY');
-        $this->file = new $zipHandler($this->odf->getConfig('PATH_TO_TMP'));
-        $this->_analyseChildren($this->xml);
-    }
-    /**
-     * Returns the name of the segment
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-    /**
-     * Does the segment have children ?
-     *
-     * @return bool
-     */
-    public function hasChildren()
-    {
-        return $this->getIterator()->hasChildren();
-    }
-    /**
-     * Countable interface
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->children);
-    }
-    /**
-     * IteratorAggregate interface
-     *
-     * @return Iterator
-     */
-    public function getIterator()
-    {
-        return new RecursiveIteratorIterator(new SegmentIterator($this->children), 1);
-    }
-    /**
-     * Replace variables of the template in the XML code
-     * All the children are also called
-     * Complete the current segment with new line
-     *
-     * @return string
-     */
-    public function merge()
-    {
-        // To provide debug information on line number processed
-        global $count;
-        if (empty($count)) $count=1;
-        else $count++;
+		$zipHandler = $this->odf->getConfig('ZIP_PROXY');
+		$this->file = new $zipHandler($this->odf->getConfig('PATH_TO_TMP'));
+		$this->_analyseChildren($this->xml);
+	}
+	/**
+	 * Returns the name of the segment
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+	/**
+	 * Does the segment have children ?
+	 *
+	 * @return bool
+	 */
+	public function hasChildren()
+	{
+		return $this->getIterator()->hasChildren();
+	}
+	/**
+	 * Countable interface
+	 *
+	 * @return int
+	 */
+	public function count()
+	{
+		return count($this->children);
+	}
+	/**
+	 * IteratorAggregate interface
+	 *
+	 * @return Iterator
+	 */
+	public function getIterator()
+	{
+		return new RecursiveIteratorIterator(new SegmentIterator($this->children), 1);
+	}
+	/**
+	 * Replace variables of the template in the XML code
+	 * All the children are also called
+	 * Complete the current segment with new line
+	 *
+	 * @return string
+	 */
+	public function merge()
+	{
+		// To provide debug information on line number processed
+		global $count;
+		if (empty($count)) $count=1;
+		else $count++;
 
-        if (empty($this->savxml)) $this->savxml = $this->xml;       // Sav content of line at first line merged, so we will reuse original for next steps
-        $this->xml = $this->savxml;
-        $tmpvars = $this->vars;                                     // Store into $tmpvars so we won't modify this->vars when completing data with empty values
+		if (empty($this->savxml)) $this->savxml = $this->xml;       // Sav content of line at first line merged, so we will reuse original for next steps
+		$this->xml = $this->savxml;
+		$tmpvars = $this->vars;                                     // Store into $tmpvars so we won't modify this->vars when completing data with empty values
 
-        // Search all tags fou into condition to complete $tmpvars, so we will proceed all tests even if not defined
-        $reg='@\[!--\sIF\s([{}a-zA-Z0-9\.\,_]+)\s--\]@smU';
-        preg_match_all($reg, $this->xml, $matches, PREG_SET_ORDER);
-        //var_dump($tmpvars);exit;
-        foreach($matches as $match)   // For each match, if there is no entry into this->vars, we add it
-        {
-            if (! empty($match[1]) && ! isset($tmpvars[$match[1]]))
-            {
-                $tmpvars[$match[1]] = '';     // Not defined, so we set it to '', we just need entry into this->vars for next loop
-            }
-        }
+		// Search all tags fou into condition to complete $tmpvars, so we will proceed all tests even if not defined
+		$reg='@\[!--\sIF\s([{}a-zA-Z0-9\.\,_]+)\s--\]@smU';
+		$matches = array();
+		preg_match_all($reg, $this->xml, $matches, PREG_SET_ORDER);
+		//var_dump($tmpvars);exit;
+		foreach ($matches as $match) {   // For each match, if there is no entry into this->vars, we add it
+			if (! empty($match[1]) && ! isset($tmpvars[$match[1]])) {
+				$tmpvars[$match[1]] = '';     // Not defined, so we set it to '', we just need entry into this->vars for next loop
+			}
+		}
 
-        // Conditionals substitution
-        // Note: must be done before static substitution, else the variable will be replaced by its value and the conditional won't work anymore
-        foreach($tmpvars as $key => $value)
-        {
-            // If value is true (not 0 nor false nor null nor empty string)
-            if ($value)
-            {
-                // Remove the IF tag
-                $this->xml = str_replace('[!-- IF '.$key.' --]', '', $this->xml);
-                // Remove everything between the ELSE tag (if it exists) and the ENDIF tag
-                $reg = '@(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
-                $this->xml = preg_replace($reg, '', $this->xml);
-            }
-            // Else the value is false, then two cases: no ELSE and we're done, or there is at least one place where there is an ELSE clause, then we replace it
-            else
-            {
-                // Find all conditional blocks for this variable: from IF to ELSE and to ENDIF
-                $reg = '@\[!--\sIF\s' . $key . '\s--\](.*)(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
-                preg_match_all($reg, $this->xml, $matches, PREG_SET_ORDER);
-                foreach($matches as $match) { // For each match, if there is an ELSE clause, we replace the whole block by the value in the ELSE clause
-                    if (!empty($match[3])) $this->xml = str_replace($match[0], $match[3], $this->xml);
-                }
-                // Cleanup the other conditional blocks (all the others where there were no ELSE clause, we can just remove them altogether)
-                $this->xml = preg_replace($reg, '', $this->xml);
-            }
-        }
+		// Conditionals substitution
+		// Note: must be done before static substitution, else the variable will be replaced by its value and the conditional won't work anymore
+		foreach ($tmpvars as $key => $value) {
+			// If value is true (not 0 nor false nor null nor empty string)
+			if ($value) {
+				// Remove the IF tag
+				$this->xml = str_replace('[!-- IF '.$key.' --]', '', $this->xml);
+				// Remove everything between the ELSE tag (if it exists) and the ENDIF tag
+				$reg = '@(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
+				$this->xml = preg_replace($reg, '', $this->xml);
+			}
+			// Else the value is false, then two cases: no ELSE and we're done, or there is at least one place where there is an ELSE clause, then we replace it
+			else {
+				// Find all conditional blocks for this variable: from IF to ELSE and to ENDIF
+				$reg = '@\[!--\sIF\s' . $key . '\s--\](.*)(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
+				preg_match_all($reg, $this->xml, $matches, PREG_SET_ORDER);
+				foreach ($matches as $match) { // For each match, if there is an ELSE clause, we replace the whole block by the value in the ELSE clause
+					if (!empty($match[3])) $this->xml = str_replace($match[0], $match[3], $this->xml);
+				}
+				// Cleanup the other conditional blocks (all the others where there were no ELSE clause, we can just remove them altogether)
+				$this->xml = preg_replace($reg, '', $this->xml);
+			}
+		}
 
-        $this->xmlParsed .= str_replace(array_keys($tmpvars), array_values($tmpvars), $this->xml);
-        if ($this->hasChildren()) {
-            foreach ($this->children as $child) {
-                $this->xmlParsed = str_replace($child->xml, ($child->xmlParsed=="")?$child->merge():$child->xmlParsed, $this->xmlParsed);
-                $child->xmlParsed = '';
-            }
-        }
-        $reg = "/\[!--\sBEGIN\s$this->name\s--\](.*)\[!--\sEND\s$this->name\s--\]/sm";
-        $this->xmlParsed = preg_replace($reg, '$1', $this->xmlParsed);
+		$this->xmlParsed .= str_replace(array_keys($tmpvars), array_values($tmpvars), $this->xml);
+		if ($this->hasChildren()) {
+			foreach ($this->children as $child) {
+				$this->xmlParsed = str_replace($child->xml, ($child->xmlParsed=="")?$child->merge():$child->xmlParsed, $this->xmlParsed);
+				$child->xmlParsed = '';
+			}
+		}
+		$reg = "/\[!--\sBEGIN\s$this->name\s--\](.*)\[!--\sEND\s$this->name\s--\]/sm";
+		$this->xmlParsed = preg_replace($reg, '$1', $this->xmlParsed);
 		// Miguel Erill 09704/2017 - Add macro replacement to invoice lines
-        $this->xmlParsed = $this->macroReplace($this->xmlParsed);
-        $this->file->open($this->odf->getTmpfile());
-        foreach ($this->images as $imageKey => $imageValue) {
+		$this->xmlParsed = $this->macroReplace($this->xmlParsed);
+		$this->file->open($this->odf->getTmpfile());
+		foreach ($this->images as $imageKey => $imageValue) {
 			if ($this->file->getFromName('Pictures/' . $imageValue) === false) {
 				// Add the image inside the ODT document
 				$this->file->addFile($imageKey, 'Pictures/' . $imageValue);
 				// Add the image to the Manifest (which maintains a list of images, necessary to avoid "Corrupt ODT file. Repair?" when opening the file with LibreOffice)
 				$this->odf->addImageToManifest($imageValue);
 			}
-        }
-        $this->file->close();
+		}
+		$this->file->close();
 
-        return $this->xmlParsed;
-    }
+		return $this->xmlParsed;
+	}
 
-   /**
-    * Function to replace macros for invoice short and long month, invoice year
-    *
-    * Substitution occur when the invoice is generated, not considering the invoice date
-    * so do not (re)generate in a diferent date than the one that the invoice belongs to
-    * Perhaps it would be better to use the invoice issued date but I still do not know
-    * how to get it here
-    *
-    * Miguel Erill 09/04/2017
-    *
-    * @param	string	$value	String to convert
-    */
-    public function macroReplace($text)
-    {
-    	include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-        global $langs;
+	/**
+	* Function to replace macros for invoice short and long month, invoice year
+	*
+	* Substitution occur when the invoice is generated, not considering the invoice date
+	* so do not (re)generate in a diferent date than the one that the invoice belongs to
+	* Perhaps it would be better to use the invoice issued date but I still do not know
+	* how to get it here
+	*
+	* Miguel Erill 09/04/2017
+	*
+	* @param	string	$value	String to convert
+	*/
+	public function macroReplace($text)
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+		global $langs;
 
-        $hoy = dol_getdate(dol_now('tzuser'));
-        $dateinonemontharray = dol_get_next_month($hoy['mon'], $hoy['year']);
-        $nextMonth = $dateinonemontharray['month'];
+		$hoy = dol_getdate(dol_now('tzuser'));
+		$dateinonemontharray = dol_get_next_month($hoy['mon'], $hoy['year']);
+		$nextMonth = $dateinonemontharray['month'];
 
-        $patterns=array( '/__CURRENTDAY__/u','/__CURENTWEEKDAY__/u',
-                         '/__CURRENTMONTH__/u','/__CURRENTMONTHLONG__/u',
-                         '/__NEXTMONTH__/u','/__NEXTMONTHLONG__/u',
-                         '/__CURRENTYEAR__/u','/__NEXTYEAR__/u' );
-        $values=array( $hoy['mday'], $langs->transnoentitiesnoconv($hoy['weekday']),
-                       $hoy['mon'], $langs->transnoentitiesnoconv($hoy['month']),
-                       $nextMonth, monthArray($langs)[$nextMonth],
-                       $hoy['year'], $hoy['year']+1 );
+		$patterns=array( '/__CURRENTDAY__/u','/__CURENTWEEKDAY__/u',
+						 '/__CURRENTMONTH__/u','/__CURRENTMONTHLONG__/u',
+						 '/__NEXTMONTH__/u','/__NEXTMONTHLONG__/u',
+						 '/__CURRENTYEAR__/u','/__NEXTYEAR__/u' );
+		$values=array( $hoy['mday'], $langs->transnoentitiesnoconv($hoy['weekday']),
+					   $hoy['mon'], $langs->transnoentitiesnoconv($hoy['month']),
+					   $nextMonth, monthArray($langs)[$nextMonth],
+					   $hoy['year'], $hoy['year']+1 );
 
-        $text=preg_replace($patterns, $values, $text);
+		$text=preg_replace($patterns, $values, $text);
 
-	return $text;
-    }
+		return $text;
+	}
 
-    /**
-     * Analyse the XML code in order to find children
-     *
-     * @param string $xml   Xml
-     * @return Segment
-     */
-    protected function _analyseChildren($xml)
-    {
-        // $reg2 = "#\[!--\sBEGIN\s([\S]*)\s--\](?:<\/text:p>)?(.*)(?:<text:p\s.*>)?\[!--\sEND\s(\\1)\s--\]#sm";
-        $reg2 = "#\[!--\sBEGIN\s([\S]*)\s--\](.*)\[!--\sEND\s(\\1)\s--\]#sm";
-        preg_match_all($reg2, $xml, $matches);
-        for ($i = 0, $size = count($matches[0]); $i < $size; $i++) {
-            if ($matches[1][$i] != $this->name) {
-                $this->children[$matches[1][$i]] = new self($matches[1][$i], $matches[0][$i], $this->odf);
-            } else {
-                $this->_analyseChildren($matches[2][$i]);
-            }
-        }
-        return $this;
-    }
+	/**
+	 * Analyse the XML code in order to find children
+	 *
+	 * @param string $xml   Xml
+	 * @return Segment
+	 */
+	protected function _analyseChildren($xml)
+	{
+		// $reg2 = "#\[!--\sBEGIN\s([\S]*)\s--\](?:<\/text:p>)?(.*)(?:<text:p\s.*>)?\[!--\sEND\s(\\1)\s--\]#sm";
+		$reg2 = "#\[!--\sBEGIN\s([\S]*)\s--\](.*)\[!--\sEND\s(\\1)\s--\]#sm";
+		preg_match_all($reg2, $xml, $matches);
+		for ($i = 0, $size = count($matches[0]); $i < $size; $i++) {
+			if ($matches[1][$i] != $this->name) {
+				$this->children[$matches[1][$i]] = new self($matches[1][$i], $matches[0][$i], $this->odf);
+			} else {
+				$this->_analyseChildren($matches[2][$i]);
+			}
+		}
+		return $this;
+	}
 
-    /**
-     * Assign a template variable to replace
-     *
-     * @param string $key       Key
-     * @param string $value     Value
-     * @param string $encode    Encode
-     * @param string $charset   Charset
-     * @throws SegmentException
-     * @return Segment
-     */
-    public function setVars($key, $value, $encode = true, $charset = 'ISO-8859')
-    {
-        if (strpos($this->xml, $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT')) === false) {
-            //throw new SegmentException("var $key not found in {$this->getName()}");
-        }
+	/**
+	 * Assign a template variable to replace
+	 *
+	 * @param string $key       Key
+	 * @param string $value     Value
+	 * @param string $encode    Encode
+	 * @param string $charset   Charset
+	 * @throws SegmentException
+	 * @return Segment
+	 */
+	public function setVars($key, $value, $encode = true, $charset = 'ISO-8859')
+	{
+		if (strpos($this->xml, $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT')) === false) {
+			//throw new SegmentException("var $key not found in {$this->getName()}");
+		}
 
-        $tag = $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT');
+		$tag = $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT');
 
 		$this->vars[$tag] = $this->odf->convertVarToOdf($value, $encode, $charset);
-        
-        return $this;
-    }
-    /**
-     * Assign a template variable as a picture
-     *
-     * @param string $key name of the variable within the template
-     * @param string $value path to the picture
-     * @throws OdfException
-     * @return Segment
-     */
-    public function setImage($key, $value)
-    {
-        $filename = strtok(strrchr($value, '/'), '/.');
-        $file = substr(strrchr($value, '/'), 1);
-        $size = @getimagesize($value);
-        if ($size === false) {
-            throw new OdfException("Invalid image");
-        }
-        // Set the width and height of the page
-        list ($width, $height) = $size;
-        $width *= Odf::PIXEL_TO_CM;
-        $height *= Odf::PIXEL_TO_CM;
-        // Fix local-aware issues (eg: 12,10 -> 12.10)
-        $width = sprintf("%F", $width);
-        $height = sprintf("%F", $height);
 
-        $xml = <<<IMG
+		return $this;
+	}
+	/**
+	 * Assign a template variable as a picture
+	 *
+	 * @param string $key name of the variable within the template
+	 * @param string $value path to the picture
+	 * @throws OdfException
+	 * @return Segment
+	 */
+	public function setImage($key, $value)
+	{
+		$filename = strtok(strrchr($value, '/'), '/.');
+		$file = substr(strrchr($value, '/'), 1);
+		$size = @getimagesize($value);
+		if ($size === false) {
+			throw new OdfException("Invalid image");
+		}
+		// Set the width and height of the page
+		list ($width, $height) = $size;
+		$width *= Odf::PIXEL_TO_CM;
+		$height *= Odf::PIXEL_TO_CM;
+		// Fix local-aware issues (eg: 12,10 -> 12.10)
+		$width = sprintf("%F", $width);
+		$height = sprintf("%F", $height);
+
+		$xml = <<<IMG
 <draw:frame draw:style-name="fr1" draw:name="$filename" text:anchor-type="aschar" svg:width="{$width}cm" svg:height="{$height}cm" draw:z-index="3"><draw:image xlink:href="Pictures/$file" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/></draw:frame>
 IMG;
-        $this->images[$value] = $file;
-        $this->setVars($key, $xml, false);
-        return $this;
-    }
-    /**
-     * Shortcut to retrieve a child
-     *
-     * @param string $prop      Prop
-     * @return Segment
-     * @throws SegmentException
-     */
-    public function __get($prop)
-    {
-        if (array_key_exists($prop, $this->children)) {
-            return $this->children[$prop];
-        } else {
-            throw new SegmentException('child ' . $prop . ' does not exist');
-        }
-    }
-    /**
-     * Proxy for setVars
-     *
-     * @param string $meth      Meth
-     * @param array $args       Args
-     * @return Segment
-     */
-    public function __call($meth, $args)
-    {
-        try {
-            return $this->setVars($meth, $args[0]);
-        } catch (SegmentException $e) {
-            throw new SegmentException("method $meth nor var $meth exist");
-        }
-    }
-    /**
-     * Returns the parsed XML
-     *
-     * @return string
-     */
-    public function getXmlParsed()
-    {
-        return $this->xmlParsed;
-    }
+		$this->images[$value] = $file;
+		$this->setVars($key, $xml, false);
+		return $this;
+	}
+	/**
+	 * Shortcut to retrieve a child
+	 *
+	 * @param string $prop      Prop
+	 * @return Segment
+	 * @throws SegmentException
+	 */
+	public function __get($prop)
+	{
+		if (array_key_exists($prop, $this->children)) {
+			return $this->children[$prop];
+		} else {
+			throw new SegmentException('child ' . $prop . ' does not exist');
+		}
+	}
+	/**
+	 * Proxy for setVars
+	 *
+	 * @param string $meth      Meth
+	 * @param array $args       Args
+	 * @return Segment
+	 */
+	public function __call($meth, $args)
+	{
+		try {
+			return $this->setVars($meth, $args[0]);
+		} catch (SegmentException $e) {
+			throw new SegmentException("method $meth nor var $meth exist");
+		}
+	}
+	/**
+	 * Returns the parsed XML
+	 *
+	 * @return string
+	 */
+	public function getXmlParsed()
+	{
+		return $this->xmlParsed;
+	}
 }
-

From cd1f5fead1f1d35bccea5ab7d0a9963006944309 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jan 2022 13:51:56 +0100
Subject: [PATCH 76/82] phpcs

---
 htdocs/mrp/js/lib_dispatch.js.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/mrp/js/lib_dispatch.js.php b/htdocs/mrp/js/lib_dispatch.js.php
index d8285ac75c1..e8ca84d7a4e 100644
--- a/htdocs/mrp/js/lib_dispatch.js.php
+++ b/htdocs/mrp/js/lib_dispatch.js.php
@@ -70,14 +70,14 @@ function addDispatchLine(index, type, mode)
 	mode = mode || 'qtymissing'
 
 	console.log("fourn/js/lib_dispatch.js.php Split line type="+type+" index="+index+" mode="+mode);
-    if(mode == 'qtymissingconsume') {
-        var inputId = 'qtytoconsume';
-        var warehouseId = 'idwarehouse';
-    }
-    else {
-        var inputId = 'qtytoproduce';
-        var warehouseId = 'idwarehousetoproduce';
-    }
+	if(mode == 'qtymissingconsume') {
+		var inputId = 'qtytoconsume';
+		var warehouseId = 'idwarehouse';
+	}
+	else {
+		var inputId = 'qtytoproduce';
+		var warehouseId = 'idwarehousetoproduce';
+	}
 	var nbrTrs = $("tr[name^='"+type+"_"+index+"']").length; 				// position of line for batch
 	var $row = $("tr[name='"+type+'_'+index+"_1']").clone(true); 				// clone last batch line to jQuery object
 	var	qtyOrdered = parseFloat($("#qty_ordered_"+index).val()); 	// Qty ordered is same for all rows

From 15d4d44cb55da948b1e5872f89af27ccedb75ea4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jan 2022 14:01:41 +0100
Subject: [PATCH 77/82] css

---
 htdocs/theme/md/style.css.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 5e59c6be224..02075c6fb87 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -445,7 +445,7 @@ input, select {
 	margin-top:1px;
 }
 #mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
-	background: var(--butactionbg);;
+	background: var(--butactionbg);
 	color: #FFF !important;
 	border-radius: 3px;
 	border-collapse: collapse;

From 7ce6f1393397bccbda9346308c3b4c3a7ebe01a0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jan 2022 14:07:13 +0100
Subject: [PATCH 78/82] Fix php8

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index dbf8f3869e0..cf00dc0e317 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2266,7 +2266,10 @@ abstract class CommonObject
 	 */
 	public function setPaymentMethods($id)
 	{
+		$error = 0; $notrigger = 0;
+
 		dol_syslog(get_class($this).'::setPaymentMethods('.$id.')');
+
 		if ($this->statut >= 0 || $this->element == 'societe') {
 			// TODO uniformize field name
 			$fieldname = 'fk_mode_reglement';

From 9180e9a5c65dd6019e04ce2e38098bfe6acd5e5d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jan 2022 14:42:26 +0100
Subject: [PATCH 79/82] Clean code

---
 htdocs/includes/odtphp/Segment.php | 7 ++++---
 htdocs/includes/odtphp/odf.php     | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/includes/odtphp/Segment.php b/htdocs/includes/odtphp/Segment.php
index 811cf62dadd..b57983321a3 100644
--- a/htdocs/includes/odtphp/Segment.php
+++ b/htdocs/includes/odtphp/Segment.php
@@ -223,16 +223,17 @@ class Segment implements IteratorAggregate, Countable
 	 */
 	public function setVars($key, $value, $encode = true, $charset = 'ISO-8859')
 	{
-		if (strpos($this->xml, $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT')) === false) {
+		$tag = $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT');
+
+		if (strpos($this->xml, $tag) === false) {
 			//throw new SegmentException("var $key not found in {$this->getName()}");
 		}
 
-		$tag = $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT');
-
 		$this->vars[$tag] = $this->odf->convertVarToOdf($value, $encode, $charset);
 
 		return $this;
 	}
+
 	/**
 	 * Assign a template variable as a picture
 	 *
diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index 80183843b36..6c63da727b7 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -122,7 +122,8 @@ class Odf
 	}
 
 	/**
-	 * Assing a template variable
+	 * Assing a template variable into ->vars.
+	 * For example, key is {object_date} and value is '2021-01-01'
 	 *
 	 * @param string   $key        Name of the variable within the template
 	 * @param string   $value      Replacement value
@@ -134,6 +135,7 @@ class Odf
 	public function setVars($key, $value, $encode = true, $charset = 'ISO-8859')
 	{
 		$tag = $this->config['DELIMITER_LEFT'] . $key . $this->config['DELIMITER_RIGHT'];
+
 		// TODO Warning string may be:
 		// <text:span text:style-name="T13">{</text:span><text:span text:style-name="T12">aaa</text:span><text:span text:style-name="T13">}</text:span>
 		// instead of {aaa} so we should enhance this function.

From 28b9ead68803fb7a64a424cc4ae11039e322c727 Mon Sep 17 00:00:00 2001
From: BB2A Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 26 Jan 2022 15:06:51 +0100
Subject: [PATCH 80/82] ADD config text color

---
 htdocs/admin/ihm.php                 |  7 ++++
 htdocs/core/lib/usergroups.lib.php   | 48 +++++++++++++++++++++++++++-
 htdocs/langs/en_US/admin.lang        |  1 +
 htdocs/theme/eldy/btn.inc.php        |  4 ++-
 htdocs/theme/eldy/global.inc.php     |  2 +-
 htdocs/theme/eldy/style.css.php      |  6 +++-
 htdocs/theme/eldy/theme_vars.inc.php |  1 +
 htdocs/theme/md/btn.inc.php          |  4 ++-
 htdocs/theme/md/style.css.php        |  9 ++++--
 htdocs/theme/md/theme_vars.inc.php   |  1 +
 10 files changed, 76 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index ea675ed9001..e70e6a4cdd7 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -207,6 +207,13 @@ if ($action == 'update') {
 		} else {
 			dolibarr_set_const($db, 'THEME_ELDY_BTNACTION', $val, 'chaine', 0, '', $conf->entity);
 		}
+
+		$val=(implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTBTNACTION'), array()))));
+		if ($val == '') {
+			dolibarr_del_const($db, 'THEME_ELDY_TEXTBTNACTION', $conf->entity);
+		} else {
+			dolibarr_set_const($db, 'THEME_ELDY_TEXTBTNACTION', $val, 'chaine', 0, '', $conf->entity);
+		}
 	}
 
 	if ($mode == 'dashboard') {
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 9ee6afa182e..1f990bd955d 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2010-2017	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2015	    Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Ferran Marcet       <fmarcet@2byte.es>
- * Copyright (C) 2021       Anthony Berton          <bertonanthony@gmail.com>
+ * Copyright (C) 2021       Anthony Berton      <bertonanthony@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
@@ -952,6 +952,52 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '</tr>';
 	}
 
+		// Text btn action
+	if ($foruserprofile) {
+		/*
+		 print '<tr class="oddeven">';
+		 print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
+		 print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TEXTBTNACTION:$langs->trans("Default")).'</td>';
+		 print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TEXTBTNACTION" id="check_THEME_ELDY_TEXTBTNACTION" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TEXTBTNACTION)?" checked":"");
+		 print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"'; // Disabled for demo
+		 print '> '.$langs->trans("UsePersonalValue").'</td>';
+		 print '<td>';
+		 if ($edit)
+		 {
+		 print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTBTNACTION,array()),''),'THEME_ELDY_TEXTBTNACTION','',1).' ';
+		 }
+		 else
+		 {
+		 $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BTNACTION,array()),'');
+		 if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+		 else print '';
+		 }
+			if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+			print '</td>';*/
+	} else {
+		$default = (empty($textbutaction) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($textbutaction)));
+
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("TextBtnActionColor").'</td>';
+		print '<td colspan="'.($colspan - 1).'">';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTBTNACTION) ? $conf->global->THEME_ELDY_TEXTBTNACTION : ''), array()), ''), 'THEME_ELDY_TEXTBTNACTION', '', 1, '', '', 'colortextbtnaction').' ';
+		} else {
+			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTBTNACTION, array()), '');
+			if ($color) {
+				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			} else {
+				//print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';
+				//print '<span style="color: #000078">'.$langs->trans("Default").'</span>';
+				print $langs->trans("Default");
+			}
+		}
+		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong><span style="color: #000">'.$default.'</span></strong> ';
+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</td>';
+		print '</tr>';
+	}
+
 	// Use MAIN_OPTIMIZEFORTEXTBROWSER
 	if ($foruserprofile && !empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 		//$default=yn($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 99f87413d06..64c9cf5e0d7 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1918,6 +1918,7 @@ HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
 HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
 BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index 1b92ef80f04..d5a3f51e125 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -11,6 +11,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 			--btncolorborder: #FFF;
 			--butactiondeletebg: rgb(234,228,225);
 			--butactionbg: rgb(<?php print $butactionbg; ?>);
+			--textbutaction: rgb(<?php print $textbutaction; ?>);
 }
 
 <?php
@@ -28,6 +29,7 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
             --btncolorborder: #2b2c2e;
             --butactiondeletebg: rgb(252,84,91);
 			--butactionbg: rgb(173,140,79);
+			--textbutaction: rgb(255,255,255);
 
       }\n";
 	if ($conf->global->THEME_DARKMODEENABLED != 2) {
@@ -67,7 +69,7 @@ span.butAction, span.butActionDelete {
 }
 .butAction {
 	background: var(--butactionbg);
-	color: #FFF !important;
+	color: var(--textbutaction) !important;
 	/* background: rgb(230, 232, 239); */
 }
 .butActionRefused, .butAction, .butActionDelete {
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index deb7cdadf9e..a26fe1aa2fa 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -228,7 +228,7 @@ input, select {
 }
 #mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
 	background: var(--butactionbg);
-	color: #FFF !important;
+	color: var(--textbutaction)!important;
 	border-radius: 3px;
 	border-collapse: collapse;
 	border: none;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index edeab565f9d..8029ce93681 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -154,6 +154,9 @@ if (!isset($conf->global->THEME_ELDY_TEXTLINK)) {
 if (!isset($conf->global->THEME_ELDY_BTNACTION)) {
 	$conf->global->THEME_ELDY_BTNACTION = $butactionbg;
 }
+if (!isset($conf->global->THEME_ELDY_TEXTBTNACTION)) {
+	$conf->global->THEME_ELDY_TEXTBTNACTION = $textbutaction;
+}
 // Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) {
 	$conf->global->THEME_ELDY_BACKTABCARD1 = '255,255,255'; // card
@@ -181,7 +184,8 @@ $colortexttitle      = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (emp
 $colortexttitlelink  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $conf->global->THEME_ELDY_TEXTTITLELINK) : (empty($user->conf->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $user->conf->THEME_ELDY_TEXTTITLELINK);
 $colortext           = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
 $colortextlink       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTLINK) ? $colortextlink : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK);
-$butactionbg       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BTNACTION) ? $butactionbg : $conf->global->THEME_ELDY_BTNACTION) : (empty($user->conf->THEME_ELDY_BTNACTION) ? $butactionbg : $user->conf->THEME_ELDY_BTNACTION);
+$butactionbg       	 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BTNACTION) ? $butactionbg : $conf->global->THEME_ELDY_BTNACTION) : (empty($user->conf->THEME_ELDY_BTNACTION) ? $butactionbg : $user->conf->THEME_ELDY_BTNACTION);
+$textbutaction     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $conf->global->THEME_ELDY_TEXTBTNACTION) : (empty($user->conf->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $user->conf->THEME_ELDY_TEXTBTNACTION);
 $fontsize            = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE1) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1);
 $fontsizesmaller     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE2) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE2) : (empty($user->conf->THEME_ELDY_FONT_SIZE2) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE2);
 
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 41d162e6cbc..3346ac5d73d 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -75,6 +75,7 @@ $topMenuFontSize = '1.1em';
 $toolTipBgColor = 'rgba(255, 255, 255, 0.96)';
 $toolTipFontColor = '#333';
 $butactionbg = '150, 110, 162, 0.95';
+$textbutaction = '255, 255, 255';
 
 // text color
 $textSuccess   = '#28a745';
diff --git a/htdocs/theme/md/btn.inc.php b/htdocs/theme/md/btn.inc.php
index 174d53eb516..3ab9550e42d 100644
--- a/htdocs/theme/md/btn.inc.php
+++ b/htdocs/theme/md/btn.inc.php
@@ -11,6 +11,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 			--btncolorborder: #FFF;
 			--butactiondeletebg: rgb(234,228,225);
 			--butactionbg: rgb(<?php print $butactionbg; ?>);
+			--textbutaction: rgb(<?php print $textbutaction; ?>);
 }
 
 <?php
@@ -28,6 +29,7 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
             --btncolorborder: #2b2c2e;
             --butactiondeletebg: rgb(252,84,91);
 			--butactionbg: rgb(173,140,79);
+			--textbutaction: rgb(255,255,255);
 
       }\n";
 	if ($conf->global->THEME_DARKMODEENABLED != 2) {
@@ -62,7 +64,7 @@ span.butAction, span.butActionDelete {
 
 .butAction {
 	background: var(--butactionbg);
-	color: #FFF !important;
+	color: var(--textbutaction) !important;
 	/* background: rgb(230, 232, 239); */
 }
 .butActionRefused, .butAction, .butActionDelete {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 5e59c6be224..7394cbe697f 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -152,6 +152,9 @@ if (!isset($conf->global->THEME_ELDY_TEXTLINK)) {
 if (!isset($conf->global->THEME_ELDY_BTNACTION)) {
 	$conf->global->THEME_ELDY_BTNACTION = $butactionbg;
 }
+if (!isset($conf->global->THEME_ELDY_TEXTBTNACTION)) {
+	$conf->global->THEME_ELDY_TEXTBTNACTION = $textbutaction;
+}
 
 // Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) {
@@ -182,6 +185,7 @@ $colortexttitlelink  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (emp
 $colortext           = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
 $colortextlink       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTLINK) ? $colortext : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK);
 $butactionbg       	 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BTNACTION) ? $butactionbg : $conf->global->THEME_ELDY_BTNACTION) : (empty($user->conf->THEME_ELDY_BTNACTION) ? $butactionbg : $user->conf->THEME_ELDY_BTNACTION);
+$textbutaction     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $conf->global->THEME_ELDY_TEXTBTNACTION) : (empty($user->conf->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $user->conf->THEME_ELDY_TEXTBTNACTION);
 $fontsize            = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE1) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1);
 $fontsizesmaller     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE2) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE2) : (empty($user->conf->THEME_ELDY_FONT_SIZE2) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE2);
 
@@ -344,6 +348,7 @@ print '*/'."\n";
 	--productlinestocktoolow: #884400;
 	--infoboxmoduleenabledbgcolor : linear-gradient(0.4turn, #fff, #fff, #fff, #e4efe8);
 	--butactionbg : #<?php print $butactionbg; ?>;
+	--textbutaction : #<?php print $textbutaction; ?>;
 }
 
 body {
@@ -445,8 +450,8 @@ input, select {
 	margin-top:1px;
 }
 #mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
-	background: var(--butactionbg);;
-	color: #FFF !important;
+	background: var(--butactionbg);
+	color: var(--textbutaction)!important;
 	border-radius: 3px;
 	border-collapse: collapse;
 	border: none;
diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index d77b994dab8..5f26d0d83bd 100644
--- a/htdocs/theme/md/theme_vars.inc.php
+++ b/htdocs/theme/md/theme_vars.inc.php
@@ -70,6 +70,7 @@ $topMenuFontSize = '1.1em';
 $toolTipBgColor = 'rgba(255, 255, 255, 0.96)';
 $toolTipFontColor = '#333';
 $butactionbg = '150, 110, 162, 0.95';
+$textbutaction = '255, 255, 255, 255';
 
 // text color
 $textSuccess   = '#28a745';

From 512df3c580c1a2b16a54de5be0c573b9ea945dac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jan 2022 15:12:42 +0100
Subject: [PATCH 81/82] Try to address a better solution for #19776

---
 htdocs/compta/facture/card-rec.php                 |  1 +
 .../doc/doc_generic_invoice_odt.modules.php        | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index a76332197bc..3909d9437b4 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -1354,6 +1354,7 @@ if ($action == 'create') {
 			$dateexample = $object->date_when;
 		}
 
+		// Help of substitution key
 		$substitutionarray = getCommonSubstitutionArray($langs, 2, null, $object);
 
 		$substitutionarray['__INVOICE_PREVIOUS_MONTH__'] = $langs->trans("PreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'm'), '%m').')';
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index 60e3d6bcfdd..b8bfcdc16ac 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -400,6 +400,20 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_propal, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 
+				// Complete also with substitution from keys directly found into template
+				// TODO Search all tags {object_...:xxxx} into template then loop on this found tags to analyze them and the the corresponding
+				// property of object and use the xxxx to know how to format it.
+				// Before that, we hard code this substitution as if we have found them into the template.
+				$tmparray['object_PREVIOUS_MONTH'] = dol_print_date(dol_time_plus_duree($this->date, -1, 'm'), '%m');
+				$tmparray['object_MONTH'] = dol_print_date($this->date, '%m');
+				$tmparray['object_NEXT_MONTH'] = dol_print_date(dol_time_plus_duree($this->date, 1, 'm'), '%m');
+				$tmparray['object_PREVIOUS_MONTH_TEXT'] = dol_print_date(dol_time_plus_duree($this->date, -1, 'm'), '%B');
+				$tmparray['object_MONTH_TEXT'] = dol_print_date($this->date, '%B');
+				$tmparray['object_NEXT_MONTH_TEXT'] = dol_print_date(dol_time_plus_duree($this->date, 1, 'm'), '%B');
+				$tmparray['object_PREVIOUS_YEAR'] = dol_print_date(dol_time_plus_duree($this->date, -1, 'y'), '%Y');
+				$tmparray['object_YEAR'] = dol_print_date($this->date, '%Y');
+				$tmparray['object_NEXT_YEAR'] = dol_print_date(dol_time_plus_duree($this->date, 1, 'y'), '%Y');
+
 				// Call the ODTSubstitution hook
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

From 538c5f14d314cf96e0d30dfc734b542f2c3b0740 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jan 2022 19:56:02 +0100
Subject: [PATCH 82/82] Fix phpcs

---
 htdocs/core/class/commonobject.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index cf00dc0e317..dcc31870b1c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2266,6 +2266,8 @@ abstract class CommonObject
 	 */
 	public function setPaymentMethods($id)
 	{
+		global $user;
+
 		$error = 0; $notrigger = 0;
 
 		dol_syslog(get_class($this).'::setPaymentMethods('.$id.')');