From 6de6782458094fdeed32243016a965f61c021088 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 5 Mar 2021 08:41:04 +0100
Subject: [PATCH 01/32] fix: set class at right place

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

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 46e85707497..974bdce6d26 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1382,7 +1382,7 @@ class FormFile
 							// $section is inside $param
 							$newparam.=preg_replace('/&file=.*$/', '', $param);		// We don't need param file=
 							$backtopage = DOL_URL_ROOT.'/ecm/index.php?&section_dir='.urlencode($relativepath).$newparam;
-							print '<a class="editfielda" href="'.DOL_URL_ROOT.'/ecm/file_card.php?urlfile='.urlencode($file['name']).$param.'&backtopage='.urlencode($backtopage).'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
+							print '<a class="editfielda editfilelink" href="'.DOL_URL_ROOT.'/ecm/file_card.php?urlfile='.urlencode($file['name']).$param.'&backtopage='.urlencode($backtopage).'" rel="'.urlencode($file['name']).'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
 						}
 
 						if (empty($useinecm) || $useinecm == 2 || $useinecm == 6)	// 6=Media file manager
@@ -1408,7 +1408,7 @@ class FormFile
 							if ($permtoeditline)
 							{
 								$paramsectiondir = (in_array($modulepart, array('medias', 'ecm')) ? '&section_dir='.urlencode($relativepath) : '');
-								print '<a class="editfielda reposition" href="'.(($useinecm == 1 || $useinecm == 5) ? '#' : ($url.'?action=editfile&urlfile='.urlencode($filepath).$paramsectiondir.$param)).'" class="editfilelink" rel="'.$filepath.'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
+								print '<a class="editfielda reposition editfilelink" href="'.(($useinecm == 1 || $useinecm == 5) ? '#' : ($url.'?action=editfile&urlfile='.urlencode($filepath).$paramsectiondir.$param)).'" rel="'.$filepath.'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
 							}
 						}
 						if ($permonobject)

From 7543b63a6ed9ff214c92b5768ad948284416f59b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Fri, 5 Mar 2021 08:49:56 +0100
Subject: [PATCH 02/32] Fix #16544

---
 htdocs/societe/consumption.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index e9514365c0f..4acf31c059e 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -422,6 +422,7 @@ if ($sql_select)
 		$documentstatic->statut = $objp->status;
 		$documentstatic->status = $objp->status;
 		$documentstatic->paye = $objp->paid;
+		$documentstatic->alreadypaid = $objp->paid;
 
 		if (is_object($documentstaticline)) $documentstaticline->statut = $objp->status;
 
@@ -436,6 +437,8 @@ if ($sql_select)
 		if ($type_element == 'contract')
 		{
 			print $documentstaticline->getLibStatut(2);
+		} elseif ($type_element == 'invoice') {
+			print $documentstatic->getLibStatut(5, $objp->paid);
 		}
 		else
 		{

From fee5bbf65b4346e40d8a67f84c287d4110945490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 7 Mar 2021 09:12:46 +0100
Subject: [PATCH 03/32] fix usage of else if

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

diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 5e6667c58ad..3cfc3c74db9 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -68,7 +68,7 @@ $nowarray = dol_getdate($now);
 
 if (!GETPOSTISSET("date_startmonth")) {
 	$date_start = dol_get_first_day($nowarray['year'], $nowarray['mon'], 'tzuserrel');
-} else if (GETPOST("date_startmonth") > 0) {
+} elseif (GETPOST("date_startmonth") > 0) {
 	$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth", 'int'), GETPOST("date_startday", 'int'), GETPOST("date_startyear", 'int'), 'tzuserrel');
 } else {
 	$date_start = -1;

From 4834f5fdf42986bdf402a29994cfd88a33aa5530 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 7 Mar 2021 17:32:43 +0100
Subject: [PATCH 04/32] Fix get thirdparties by barcode or email

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

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 3e8a6c91f92..27493d14515 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1815,7 +1815,7 @@ class Thirdparties extends DolibarrApi
 		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
-		if ($rowid == 0) {
+		if ($rowid == 0 && empty($email) && empty($barcode)) {
 			$result = $this->company->initAsSpecimen();
 		} else {
 			$result = $this->company->fetch($rowid, $ref, $ref_ext, $barcode, $idprof1, $idprof2, $idprof3, $idprof4, $idprof5, $idprof6, $email, $ref_alias);

From c0c9ac439f340be36a41f2a3dbf47b2f3535d8d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 8 Mar 2021 00:23:05 +0100
Subject: [PATCH 05/32] Update api_agendaevents.class.php

---
 htdocs/comm/action/class/api_agendaevents.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index e09bc905b96..d9feb4472b6 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -66,7 +66,7 @@ class AgendaEvents extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->agenda->myactions->read) {
             throw new RestException(401, "Insufficient rights to read an event");
         }
-        if ($id == 0) {
+        if ($id === 0) {
             $result = $this->actioncomm->initAsSpecimen();
         } else {
             $result = $this->actioncomm->fetch($id);

From ec8baa6bff9b921e3591036ac22d340017369e39 Mon Sep 17 00:00:00 2001
From: ksar <35605507+ksar-ksar@users.noreply.github.com>
Date: Mon, 8 Mar 2021 10:00:19 +0100
Subject: [PATCH 06/32] Update commondocgenerator.class.php

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

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 03a5154f23f..ec05ad5d98d 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -798,6 +798,15 @@ abstract class CommonDocGenerator
 
 		$resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key, $outputlangs);
 
+		// Load product data optional fields to the line -> enables to use "line_product_options_{extrafield}"
+		if (isset($line->fk_product) && $line->fk_product > 0)
+		{
+			$tmpproduct = new Product($this->db);
+			$result = $tmpproduct->fetch($line->fk_product);
+			foreach ($tmpproduct->array_options as $key=>$label)
+				$resarray["line_product_".$key] = $label;
+		}
+
 		return $resarray;
 	}
 

From cbb7751a157143f850e98c682bee61392e8bc4c4 Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Mon, 8 Mar 2021 11:51:18 +0100
Subject: [PATCH 07/32] FIX : rounding amount on card updating

---
 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 d7f20622a43..9aa17914828 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -546,7 +546,7 @@ if ($id > 0)
 		if ($action == 'edit')
 		{
 			print '<tr><td>'.$langs->trans("AmountTTC")."</td><td>";
-			print '<input type="text" name="amount" size="12" class="flat" value="'.$object->amount.'">';
+			print '<input type="text" name="amount" size="12" class="flat" value="'.price($object->amount, 0, $outputlangs, 1, -1, 2).'">';
 			print "</td></tr>";
 		}
 		else {

From 67c6577177cf5e58f81c140ca6cb4d46e840a0f6 Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Mon, 8 Mar 2021 15:47:02 +0100
Subject: [PATCH 08/32] FIX : Add "Now" link on social charges card creation

---
 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 d7f20622a43..dd5869b47c9 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -343,7 +343,7 @@ if ($action == 'create')
 	print $langs->trans("Date");
 	print '</td>';
 	print '<td>';
-	print $form->selectDate(!empty($dateech) ? $dateech : '-1', 'ech', 0, 0, 0, 'charge', 1);
+	print $form->selectDate(!empty($dateech) ? $dateech : '-1', 'ech', 0, 0, 0, 'charge', 1, 1);
 	print '</td>';
 	print "</tr>\n";
 

From 77b60d4d1cca0452b368ad8a55bc21ed3489e97f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 Mar 2021 16:20:15 +0100
Subject: [PATCH 09/32] Update api_thirdparties.class.php

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

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 27493d14515..f88668524ac 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1815,7 +1815,7 @@ class Thirdparties extends DolibarrApi
 		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
-		if ($rowid == 0 && empty($email) && empty($barcode)) {
+		if ($rowid === 0 && empty($email) && empty($barcode)) {
 			$result = $this->company->initAsSpecimen();
 		} else {
 			$result = $this->company->fetch($rowid, $ref, $ref_ext, $barcode, $idprof1, $idprof2, $idprof3, $idprof4, $idprof5, $idprof6, $email, $ref_alias);

From 3b9f38caa1f74a00c80a206446eb9501899f531d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 Mar 2021 16:22:26 +0100
Subject: [PATCH 10/32] Update api_thirdparties.class.php

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

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index f88668524ac..492916935f8 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1793,7 +1793,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * Return an array with thirdparty informations
 	 *
-	 * @param    int	$rowid      Id of third party to load
+	 * @param    int	$rowid      Id of third party to load (Use 0 to get a specimen record, use null to use other search criterias)
 	 * @param    string	$ref        Reference of third party, name (Warning, this can return several records)
 	 * @param    string	$ref_ext    External reference of third party (Warning, this information is a free field not provided by Dolibarr)
 	 * @param    string	$barcode    Barcode of third party to load
@@ -1815,7 +1815,7 @@ class Thirdparties extends DolibarrApi
 		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
-		if ($rowid === 0 && empty($email) && empty($barcode)) {
+		if ($rowid === 0) {
 			$result = $this->company->initAsSpecimen();
 		} else {
 			$result = $this->company->fetch($rowid, $ref, $ref_ext, $barcode, $idprof1, $idprof2, $idprof3, $idprof4, $idprof5, $idprof6, $email, $ref_alias);

From 20c30bade8cf1c229b1be855d7ca3700117a3b00 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 Mar 2021 16:30:32 +0100
Subject: [PATCH 11/32] Update card.php

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

diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 9aa17914828..e8697aedea8 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -546,11 +546,11 @@ if ($id > 0)
 		if ($action == 'edit')
 		{
 			print '<tr><td>'.$langs->trans("AmountTTC")."</td><td>";
-			print '<input type="text" name="amount" size="12" class="flat" value="'.price($object->amount, 0, $outputlangs, 1, -1, 2).'">';
+			print '<input type="text" name="amount" size="12" class="flat" value="'.price($object->amount).'">';
 			print "</td></tr>";
 		}
 		else {
-			print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
+			print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($object->amount).'</td></tr>';
 		}
 
 		// Mode of payment

From 14d6893c63fa062a16b6221d823b79bdd5321973 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 Mar 2021 18:56:32 +0100
Subject: [PATCH 12/32] Complete fields of product

---
 htdocs/product/class/product.class.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 97daf343d3f..9abd881eb05 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -421,9 +421,10 @@ class Product extends CommonObject
 	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
 		'ref'           =>array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
-		'barcode'       =>array('type'=>'varchar(255)', 'label'=>'Barcode', 'enabled'=>'!empty($conf->barcode->enabled)', 'visible'=>-1, 'showoncombobox'=>1),
-		'entity'        =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20),
-		'label'         =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1),
+		'entity'        =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>5),
+		'label'         =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>15),
+		'barcode'       =>array('type'=>'varchar(255)', 'label'=>'Barcode', 'enabled'=>'!empty($conf->barcode->enabled)', 'position'=>20, 'visible'=>-1, 'showoncombobox'=>1),
+		'fk_barcode_type' => array('type'=>'integer', 'label'=>'BarcodeType', 'enabled'=>'1', 'position'=>21, 'notnull'=>0, 'visible'=>-1,),
 		'note_public'   =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61),
 		'note'          =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>62),
 		'datec'         =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500),
@@ -432,6 +433,10 @@ class Product extends CommonObject
 		'fk_user_author'=>array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>510, 'foreignkey'=>'llx_user.rowid'),
 		'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
 		//'fk_user_valid' =>array('type'=>'integer',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
+		'localtax1_tx' => array('type'=>'double(6,3)', 'label'=>'Localtax1tx', 'enabled'=>'1', 'position'=>150, 'notnull'=>0, 'visible'=>-1,),
+		'localtax1_type' => array('type'=>'varchar(10)', 'label'=>'Localtax1type', 'enabled'=>'1', 'position'=>155, 'notnull'=>1, 'visible'=>-1,),
+		'localtax2_tx' => array('type'=>'double(6,3)', 'label'=>'Localtax2tx', 'enabled'=>'1', 'position'=>160, 'notnull'=>0, 'visible'=>-1,),
+		'localtax2_type' => array('type'=>'varchar(10)', 'label'=>'Localtax2type', 'enabled'=>'1', 'position'=>165, 'notnull'=>1, 'visible'=>-1,),
 		'import_key'    =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0, 'position'=>1000),
 		//'tosell'       =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>0, 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
 		//'tobuy'        =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>0, 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),

From 28c04a684f7cd384a35608070aa505a3fbae27a6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 Mar 2021 19:09:02 +0100
Subject: [PATCH 13/32] Fix position of field

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

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 cc0bb4224b2..cc0386621a8 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
@@ -329,7 +329,7 @@ ALTER TABLE llx_product MODIFY COLUMN desiredstock float;
 ALTER TABLE llx_product_warehouse_properties MODIFY COLUMN seuil_stock_alerte float;
 ALTER TABLE llx_product_warehouse_properties MODIFY COLUMN desiredstock float;
 
-ALTER TABLE llx_product ADD COLUMN fk_state integer DEFAULT NULL;
+ALTER TABLE llx_product ADD COLUMN fk_state integer DEFAULT NULL AFTER fk_country;
 
 ALTER TABLE llx_projet ADD COLUMN email_msgid varchar(255);
 ALTER TABLE llx_ticket ADD COLUMN email_msgid varchar(255);

From de1cf54e2f25cb691831c20862bcf880fd55642c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 9 Mar 2021 00:20:28 +0100
Subject: [PATCH 14/32] Update box_members_by_type.php

---
 htdocs/core/boxes/box_members_by_type.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/boxes/box_members_by_type.php b/htdocs/core/boxes/box_members_by_type.php
index 5d32f9663d5..cf81eaac57c 100644
--- a/htdocs/core/boxes/box_members_by_type.php
+++ b/htdocs/core/boxes/box_members_by_type.php
@@ -187,7 +187,7 @@ class box_members_by_type extends ModeleBoxes
 				);
 				$line++;
 				foreach ($AdherentType as $key => $adhtype) {
-					$SommeA += isset($MemberToValidate[$key]) ? $MemberToValidate[$key] : 0;
+					$SommeA += isset($MembersToValidate[$key]) ? $MembersToValidate[$key] : 0;
 					$SommeB += isset($MembersValidated[$key]) ? $MembersValidated[$key] - (isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0) : 0;
 					$SommeC += isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0;
 					$SommeD += isset($MembersResiliated[$key]) ? $MembersResiliated[$key] : 0;
@@ -198,7 +198,7 @@ class box_members_by_type extends ModeleBoxes
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => (isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0 ? $MemberToValidate[$key] : '') . ' ' . $staticmember->LibStatut(-1, $adhtype->subscription, 0, 3),
+						'text' => (isset($MembersToValidate[$key]) && $MembersToValidate[$key] > 0 ? $MembersToValidate[$key] : '') . ' ' . $staticmember->LibStatut(-1, $adhtype->subscription, 0, 3),
 						'asis' => 1,
 					);
 					$this->info_box_contents[$line][] = array(

From bcbf8bb72a084f59c8285d5bb38737cba8ffed7b Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 9 Mar 2021 10:21:32 +0100
Subject: [PATCH 15/32] allow table alias into commonObject getFieldList

---
 htdocs/core/class/commonobject.class.php      | 30 ++++++++++++-------
 .../template/class/myobject.class.php         |  2 +-
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index c7dbab57b31..353dbd7da33 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7467,12 +7467,22 @@ abstract class CommonObject
 	/**
 	 * Function to concat keys of fields
 	 *
+	 * @param   array   $alias   content informations of field
+	 *
 	 * @return string
 	 */
-	protected function getFieldList()
+	protected function getFieldList($alias = 't')
 	{
 		$keys = array_keys($this->fields);
-		return implode(',', $keys);
+		if (!empty($alias)) {
+			$keys_with_alias = array();
+			foreach ($keys as $fieldname) {
+				$keys_with_alias[] = $alias . '.' . $fieldname;
+			}
+			return implode(',', $keys_with_alias);
+		} else {
+			return implode(',', $keys);
+		}
 	}
 
 	/**
@@ -7646,13 +7656,13 @@ abstract class CommonObject
 	{
 		if (empty($id) && empty($ref) && empty($morewhere)) return -1;
 
-		$sql = 'SELECT '.$this->getFieldList();
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
+		$sql = 'SELECT '.$this->getFieldList('t');
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 
-		if (!empty($id))  $sql .= ' WHERE rowid = '.$id;
-		elseif (!empty($ref)) $sql .= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
+		if (!empty($id))  $sql .= ' WHERE t.rowid = '.$id;
+		elseif (!empty($ref)) $sql .= " WHERE t.ref = ".$this->quote($ref, $this->fields['ref']);
 		else $sql .= ' WHERE 1 = 1'; // usage with empty id and empty ref is very rare
-		if (empty($id) && isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' AND entity IN ('.getEntity($this->table_element).')';
+		if (empty($id) && isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' AND t.entity IN ('.getEntity($this->table_element).')';
 		if ($morewhere)   $sql .= $morewhere;
 		$sql .= ' LIMIT 1'; // This is a fetch, to be sure to get only one record
 
@@ -7695,9 +7705,9 @@ abstract class CommonObject
 
 		$objectline = new $objectlineclassname($this->db);
 
-		$sql = 'SELECT '.$objectline->getFieldList();
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$objectline->table_element;
-		$sql .= ' WHERE fk_'.$this->element.' = '.$this->id;
+		$sql = 'SELECT '.$objectline->getFieldList('l');
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$objectline->table_element.' as l';
+		$sql .= ' WHERE l.fk_'.$this->element.' = '.$this->id;
 		if ($morewhere)   $sql .= $morewhere;
 
 		$resql = $this->db->query($sql);
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index fe4cc0931fd..6151a50db58 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -403,7 +403,7 @@ class MyObject extends CommonObject
 		$records = array();
 
 		$sql = 'SELECT ';
-		$sql .= $this->getFieldList();
+		$sql .= $this->getFieldList('t');
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
 		else $sql .= ' WHERE 1 = 1';

From 53f8ff060a0b000225072127c8a4fab12633c13f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Mar 2021 10:40:22 +0100
Subject: [PATCH 16/32] Fix phpcs

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

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 8e2f78ca578..2541e10ab16 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -787,10 +787,9 @@ abstract class CommonDocGenerator
 		$resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key, $outputlangs);
 
 		// Load product data optional fields to the line -> enables to use "line_product_options_{extrafield}"
-		if (isset($line->fk_product) && $line->fk_product > 0)
-		{
+		if (isset($line->fk_product) && $line->fk_product > 0) {
 			$tmpproduct = new Product($this->db);
-			$result = $tmpproduct->fetch($line->fk_product);
+			result = $tmpproduct->fetch($line->fk_product);
 			foreach ($tmpproduct->array_options as $key=>$label)
 				$resarray["line_product_".$key] = $label;
 		}

From 78588f24b9e19deea35eb388e91d52731d3b9959 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Mar 2021 10:42:59 +0100
Subject: [PATCH 17/32] Move git hooks pre-commit into dev/setup dir

---
 dev/{examples/git => setup/git/hooks}/pre-commit | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename dev/{examples/git => setup/git/hooks}/pre-commit (100%)

diff --git a/dev/examples/git/pre-commit b/dev/setup/git/hooks/pre-commit
similarity index 100%
rename from dev/examples/git/pre-commit
rename to dev/setup/git/hooks/pre-commit

From 429992ee7f9d1d6a3550810855e92ca132216c54 Mon Sep 17 00:00:00 2001
From: ksar <35605507+ksar-ksar@users.noreply.github.com>
Date: Tue, 9 Mar 2021 10:46:11 +0100
Subject: [PATCH 18/32] FIX #16590

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

diff --git a/htdocs/install/mysql/tables/llx_c_civility.sql b/htdocs/install/mysql/tables/llx_c_civility.sql
index 2084b876e7b..63fc8fca81f 100644
--- a/htdocs/install/mysql/tables/llx_c_civility.sql
+++ b/htdocs/install/mysql/tables/llx_c_civility.sql
@@ -19,7 +19,7 @@
 
 create table llx_c_civility
 (
-  rowid       integer AUTO_INCREMENT PRIMARY KEY NOT NULL
+  rowid       integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
   code        varchar(6) NOT NULL,
   label		  varchar(50),
   active      tinyint DEFAULT 1  NOT NULL,

From 1b3aae1984424989e8c660129313afbe4dd9e2d7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Mar 2021 12:17:32 +0100
Subject: [PATCH 19/32] Fix regression

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

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 2541e10ab16..0f3865f54a7 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -789,7 +789,7 @@ abstract class CommonDocGenerator
 		// Load product data optional fields to the line -> enables to use "line_product_options_{extrafield}"
 		if (isset($line->fk_product) && $line->fk_product > 0) {
 			$tmpproduct = new Product($this->db);
-			result = $tmpproduct->fetch($line->fk_product);
+			$tmpproduct->fetch($line->fk_product);
 			foreach ($tmpproduct->array_options as $key=>$label)
 				$resarray["line_product_".$key] = $label;
 		}

From 3cb072f67af69b980f8ef7650462c0039695fbb9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Mar 2021 15:13:20 +0100
Subject: [PATCH 20/32] Update commonobject.class.php

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 42dac9b7d99..c324b2502c9 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8255,11 +8255,10 @@ abstract class CommonObject
 	/**
 	 * Function to concat keys of fields
 	 *
-	 * @param   array   $alias   content informations of field
-	 *
-	 * @return string
+	 * @param   string   $alias   	String of alias of table for fields. For example 't'.
+	 * @return  string				list of alias fields
 	 */
-	protected function getFieldList($alias = 't')
+	protected function getFieldList($alias = '')
 	{
 		$keys = array_keys($this->fields);
 		if (!empty($alias)) {

From cf30e90b935e2fa9aef0af87fc80604ffb05eb14 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Mar 2021 15:35:10 +0100
Subject: [PATCH 21/32] Work on inventory

---
 htdocs/core/lib/functions.lib.php                  | 8 ++++----
 htdocs/core/menus/standard/eldy.lib.php            | 2 +-
 htdocs/product/inventory/class/inventory.class.php | 2 +-
 htdocs/product/inventory/list.php                  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f48d30d07c2..8978d373030 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3447,14 +3447,14 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'edit', 'ellipsis-h', 'email', 'eraser', 'external-link-alt', 'external-link-square-alt',
 				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title', 'group',
 				'help', 'holiday',
-				'intervention', 'label', 'language', 'link', 'list', 'listlight', 'loan', 'lot', 'long-arrow-alt-right',
+				'intervention', 'inventory', 'label', 'language', 'link', 'list', 'listlight', 'loan', 'lot', 'long-arrow-alt-right',
 				'margin', 'map-marker-alt', 'member', 'meeting', 'money-bill-alt', 'movement', 'mrp', 'note', 'next',
 				'object_accounting', 'object_account', 'object_accountline', 'object_action', 'object_asset', 'object_barcode', 'object_bill', 'object_billr', 'object_billa', 'object_billd', 'object_bom',
 				'object_category', 'object_conversation', 'object_bookmark', 'object_bug', 'object_clock', 'object_dolly', 'object_dollyrevert',
 				'object_folder', 'object_folder-open','object_generic',
 				'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
 				'object_cash-register', 'object_company', 'object_contact', 'object_contract', 'object_donation', 'object_dynamicprice',
-				'object_globe', 'object_holiday', 'object_hrm', 'object_invoice', 'object_intervention', 'object_label',
+				'object_globe', 'object_holiday', 'object_hrm', 'object_invoice', 'object_intervention', 'object_inventory', 'object_label',
 				'object_margin', 'object_members', 'object_money-bill-alt', 'object_multicurrency', 'object_order', 'object_payment',
 				'object_lot', 'object_mrp', 'object_other',
 				'object_payment', 'object_pdf', 'object_product', 'object_propal',
@@ -3500,7 +3500,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'hrm'=>'user-tie', 'margin'=>'calculator', 'members'=>'user-friends', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt', 'lot'=>'barcode',
 				'email'=>'at',
 				'edit'=>'pencil-alt', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'question-circle',
-				'generic'=>'file', 'holiday'=>'umbrella-beach', 'label'=>'layer-group', 'loan'=>'money-bill-alt',
+				'generic'=>'file', 'holiday'=>'umbrella-beach', 'inventory'=>'boxes', 'label'=>'layer-group', 'loan'=>'money-bill-alt',
 				'member'=>'user-alt', 'meeting'=>'chalkboard-teacher', 'mrp'=>'cubes', 'next'=>'arrow-alt-circle-right',
 				'trip'=>'wallet', 'group'=>'users', 'movement'=>'people-carry',
 				'sign-out'=>'sign-out-alt',
@@ -3604,7 +3604,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'cog'=>'#999', 'companies'=>'#6c6aa8', 'company'=>'#6c6aa8', 'contact'=>'#6c6aa8', 'dynamicprice'=>'#a69944',
 				'edit'=>'#444', 'note'=>'#999', 'error'=>'', 'help'=>'#bbb', 'listlight'=>'#999', 'language'=>'#555',
 				'dolly'=>'#a69944', 'dollyrevert'=>'#a69944', 'lot'=>'#a69944',
-				'map-marker-alt'=>'#aaa', 'mrp'=>'#a69944', 'product'=>'#a69944', 'service'=>'#a69944', 'stock'=>'#a69944', 'movement'=>'#a69944',
+				'map-marker-alt'=>'#aaa', 'mrp'=>'#a69944', 'product'=>'#a69944', 'service'=>'#a69944', 'inventory'=>'#a69944', 'stock'=>'#a69944', 'movement'=>'#a69944',
 				'other'=>'#ddd',
 				'playdisabled'=>'#ccc', 'printer'=>'#444', 'projectpub'=>'#986c6a', 'resize'=>'#444', 'rss'=>'#cba',
 				'shipment'=>'#a69944', 'stats'=>'#444', 'switch_off'=>'#999', 'technic'=>'#999', 'timespent'=>'#555', 'uparrow'=>'#555', 'user-cog'=>'#999', 'globe-americas'=>'#aaa',
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 14585b043b3..84a69b4a276 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1609,7 +1609,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 							$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->rights->stock->lire);
 						}
 					} else {
-						$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock');
+						$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="pictofixedwidth"'));
 						if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {
 							$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->rights->stock->inventory_advance->write);
 							$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->rights->stock->inventory_advance->read);
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index d7bd4956638..601a2f34759 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -57,7 +57,7 @@ class Inventory extends CommonObject
 	/**
 	 * @var string String with name of icon for inventory
 	 */
-	public $picto = 'stock';
+	public $picto = 'inventory';
 
 	const STATUS_DRAFT = 0;
 	const STATUS_VALIDATED = 1;
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 64c332fbe1b..3585b84547f 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -351,7 +351,7 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/inventory/card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'product', 0, $newcardbutton, '', $limit);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit);
 
 // Add code for pre mass action (confirmation or email presend form)
 $topicmail = "Information";

From 9cb4dce48532ee91d36563636d6666e7530a5cb6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Mar 2021 16:12:30 +0100
Subject: [PATCH 22/32] Fix option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN
 missing

---
 .../supplier_order/doc/pdf_cornas.modules.php | 12 +++++++++-
 .../doc/pdf_muscadet.modules.php              | 22 +++++++++++--------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index bcb1fac88b3..9ebff653a56 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -1534,13 +1534,18 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$this->cols['subprice'] = array(
 			'rank' => $rank,
 			'width' => 19, // in mm
-			'status' => true,
+			'status' => false,
 			'title' => array(
 				'textkey' => 'PriceUHT'
 			),
 			'border-left' => true, // add left line separator
 		);
 
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE))
+		{
+			$this->cols['subprice']['status'] = true;
+		}
+
 		$rank = $rank + 10;
 		$this->cols['qty'] = array(
 			'rank' => $rank,
@@ -1591,6 +1596,11 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			'border-left' => true, // add left line separator
 		);
 
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN))
+		{
+			$this->cols['totalexcltax']['status'] = true;
+		}
+
 		// Add extrafields cols
 		if (!empty($object->lines)) {
 			$line = reset($object->lines);
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
index 5214ce47444..be195d923da 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -329,10 +329,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$pdf->SetDrawColor(128, 128, 128);
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-				$pdf->SetSubject($outputlangs->transnoentities("Order"));
+				$pdf->SetSubject($outputlangs->transnoentities("PurchaseOrder"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PurchaseOrder")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
 				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
@@ -510,7 +510,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 
 					// VAT Rate
-					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
+					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
 					{
 						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxtva, $curY);
@@ -518,9 +518,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					}
 
 					// Unit price before discount
-					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
-					$pdf->SetXY($this->posxup, $curY);
-					$pdf->MultiCell($this->posxqty - $this->posxup - 0.8, 3, $up_excl_tax, 0, 'R', 0);
+					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE)) {
+						$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
+						$pdf->SetXY($this->posxup, $curY);
+						$pdf->MultiCell($this->posxqty - $this->posxup - 0.8, 3, $up_excl_tax, 0, 'R', 0);
+					}
 
 					// Quantity
 					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
@@ -544,9 +546,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					}
 
 					// Total HT line
-					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs);
-					$pdf->SetXY($this->postotalht, $curY);
-					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
+					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN)) {
+						$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs);
+						$pdf->SetXY($this->postotalht, $curY);
+						$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
+					}
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
 					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;

From 5e68eee407f55d0291418e2487c8243176b3982e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Mar 2021 16:47:38 +0100
Subject: [PATCH 23/32] Fix filter

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

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 76394916550..7c3500f7e78 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -1076,7 +1076,7 @@ if (!empty($arrayfields['country.code_iso']['checked'])) {
 if (!empty($arrayfields['typent.code']['checked'])) {
 	print '<td class="liste_titre maxwidthonsmartphone center">';
 	// We use showempty=0 here because there is already an unknown value into dictionary.
-	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), 'minwidth50 maxwidth100', 1);
+	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), 'minwidth50 maxwidth100', 1);
 	print '</td>';
 }
 // Multiprice level

From 5b74fefb608b8977e5690fb99e6f59f1d005b3d3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Mar 2021 17:01:20 +0100
Subject: [PATCH 24/32] Fix look and feel v13

---
 htdocs/contact/card.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 0def459d444..e75908adc10 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -750,7 +750,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<input type="text" name="email" id="email" value="'.(GETPOSTISSET('email') ? GETPOST('email', 'alpha') : $object->email).'"></td>';
 			print '</tr>';
 
-			//Unsubscribe
+			// Unsubscribe
 			if (!empty($conf->mailing->enabled)) {
 				if ($conf->use_javascript_ajax && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1) {
 					print "\n".'<script type="text/javascript" language="javascript">'."\n";
@@ -784,6 +784,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						print '<tr>';
 						print '<td><label for="'.$value['label'].'">'.$form->editfieldkey($value['label'], $key, '', $object, 0).'</label></td>';
 						print '<td colspan="3">';
+						if (!empty($value['icon'])) {
+							print '<span class="fa '.$value['icon'].'"></span>';
+						}
 						print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET($key) ?GETPOST($key, 'alphanohtml') : $object->socialnetworks[$key]).'">';
 						print '</td>';
 						print '</tr>';
@@ -1069,6 +1072,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						print '<tr>';
 						print '<td><label for="'.$value['label'].'">'.$form->editfieldkey($value['label'], $key, '', $object, 0).'</label></td>';
 						print '<td colspan="3">';
+						if (!empty($value['icon'])) {
+							print '<span class="fa '.$value['icon'].'"></span>';
+						}
 						print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET($key) ?GETPOST($key, 'alphanohtml') : $object->socialnetworks[$key]).'">';
 						print '</td>';
 						print '</tr>';

From 8babacfe5592c089b429fd05df9db235b60dd0a5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Mar 2021 19:10:41 +0100
Subject: [PATCH 25/32] Look and feel v14

---
 htdocs/projet/activity/perday.php      |   5 ++++-
 htdocs/projet/activity/permonth.php    |   5 ++++-
 htdocs/projet/activity/perweek.php     |   5 ++++-
 htdocs/theme/common/everybody.png      | Bin 0 -> 3963 bytes
 htdocs/theme/common/paypal.png         | Bin 1384 -> 0 bytes
 htdocs/theme/common/treemenu/trash.gif | Bin 1051 -> 0 bytes
 6 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 htdocs/theme/common/everybody.png
 delete mode 100644 htdocs/theme/common/paypal.png
 delete mode 100644 htdocs/theme/common/treemenu/trash.gif

diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 1bc0d49d424..1309ae4455e 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -600,7 +600,10 @@ if (!empty($arrayfields['t.progress']['checked'])) {
 /*print '<td class="right maxwidth100">'.$langs->trans("TimeSpent").'</td>';
 if ($usertoprocess->id == $user->id) print '<td class="right maxwidth100">'.$langs->trans("TimeSpentByYou").'</td>';
 else print '<td class="right maxwidth100">'.$langs->trans("TimeSpentByUser").'</td>';*/
-print '<th class="right maxwidth100">'.$langs->trans("TimeSpent").'<br><span class="opacitymedium">'.$langs->trans("Everybody").'</span></th>';
+print '<th class="right maxwidth100">'.$langs->trans("TimeSpent").'<br>';
+print '<span class="opacitymedium nopadding userimg"><img alt="Photo" class="photouserphoto userphoto" src="'.DOL_URL_ROOT.'/theme/common/everybody.png"></span>';
+print '<span class="opacitymedium paddingleft">'.$langs->trans("Everybody").'</span>';
+print '</th>';
 print '<th class="right maxwidth100">'.$langs->trans("TimeSpent").($usertoprocess->firstname ? '<br>'.$usertoprocess->getNomUrl(-2).'<span class="opacitymedium paddingleft">'.dol_trunc($usertoprocess->firstname, 10).'</span>' : '').'</th>';
 print '<th class="center leftborder">'.$langs->trans("HourStart").'</td>';
 
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index 3902cd83ed0..d023dcc69d3 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -491,7 +491,10 @@ print '<td align="right" class="maxwidth75">'.$langs->trans("ProgressDeclared").
 /*print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").'</td>';
  if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpentByYou").'</td>';
  else print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpentByUser").'</td>';*/
-print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").'<br><span class="opacitymedium">'.$langs->trans("Everybody").'</span></td>';
+print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").'<br>';
+print '<span class="opacitymedium nopadding userimg"><img alt="Photo" class="photouserphoto userphoto" src="'.DOL_URL_ROOT.'/theme/common/everybody.png"></span>';
+print '<span class="opacitymedium paddingleft">'.$langs->trans("Everybody").'</span>';
+print '</td>';
 print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").($usertoprocess->firstname ? '<br>'.$usertoprocess->getNomUrl(-2).'<span class="opacitymedium paddingleft">'.dol_trunc($usertoprocess->firstname, 10).'</span>' : '').'</td>';
 
 foreach ($TWeek as $week_number) {
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 69866e1da2f..028bb97726c 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -657,7 +657,10 @@ if (!empty($arrayfields['t.progress']['checked'])) {
 /*print '<td class="maxwidth75 right">'.$langs->trans("TimeSpent").'</td>';
  if ($usertoprocess->id == $user->id) print '<td class="maxwidth75 right">'.$langs->trans("TimeSpentByYou").'</td>';
  else print '<td class="maxwidth75 right">'.$langs->trans("TimeSpentByUser").'</td>';*/
-print '<th class="maxwidth75 right">'.$langs->trans("TimeSpent").'<br><span class="opacitymedium">'.$langs->trans("Everybody").'</span></th>';
+print '<th class="maxwidth75 right">'.$langs->trans("TimeSpent").'<br>';
+print '<span class="opacitymedium nopadding userimg"><img alt="Photo" class="photouserphoto userphoto" src="'.DOL_URL_ROOT.'/theme/common/everybody.png"></span>';
+print '<span class="opacitymedium paddingleft">'.$langs->trans("Everybody").'</span>';
+print '</th>';
 print '<th class="maxwidth75 right">'.$langs->trans("TimeSpent").($usertoprocess->firstname ? '<br>'.$usertoprocess->getNomUrl(-2).'<span class="opacitymedium paddingleft">'.dol_trunc($usertoprocess->firstname, 10).'</span>' : '').'</th>';
 
 for ($idw = 0; $idw < 7; $idw++) {
diff --git a/htdocs/theme/common/everybody.png b/htdocs/theme/common/everybody.png
new file mode 100644
index 0000000000000000000000000000000000000000..efe0d3e28075176a647f08eeadf67cecc45dbd62
GIT binary patch
literal 3963
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
VgA@D8mofkV002ovPDHLkV1mC%lc@jz

literal 0
HcmV?d00001

diff --git a/htdocs/theme/common/paypal.png b/htdocs/theme/common/paypal.png
deleted file mode 100644
index 32cae0ca9eb3817d256465fe524263c5f8de90bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1384
zcmV-u1(*7XP)<h;3K|Lk000e1NJLTq002G!0018d0{{R3i0_W&00051P)t-s|NsA?
zs<m-{k8*&J!^+X%<mmA7^z!uf<mc-2_W1k!{rvs@`TG0%`~1Sm(5A1t=IQMA_xSht
z`R(uVdx)1sO;<xpQ%h7|aej@*&C~Jo^?;3>X?25QZhUKahmM)1+u!4}yTg^Bt<>4x
z?C$XM_4n1<-(G2UIY37}MNL~~b6{(DWpRI`t+?sz@8|06?(p)lxx<m1sky<)bb^vo
zTxYbr#Hg{ng^{1Hx50sqoxa7)$j;Q4p{=gAz_-80c7&9Wo2Z(ku)xR8@A32A;^t&<
zepO#<ik75WWpYqiWa{nkVQhJsqpw|Pb%v6le2JKCdWmCiea+L^-{a@p;N*3KleN9Y
ztFygYWN^vP)xpTmy28qvrLo!F;k(1jXLEtm*xlCK;H<R1<>>3(;pNWM+S1qDQCeka
zbb`do(sO~4c!rj6eT>S`*2~e?Y<Y;`<>~0_?nh5q#>~=$ke+vim7}b;lb)-#zQ$8s
zX^51fr?9)AskExHyor^grLMWSz{tJC%fH6WqN}!tlcAEGs+6CsjhLm2m!&m4L(J0H
z+TP;h=IH=9M1}wW00DGTPE!Ct=GbNc00V4EL_t(|0i4LS0Ru1$05IEO<}&_&WSQ1R
zqu>T<0waV6;zFvwNx=zjNE_=WSfdF5xqk^E*t>A!Kf<fSv%`~rhzKc{r&?PdW3gPV
ztFJ%&X1m+(569E1%lS(3JaD-VgaH^ncip4f_LoU*+qRXoUE9_#zmx78<4I-|Iz4Yg
z@bB4%{Y^$A%VY+E0HJ`-<+A=V;*G0OAd*BDE1$>3S6rJ8={QCsV+@$v4SzX|PNB%<
z_JG&t7kC0ejyn{V86$ycOsR}ZLntBDCe^8QCYvC&dwUzg!F-pq$!>7CAZO$LgM6V_
z@)BZ~3na2~1q#(#oy)DFMl~U6)>LVIOVu{m?2OsPT+?CNJ+OCskn0bI;2HgM{wqRm
z07ID{gxwITkNYZQjZDT`37U>kV%L7K%ODNrrWuo_b1<&}Ap}^Ysegf9o(POUOnD*d
zP@$Ryk#(AmrIIRgxkUBV?pnhj6Xu6UILb6zN4;=tK5@~fL!z=EguyO|dT_itRMyVU
z>+Dtff|NIE7n2m4b~Gl6QHPjIFL76g)a+U$jNR;Z*4J=ydn&v;?1}*h>n)p99NysB
zouTP%y46TG$RJG}UNPz(^ZpK#^pYw;?v$qJ(`zV3bCAEG%>d?`&I5Wlq$%p~5y_v<
z(DS_2oE%<C88Z%Io(#UY-IMf=6x{_P5ozQyDi*yeUPH6P9uTn^_11jf-2P}P9|g@|
zy!nRV#O-#!e12j6P_KS}E@N6>zyI^%^Z8zW`pfao@BQVt0+rE!&c;BqfglLOmcGXd
zL<6v(FlAF%v`#_53Gxh~wUWDPcDkANq5JQSYrA@aeD<F)zx&+HJHD&+cC&$p`|Wjc
zzuO&8wBHxK(4}A<I~#^znbv*ZAI7`e)yH@sW}mf2yCx!hmAY!Fu6_(*h^b3Mw%$1=
zdR#q^J=;GuusMeayVc<<Wv3Wp`5O^)j<ucYl=S@7yEzhk$Lw-Q-36cz=UJ>}=e<2&
zVu0?sMF7@|GL<}shfYr|qLCU*QM73x=;qWSHS#m2Q(uFDe%!T4jp(RPL>G3;5&B}&
zA~iBI{;`0*eP|I-7gC-8y)as~MgP1S=*BF+u4HM<_ZWDXSQJ=$IeJM0Kn<)4&|0b?
qx;u?z&>h{t!~g~yQDgxQpjH4keJ#nb<4^4X0000<MNUMnLSTZL^65GN

diff --git a/htdocs/theme/common/treemenu/trash.gif b/htdocs/theme/common/treemenu/trash.gif
deleted file mode 100644
index cfa0f000e1ed3b61c8737fcfbef4b78035a6abe7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1051
zcmeH`!B0|g0LLGK3dPJgm@T#>b?KJNwY61t2y23!a_iPbmlJ1M5VKlN19e8^5=^!z
zbD)u~Nn)UBz(^5iXd;hRCWauSKscU&!V@09@^9$c_wYG>4xjDIC@(v6wu%B#plCOQ
zlj1%HL7xpg`;4hq!Iu!Ay`f<k=J)%RKR{n!pUdU4*=#*Z<=QrAXlOuDG#-yvOjNWO
zqCTJR!N;&tscbVu#A5M{`ucBSz+$oN7|^eS;o)JGO7+fUibNt-t922E<#PGX&W^=m
z>Hi8EnwqRZheRTo3t^+{2HkSV8B3ac*wiwj`U#enmI4T(`vn#vK;=k2di7RfPB!bd
zJK#>yEZWxDDf!FE7-xpV<MEyi=`<RR)sJm$ZGE!aJpkCz-5+rvwV?AGK<!2w8ylTY
z=TyMr^?DHmQO?4~-$1X|+oGU(p0Cwv-EQ||BRaXBSn+M@HWHmP@ntkPV2$wS`7jI{
zHxr>y$l$}cV*&0M5)OxjQmJ|k6$*vDy}eU@5RE6J(P)Qp+ZeFi9t}!OUd7^O(;WX^
z+tZm1;6~zHF4t@}>pdVC3@Q`~e*%oJB(?5U`#K^Y8IgTkSWbYYT`>3^JQN6~{i|c1
zT@Hui@px7N7}o0@4u@hP=0$@VCwTuo#%8nWYPtge=>Pt?01YMJAgCKUv1i)*1VoHM
zg(NCdC7W!ynX~=LT1$V~nzDI+!inF1=tx}_nc5}mr=DV)ug;EKpMRZBPRn{eeTULj
zT$`c1GEET^B}LcnR&AAaiH{Ye*N`rB57O`u#Dp_b1s(h%A~RpaD3zSN{F_j2tj!_g
zDpL!j?zKmG<;}MS$4?;^-Us|{&uLL9Bj?<{OfuP3Q`%K@Iu9puGT|qsM`h&mnJkio
zah!lJc2>jfh55v~gO_sCXyqAH#KmqWJ;xJR)WRHv@kL7O1(~3lev(ei&BE0!@)+$U
l*+Y54N|AtcU>`GZuw~%!;jig5uN)!pv)3}!7s*7Z<PXgZy4U~!


From 67f5837072bdcd63b769ece06d6daeaec4dbee73 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Mar 2021 19:51:11 +0100
Subject: [PATCH 26/32] Fix permission to create a holiday when advanced
 permissions are set

---
 htdocs/holiday/card.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index bbd5a1ac9d4..40d127496a4 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -148,7 +148,10 @@ if (empty($reshook))
 			$description = trim(GETPOST('description', 'restricthtml'));
 
 			// Check that leave is for a user inside the hierarchy or advanced permission for all is set
-			if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->holiday->write)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->holiday->writeall_advance))) {
+			if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->holiday->write))
+				|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->id == $fuserid && empty($user->rights->holiday->write))
+				|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->id != $fuserid && empty($user->rights->holiday->writeall_advance))
+				) {
 				$error++;
 				setEventMessages($langs->trans("NotEnoughPermission"), null, 'errors');
 			} else {

From 28f54eeb756fc0d8c8d8e901686400b297509113 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Mar 2021 19:55:47 +0100
Subject: [PATCH 27/32] Fix translation

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

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 40d127496a4..510a08fe274 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -153,7 +153,7 @@ if (empty($reshook))
 				|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->id != $fuserid && empty($user->rights->holiday->writeall_advance))
 				) {
 				$error++;
-				setEventMessages($langs->trans("NotEnoughPermission"), null, 'errors');
+				setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
 			} else {
 				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->holiday->writeall_advance)) {
 					if (!in_array($fuserid, $childids)) {

From b1f4c29fde9c74858c5c27c87c8516fc9a490a41 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Mar 2021 20:12:14 +0100
Subject: [PATCH 28/32] Fix missing alias

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index c324b2502c9..a392fd793d5 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8532,7 +8532,7 @@ abstract class CommonObject
 		$objectline = new $objectlineclassname($this->db);
 
 		$sql = 'SELECT '.$objectline->getFieldList('l');
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$objectline->table_element;
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$objectline->table_element.' as l';
 		$sql .= ' WHERE l.fk_'.$this->element.' = '.$this->id;
 		if ($morewhere) {
 			$sql .= $morewhere;

From a0c7c6bad961136e789b282a19ee461ea3019fac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 Mar 2021 10:45:01 +0100
Subject: [PATCH 29/32] Fix selection of accounting account

---
 htdocs/accountancy/admin/account.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 47a984cd467..ca5c10ec63d 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -131,6 +131,7 @@ if (empty($reshook))
 				// and pass CCCNNNNN + (num of company * 100 000 000) as offset to the run_sql as a new parameter to say to update sql on the fly to add offset to rowid and account_parent value.
 				// This is to be sure there is no conflict for each chart of account, whatever is country, whatever is company when multicompany is used.
 				$tmp = file_get_contents($sqlfile);
+				$reg = array();
 				if (preg_match('/-- ADD (\d+) to rowid/ims', $tmp, $reg))
 				{
 					$offsetforchartofaccount += $reg[1];
@@ -302,7 +303,7 @@ if ($resql)
 
 	// Box to select active chart of account
 	print $langs->trans("Selectchartofaccounts")." : ";
-	print '<select class="flat" name="chartofaccounts" id="chartofaccounts">';
+	print '<select class="flat minwidth200" name="chartofaccounts" id="chartofaccounts">';
 	$sql = "SELECT a.rowid, a.pcg_version, a.label, a.active, c.code as country_code";
 	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_system as a";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON a.fk_country = c.rowid AND c.active = 1";
@@ -313,6 +314,7 @@ if ($resql)
 	if ($resqlchart) {
 		$numbis = $db->num_rows($resqlchart);
 		$i = 0;
+		print '<option value="-1">&nbsp;</option>';
 		while ($i < $numbis) {
 			$obj = $db->fetch_object($resqlchart);
 

From 680f6257a03e05ebead7ed56591cc92ef0b52970 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 Mar 2021 11:04:28 +0100
Subject: [PATCH 30/32] FIX warning if setup of chart of account is not yet
 done.

---
 .../core/class/html.formaccounting.class.php  | 65 ++++++++++---------
 htdocs/langs/en_US/errors.lang                |  1 +
 htdocs/product/card.php                       | 18 +++--
 3 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 21776d5bef3..9859277c07e 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -259,7 +259,7 @@ class FormAccounting extends Form
 	 * @param string   $usecache           Key to use to store result into a cache. Next call with same key will reuse the cache.
 	 * @return string                      String with HTML select
 	 */
-	public function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss = 'maxwidth300 maxwidthonsmartphone', $usecache = '')
+	public function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss = 'minwidth100 maxwidth300 maxwidthonsmartphone', $usecache = '')
 	{
 		// phpcs:enable
 		global $conf, $langs;
@@ -299,38 +299,45 @@ class FormAccounting extends Form
 				return -1;
 			}
 
-			$selected = $selectid; // selectid can be -1, 0, 123
-			while ($obj = $this->db->fetch_object($resql))
-			{
-				if (empty($obj->labelshort))
-				{
-					$labeltoshow = $obj->label;
-				} else {
-					$labeltoshow = $obj->labelshort;
-				}
+			$num_rows = $this->db->num_rows($resql);
 
-				$label = length_accountg($obj->account_number).' - '.$labeltoshow;
-				$label = dol_trunc($label, $trunclength);
+			if ($num_rows == 0) {
+				$langs->load("errors");
+				$showempty = $langs->trans("ErrorYouMustFirstSetupYourChartOfAccount");
+			} else {
+				$selected = $selectid; // selectid can be -1, 0, 123
+				while ($obj = $this->db->fetch_object($resql)) {
+					if (empty($obj->labelshort))
+					{
+						$labeltoshow = $obj->label;
+					} else {
+						$labeltoshow = $obj->labelshort;
+					}
 
-				$select_value_in = $obj->rowid;
-				$select_value_out = $obj->rowid;
+					$label = length_accountg($obj->account_number).' - '.$labeltoshow;
+					$label = dol_trunc($label, $trunclength);
 
-				// Try to guess if we have found default value
-				if ($select_in == 1) {
-					$select_value_in = $obj->account_number;
-				}
-				if ($select_out == 1) {
-					$select_value_out = $obj->account_number;
-				}
-				// Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number
-				// Because same account_number can be share between different accounting_system and do have the same meaning
-				if ($selectid != '' && $selectid == $select_value_in) {
-					//var_dump("Found ".$selectid." ".$select_value_in);
-					$selected = $select_value_out;
-				}
+					$select_value_in = $obj->rowid;
+					$select_value_out = $obj->rowid;
 
-				$options[$select_value_out] = $label;
+					// Try to guess if we have found default value
+					if ($select_in == 1) {
+						$select_value_in = $obj->account_number;
+					}
+					if ($select_out == 1) {
+						$select_value_out = $obj->account_number;
+					}
+					// Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number
+					// Because same account_number can be share between different accounting_system and do have the same meaning
+					if ($selectid != '' && $selectid == $select_value_in) {
+						//var_dump("Found ".$selectid." ".$select_value_in);
+						$selected = $select_value_out;
+					}
+
+					$options[$select_value_out] = $label;
+				}
 			}
+
 			$this->db->free($resql);
 
 			if ($usecache)
@@ -340,7 +347,7 @@ class FormAccounting extends Form
 			}
 		}
 
-		$out .= Form::selectarray($htmlname, $options, $selected, ($showempty > 0 ? 1 : 0), 0, 0, '', 0, 0, 0, '', $morecss, 1);
+		$out .= Form::selectarray($htmlname, $options, $selected, ($showempty ? (is_numeric($showempty) ? 1 : $showempty): 0), 0, 0, '', 0, 0, 0, '', $morecss, 1);
 
 		return $out;
 	}
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index e3d9209f204..087fcba9e56 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -256,6 +256,7 @@ ErrorPublicInterfaceNotEnabled=Public interface was not enabled
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index dcf4630a26d..a60643ea579 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -919,8 +919,7 @@ if (!empty($conf->barcode->enabled) && !empty($conf->global->BARCODE_PRODUCT_ADD
 }
 
 
-if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
-{
+if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	// -----------------------------------------
 	// When used with CANVAS
 	// -----------------------------------------
@@ -936,8 +935,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 	// -----------------------------------------
 	// When used in standard mode
 	// -----------------------------------------
-	if ($action == 'create' && $usercancreate)
-	{
+	if ($action == 'create' && $usercancreate) {
 		//WYSIWYG Editor
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
@@ -1276,7 +1274,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			} else {
 				$accountancy_code_sell = (GETPOSTISSET('accountancy_code_sell') ? GETPOST('accountancy_code_sell', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT);
 			}
-			print $formaccounting->select_account($accountancy_code_sell, 'accountancy_code_sell', 1, null, 1, 1, '');
+			print $formaccounting->select_account($accountancy_code_sell, 'accountancy_code_sell', 1, null, 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 1);
 			print '</td></tr>';
 
 			// Accountancy_code_sell_intra
@@ -1289,7 +1287,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				} else {
 					$accountancy_code_sell_intra = (GETPOSTISSET('accountancy_code_sell_intra') ? GETPOST('accountancy_code_sell_intra', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT);
 				}
-				print $formaccounting->select_account($accountancy_code_sell_intra, 'accountancy_code_sell_intra', 1, null, 1, 1, '');
+				print $formaccounting->select_account($accountancy_code_sell_intra, 'accountancy_code_sell_intra', 1, null, 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 1);
 				print '</td></tr>';
 			}
 
@@ -1302,7 +1300,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			} else {
 				$accountancy_code_sell_export = (GETPOST('accountancy_code_sell_export') ? GETPOST('accountancy_code_sell_export', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT);
 			}
-			print $formaccounting->select_account($accountancy_code_sell_export, 'accountancy_code_sell_export', 1, null, 1, 1, '');
+			print $formaccounting->select_account($accountancy_code_sell_export, 'accountancy_code_sell_export', 1, null, 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 1);
 			print '</td></tr>';
 
 			// Accountancy_code_buy
@@ -1313,7 +1311,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
             } else {
                 $accountancy_code_buy = (GETPOST('accountancy_code_buy', 'alpha') ? (GETPOST('accountancy_code_buy', 'alpha')) : $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT);
             }
-			print $formaccounting->select_account($accountancy_code_buy, 'accountancy_code_buy', 1, null, 1, 1, '');
+            print $formaccounting->select_account($accountancy_code_buy, 'accountancy_code_buy', 1, null, 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 1);
 			print '</td></tr>';
 
 			// Accountancy_code_buy_intra
@@ -1326,7 +1324,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				} else {
 					$accountancy_code_buy_intra = (GETPOSTISSET('accountancy_code_buy_intra') ? GETPOST('accountancy_code_buy_intra', 'alpha') : $conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT);
 				}
-				print $formaccounting->select_account($accountancy_code_buy_intra, 'accountancy_code_buy_intra', 1, null, 1, 1, '');
+				print $formaccounting->select_account($accountancy_code_buy_intra, 'accountancy_code_buy_intra', 1, null, 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 1);
 				print '</td></tr>';
 			}
 
@@ -1339,7 +1337,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			} else {
 				$accountancy_code_buy_export = (GETPOST('accountancy_code_buy_export') ? GETPOST('accountancy_code_buy_export', 'alpha') : $conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT);
 			}
-			print $formaccounting->select_account($accountancy_code_buy_export, 'accountancy_code_buy_export', 1, null, 1, 1, '');
+			print $formaccounting->select_account($accountancy_code_buy_export, 'accountancy_code_buy_export', 1, null, 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 1);
 			print '</td></tr>';
 		} else // For external software
 		{

From 9a13ebfdb8fa0fae8b4bd58313fc9bc076cd856b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 Mar 2021 11:08:39 +0100
Subject: [PATCH 31/32] Fix look and feel v13

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index a60643ea579..4857f35b121 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1444,7 +1444,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<table class="border allwidth">';
 
 			// Ref
-			print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" class="maxwidth200" maxlength="128" value="'.dol_escape_htmltag($object->ref).'"></td></tr>';
+			print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" class="maxwidth200" maxlength="128" value="'.dol_escape_htmltag($object->ref).'"></td></tr>';
 
 			// Label
 			print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="label" class="minwidth300 maxwidth400onsmartphone" maxlength="255" value="'.dol_escape_htmltag($object->label).'"></td></tr>';
@@ -1690,7 +1690,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			if (!empty($conf->accounting->enabled))
 			{
 				// Accountancy_code_sell
-				print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
+				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
 				print '<td>';
 				print $formaccounting->select_account($object->accountancy_code_sell, 'accountancy_code_sell', 1, '', 1, 1);
 				print '</td></tr>';
@@ -1698,14 +1698,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				// Accountancy_code_sell_intra
 				if ($mysoc->isInEEC())
 				{
-					print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellIntraCode").'</td>';
+					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellIntraCode").'</td>';
 					print '<td>';
 					print $formaccounting->select_account($object->accountancy_code_sell_intra, 'accountancy_code_sell_intra', 1, '', 1, 1);
 					print '</td></tr>';
 				}
 
 				// Accountancy_code_sell_export
-				print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellExportCode").'</td>';
+				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellExportCode").'</td>';
 				print '<td>';
 				print $formaccounting->select_account($object->accountancy_code_sell_export, 'accountancy_code_sell_export', 1, '', 1, 1);
 				print '</td></tr>';
@@ -1719,34 +1719,34 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				// Accountancy_code_buy_intra
 				if ($mysoc->isInEEC())
 				{
-					print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancyBuyIntraCode").'</td>';
+					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyIntraCode").'</td>';
 					print '<td>';
 					print $formaccounting->select_account($object->accountancy_code_buy_intra, 'accountancy_code_buy_intra', 1, '', 1, 1);
 					print '</td></tr>';
 				}
 
 				// Accountancy_code_buy_export
-				print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancyBuyExportCode").'</td>';
+				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyExportCode").'</td>';
 				print '<td>';
 				print $formaccounting->select_account($object->accountancy_code_buy_export, 'accountancy_code_buy_export', 1, '', 1, 1);
 				print '</td></tr>';
 			} else {
 				// For external software
 				// Accountancy_code_sell
-				print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
+				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
 				print '<td><input name="accountancy_code_sell" class="maxwidth200" value="'.$object->accountancy_code_sell.'">';
 				print '</td></tr>';
 
 				// Accountancy_code_sell_intra
 				if ($mysoc->isInEEC())
 				{
-					print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellIntraCode").'</td>';
+					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellIntraCode").'</td>';
 					print '<td><input name="accountancy_code_sell_intra" class="maxwidth200" value="'.$object->accountancy_code_sell_intra.'">';
 					print '</td></tr>';
 				}
 
 				// Accountancy_code_sell_export
-				print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellExportCode").'</td>';
+				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellExportCode").'</td>';
 				print '<td><input name="accountancy_code_sell_export" class="maxwidth200" value="'.$object->accountancy_code_sell_export.'">';
 				print '</td></tr>';
 
@@ -1758,13 +1758,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				// Accountancy_code_buy_intra
 				if ($mysoc->isInEEC())
 				{
-					print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancyBuyIntraCode").'</td>';
+					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyIntraCode").'</td>';
 					print '<td><input name="accountancy_code_buy_intra" class="maxwidth200" value="'.$object->accountancy_code_buy_intra.'">';
 					print '</td></tr>';
 				}
 
 				// Accountancy_code_buy_export
-				print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancyBuyExportCode").'</td>';
+				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyExportCode").'</td>';
 				print '<td><input name="accountancy_code_buy_export" class="maxwidth200" value="'.$object->accountancy_code_buy_export.'">';
 				print '</td></tr>';
 			}

From fbe5ec8bb2bcc61ed68ca548b57e29cd4f00194d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 Mar 2021 13:12:28 +0100
Subject: [PATCH 32/32] Complete test on setup

---
 htdocs/filefunc.inc.php                       | 11 ++++++---
 .../template/scripts/mymodule.php             | 23 +++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 9fbdcc88eab..35a97677f63 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -203,18 +203,23 @@ if (!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck)) {
 	}
 	// Another test is done later on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on.
 }
-if (empty($dolibarr_main_db_host)) {
+if (empty($dolibarr_main_db_host) && !defined('NOREQUIREDB')) {
 	print '<div class="center">Dolibarr setup is not yet complete.<br><br>'."\n";
 	print '<a href="install/index.php">Click here to finish Dolibarr install process</a> ...</div>'."\n";
 	die;
 }
-if (empty($dolibarr_main_url_root)) {
+if (empty($dolibarr_main_url_root) && !defined('NOREQUIREVIRTUALURL')) {
 	print 'Value for parameter \'dolibarr_main_url_root\' is not defined in your \'htdocs\conf\conf.php\' file.<br>'."\n";
 	print 'You must add this parameter with your full Dolibarr root Url (Example: http://myvirtualdomain/ or http://mydomain/mydolibarrurl/)'."\n";
 	die;
 }
+
+if (empty($dolibarr_main_document_root_alt)) {
+	$dolibarr_main_document_root_alt = $dolibarr_main_document_root.'/custom';
+}
+
 if (empty($dolibarr_main_data_root)) {
-	// Si repertoire documents non defini, on utilise celui par defaut
+	// If directory not defined, we use the default hardcoded value
 	$dolibarr_main_data_root = str_replace("/htdocs", "", $dolibarr_main_document_root);
 	$dolibarr_main_data_root .= "/documents";
 }
diff --git a/htdocs/modulebuilder/template/scripts/mymodule.php b/htdocs/modulebuilder/template/scripts/mymodule.php
index 0dab19d7ae6..f0a7ca715a4 100644
--- a/htdocs/modulebuilder/template/scripts/mymodule.php
+++ b/htdocs/modulebuilder/template/scripts/mymodule.php
@@ -23,6 +23,29 @@
  *      \brief      This file is an example for a command line script for module MyModule
  */
 
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
+if (!defined('NOSESSION')) define('NOSESSION', '1');	// On CLI mode, no need to use web sessions
+
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';